-----------------------------------------------------------------------------
 MANIFEST             |  116 -
 Makefile             |   10 
 aclocal.m4           |  289 ++
 config.guess         |   16 
 config.sub           |   32 
 configure            | 1834 +++++++++---------
 configure.in         |   44 
 doc/CHANGES          |   65 
 doc/INSTALL          |   70 
 doc/TODO             |   46 
 doc/WHATSNEW         |    3 
 doc/internals.txt    |   20 
 doc/nov_tests        |   31 
 doc/opt-case.1       |    2 
 doc/tin.1            |  453 ++--
 doc/tin.5            |  303 +--
 doc/tinews.1         |  302 +++
 doc/w2r.1            |    2 
 include/autoconf.hin |    7 
 include/extern.h     |   50 
 include/proto.h      |    7 
 include/tcurses.h    |    3 
 include/tin.h        |   15 
 include/version.h    |    9 
 po/Makefile.inn      |    2 
 po/de.gmo            |binary
 po/de.po             | 4669 +++++++++++++++++++++++------------------------
 po/en_GB.gmo         |binary
 po/en_GB.po          | 3794 +++++++++++++++++++-------------------
 po/et.gmo            |binary
 po/et.po             | 4528 +++++++++++++++++++++++-----------------------
 po/fr.gmo            |binary
 po/fr.po             | 4817 +++++++++++++++++++++++++------------------------
 po/tin.pot           | 3894 +++++++++++++++++++--------------------
 src/Makefile.in      |    8 
 src/active.c         |   17 
 src/art.c            |  429 ++--
 src/config.c         |  152 +
 src/filter.c         |    2 
 src/init.c           |    3 
 src/lang.c           |  919 ++++-----
 src/lock.c           |    3 
 src/main.c           |  100 -
 src/misc.c           |  110 -
 src/newsrc.c         |   34 
 src/nntplib.c        |   15 
 src/open.c           |  155 -
 src/page.c           |   17 
 src/post.c           |  170 +
 src/refs.c           |    6 
 src/rfc2046.c        |   15 
 src/search.c         |    2 
 src/tcurses.c        |    6 
 src/trace.c          |    2 
 src/version.c        |    4 
 src/xface.c          |   13 
 tools/opt-case.pl    |    4 
 tools/tinews.pl      |    8 
 tools/w2r.pl         |    4 
 59 files changed, 14463 insertions, 13168 deletions
-----------------------------------------------------------------------------
diff -Nurp tin-1.5.18/MANIFEST tin-1.6.0/MANIFEST
--- tin-1.5.18/MANIFEST	Mon Jun  2 14:58:15 2003
+++ tin-1.6.0/MANIFEST	Mon Jul 14 19:17:34 2003
@@ -1,91 +1,93 @@
-MANIFEST for tin-1.5.18 (Mon Jun  2 14:58:15 CEST 2003)
+MANIFEST for tin-1.6.0 (Mon Jul 14 19:17:33 CEST 2003)
 ----------------------------------------------------
-  13019 ./Makefile
-   7466 ./MANIFEST
+  13063 ./Makefile
+   7512 ./MANIFEST
    1440 ./README
     217 ./README.MAC
    2209 ./README.VMS
    1006 ./README.WIN
- 128906 ./aclocal.m4
+ 133232 ./aclocal.m4
     882 ./conf-tin
-  41510 ./config.guess
-  30003 ./config.sub
- 447322 ./configure
-  29373 ./configure.in
+  41853 ./config.guess
+  30260 ./config.sub
+ 449433 ./configure
+  28778 ./configure.in
    5555 ./install.sh
     777 ./mkdirs.sh
   18847 ./doc/ABOUT-NLS
-  70355 ./doc/CHANGES
+  72901 ./doc/CHANGES
  153546 ./doc/CHANGES.old
    1469 ./doc/DEBUG_REFS
-  29162 ./doc/INSTALL
-  33075 ./doc/TODO
-   3344 ./doc/WHATSNEW
+  29430 ./doc/INSTALL
+  32439 ./doc/TODO
+   3302 ./doc/WHATSNEW
    2617 ./doc/art_handling.txt
    3862 ./doc/auth.txt
    5346 ./doc/config-anomalies
   11237 ./doc/filtering
   35037 ./doc/good-netkeeping-seal
-   3662 ./doc/internals.txt
+   3812 ./doc/internals.txt
   23621 ./doc/iso2asc.txt
    4048 ./doc/keymap.sample
     660 ./doc/mailcap.sample
    3365 ./doc/mime.types
-   5159 ./doc/opt-case.1
+   1541 ./doc/nov_tests
+   5155 ./doc/opt-case.1
    3984 ./doc/pgp.txt
    2711 ./doc/rcvars.txt
    1525 ./doc/reading-mail.txt
    1615 ./doc/umlaute.txt
    1914 ./doc/umlauts.txt
    4675 ./doc/tin.defaults
+   7381 ./doc/tinews.1
    1879 ./doc/tools.txt
    5870 ./doc/mbox.5
    4168 ./doc/mmdf.5
    2128 ./doc/newsoverview.5
    6963 ./doc/plp_snprintf.3
- 118154 ./doc/tin.1
-  68177 ./doc/tin.5
-   4729 ./doc/w2r.1
+ 119928 ./doc/tin.1
+  69479 ./doc/tin.5
+   4733 ./doc/w2r.1
    2196 ./doc/wildmat.3
     344 ./tools/expiretover
    3815 ./tools/metamutt
-   2779 ./tools/opt-case.pl
+   2787 ./tools/opt-case.pl
    1410 ./tools/tinlock
-  17973 ./tools/tinews.pl
+  17986 ./tools/tinews.pl
    1561 ./tools/url_handler.sh
-   3164 ./tools/w2r.pl
+   3172 ./tools/w2r.pl
    1661 ./tools/expand_aliases.tgz
    2702 ./include/bool.h
    2128 ./include/bugrep.h
    9502 ./include/oldconfig.h
-  56987 ./include/extern.h
+  57641 ./include/extern.h
   11429 ./include/keymap.h
   15886 ./include/menukeys.h
    6539 ./include/nntplib.h
     665 ./include/plp_snprintf.h
   11836 ./include/policy.h
-  29978 ./include/proto.h
+  29881 ./include/proto.h
    5047 ./include/rfc2046.h
    3373 ./include/stpwatch.h
-   5440 ./include/tcurses.h
-  65820 ./include/tin.h
+   5400 ./include/tcurses.h
+  66103 ./include/tin.h
   12721 ./include/tinrc.h
    5736 ./include/tnntp.h
    2256 ./include/trace.h
-   2646 ./include/version.h
-  25190 ./src/active.c
-  47685 ./src/art.c
+   2686 ./include/version.h
+  24977 ./src/active.c
+  50476 ./src/art.c
   30113 ./src/attrib.c
   12301 ./src/auth.c
   13846 ./src/charset.c
    5977 ./src/color.c
-  81783 ./src/config.c
+  85068 ./src/config.c
   29259 ./src/cook.c
   33982 ./src/curses.c
    9928 ./src/debug.c
    3414 ./src/envarg.c
   25202 ./src/feed.c
-  52291 ./src/filter.c
+  52288 ./src/filter.c
   17920 ./src/getline.c
    7254 ./src/global.c
   44263 ./src/group.c
@@ -93,53 +95,53 @@ MANIFEST for tin-1.5.18 (Mon Jun  2 14:5
    9671 ./src/header.c
   27952 ./src/help.c
   13778 ./src/inews.c
-  31817 ./src/init.c
+  31785 ./src/init.c
    2845 ./src/joinpath.c
   38017 ./src/keymap.c
- 113592 ./src/lang.c
+ 113639 ./src/lang.c
    4310 ./src/langinfo.c
    7031 ./src/list.c
-   6631 ./src/lock.c
+   6672 ./src/lock.c
   11882 ./src/mail.c
-  28202 ./src/main.c
+  26669 ./src/main.c
   10227 ./src/makecfg.c
   12207 ./src/memory.c
    5222 ./src/mimetypes.c
-  85352 ./src/misc.c
-  36911 ./src/newsrc.c
-  27528 ./src/nntplib.c
+  83791 ./src/misc.c
+  37475 ./src/newsrc.c
+  27739 ./src/nntplib.c
    7248 ./src/nrctbl.c
-  27202 ./src/open.c
-  52540 ./src/page.c
+  26658 ./src/open.c
+  52519 ./src/page.c
   24132 ./src/parsdate.y
   16966 ./src/plp_snprintf.c
   12670 ./src/pgp.c
- 126692 ./src/post.c
+ 130350 ./src/post.c
   13850 ./src/prompt.c
   10822 ./src/read.c
-  24997 ./src/refs.c
+  24995 ./src/refs.c
    4621 ./src/regex.c
   14215 ./src/rfc1524.c
    5553 ./src/rfc2045.c
-  26677 ./src/rfc2046.c
+  26708 ./src/rfc2046.c
   23766 ./src/rfc2047.c
   36349 ./src/save.c
   11391 ./src/screen.c
-  12766 ./src/search.c
+  12769 ./src/search.c
   30501 ./src/select.c
    7739 ./src/sigfile.c
   12361 ./src/signal.c
    7001 ./src/strftime.c
   12465 ./src/string.c
   13809 ./src/tags.c
-  15646 ./src/tcurses.c
+  15694 ./src/tcurses.c
    3058 ./src/tmpfile.c
    3376 ./src/my_tmpfile.c
   39580 ./src/thread.c
    2466 ./src/trace.c
-   4079 ./src/version.c
+   4120 ./src/version.c
    5489 ./src/wildmat.c
-   6780 ./src/xface.c
+   7133 ./src/xface.c
    7397 ./src/xref.c
    4987 ./amiga/README
    5520 ./amiga/tin.readme
@@ -213,9 +215,9 @@ MANIFEST for tin-1.5.18 (Mon Jun  2 14:5
    1527 ./pcre/testdata/testoutput3
   14599 ./pcre/testdata/testoutput4
   18789 ./pcre/testdata/testoutput5
-  19046 ./include/autoconf.hin
+  19111 ./include/autoconf.hin
    5800 ./pcre/pcre.mms
-  19788 ./src/Makefile.in
+  19821 ./src/Makefile.in
    7114 ./src/tincfg.tbl
    8747 ./src/descrip.mms
     954 ./libcanlock/Build
@@ -276,15 +278,15 @@ MANIFEST for tin-1.5.18 (Mon Jun  2 14:5
    1044 ./intl/ref-del.sin
    4481 ./intl/textdomain.c
      41 ./intl/VERSION
-   4941 ./po/Makefile.inn
+   4962 ./po/Makefile.inn
     839 ./po/POTFILES.in
- 120058 ./po/tin.pot
- 160967 ./po/de.gmo
- 192601 ./po/de.po
+ 120568 ./po/tin.pot
+ 164588 ./po/de.gmo
+ 195160 ./po/de.po
    7445 ./po/en_GB.gmo
- 122586 ./po/en_GB.po
- 156364 ./po/et.gmo
- 186068 ./po/et.po
-  75542 ./po/fr.gmo
- 151060 ./po/fr.po
-5816235 total
+ 123096 ./po/en_GB.po
+ 156433 ./po/et.gmo
+ 186993 ./po/et.po
+ 104776 ./po/fr.gmo
+ 165736 ./po/fr.po
+5897307 total
diff -Nurp tin-1.5.18/Makefile tin-1.6.0/Makefile
--- tin-1.5.18/Makefile	Mon Jun  2 14:58:13 2003
+++ tin-1.6.0/Makefile	Mon Jul 14 19:17:31 2003
@@ -1,15 +1,15 @@
 # Top level Makefile for tin
 # - for configuration options read the doc/INSTALL file.
 #
-# Updated: 2002-05-06
+# Updated: 2003-06-26
 #
 
 PROJECT	= tin
 LVER	= 1
-PVER	= 5
-SVER	= 18
+PVER	= 6
+SVER	= 0
 VER	= $(LVER).$(PVER).$(SVER)
-DVER	= 20030602
+DVER	= 20030714
 EXE	= tin
 
 # directory structure
@@ -168,6 +168,7 @@ DOC	= \
 	$(DOCDIR)/keymap.sample \
 	$(DOCDIR)/mailcap.sample \
 	$(DOCDIR)/mime.types \
+	$(DOCDIR)/nov_tests \
 	$(DOCDIR)/opt-case.1 \
 	$(DOCDIR)/pgp.txt \
 	$(DOCDIR)/rcvars.txt \
@@ -175,6 +176,7 @@ DOC	= \
 	$(DOCDIR)/umlaute.txt \
 	$(DOCDIR)/umlauts.txt \
 	$(DOCDIR)/tin.defaults \
+	$(DOCDIR)/tinews.1 \
 	$(DOCDIR)/tools.txt \
 	$(DOCDIR)/mbox.5 \
 	$(DOCDIR)/mmdf.5 \
diff -Nurp tin-1.5.18/aclocal.m4 tin-1.6.0/aclocal.m4
--- tin-1.5.18/aclocal.m4	Thu May  8 23:09:35 2003
+++ tin-1.6.0/aclocal.m4	Sat Jul 12 15:49:45 2003
@@ -2,7 +2,7 @@ dnl Project   : tin - a Usenet reader
 dnl Module    : aclocal.m4
 dnl Author    : Thomas E. Dickey <dickey@herndon4.his.com>
 dnl Created   : 1995-08-24
-dnl Updated   : 2003-04-26
+dnl Updated   : 2003-06-04
 dnl Notes     :
 dnl
 dnl Copyright (c) 1995-2003 Thomas E. Dickey <dickey@herndon4.his.com>
@@ -921,6 +921,91 @@ esac
 $3="$withval"
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_BUNDLED_INTL version: 6 updated: 2003/06/06 00:48:41
+dnl ---------------
+dnl Top-level macro for configuring an application with a bundled copy of
+dnl the intl and po directories for gettext.
+dnl
+dnl $1 specifies either Makefile or makefile, defaulting to the former.
+dnl $2 if nonempty sets the option to --enable-nls rather than to --disable-nls
+dnl
+dnl Sets variables which can be used to substitute in makefiles:
+dnl	INTLDIR_MAKE - to make ./intl directory
+dnl	MSG_DIR_MAKE - to make ./po directory
+dnl	SUB_MAKEFILE - list of makefiles in ./intl, ./po directories
+dnl Defines
+dnl	HAVE_LIBGETTEXT_H if we're using ./intl
+dnl
+AC_DEFUN([CF_BUNDLED_INTL],[
+cf_makefile=ifelse($1,,Makefile,$1)
+
+dnl Set of available languages (based on source distribution).  Note that
+dnl setting $LINGUAS overrides $ALL_LINGUAS.  Some environments set $LINGUAS
+dnl rather than $LC_ALL
+test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
+
+AM_GNU_GETTEXT(,,,[$2])
+
+INTLDIR_MAKE=
+MSG_DIR_MAKE=
+SUB_MAKEFILE=
+
+dnl this updates SUB_MAKEFILE and MSG_DIR_MAKE:
+CF_OUR_MESSAGES($1)
+
+if test "$USE_INCLUDED_LIBINTL" = yes ; then
+        if test "$nls_cv_force_use_gnu_gettext" = yes ; then
+		SUB_MAKEFILE="$SUB_MAKEFILE intl/$cf_makefile"
+	elif test "$nls_cv_use_gnu_gettext" = yes ; then
+		SUB_MAKEFILE="$SUB_MAKEFILE intl/$cf_makefile"
+	else
+		INTLDIR_MAKE="#"
+	fi
+	if test -z "$INTLDIR_MAKE"; then
+		AC_DEFINE(HAVE_LIBGETTEXT_H)
+	fi
+else
+	INTLDIR_MAKE="#"
+	if test "$USE_NLS" = yes ; then
+		AC_CHECK_HEADERS(libintl.h)
+	fi
+fi
+
+if test -z "$INTLDIR_MAKE" ; then
+	CPPFLAGS="-I../intl $CPPFLAGS"
+fi
+
+dnl FIXME:  we use this in lynx (the alternative is a spurious dependency upon
+dnl GNU make)
+if test "$BUILD_INCLUDED_LIBINTL" = yes ; then
+	GT_YES="#"
+	GT_NO=
+else
+	GT_YES=
+	GT_NO="#"
+fi
+
+AC_SUBST(INTLDIR_MAKE)
+AC_SUBST(MSG_DIR_MAKE)
+AC_SUBST(GT_YES)
+AC_SUBST(GT_NO)
+
+dnl FIXME:  the underlying AM_GNU_GETTEXT macro either needs some fixes or a
+dnl little documentation.  It doesn't define anything so that we can ifdef our
+dnl own code, except ENABLE_NLS, which is too vague to be of any use.
+
+if test "$USE_INCLUDED_LIBINTL" = yes ; then
+	if test "$nls_cv_force_use_gnu_gettext" = yes ; then
+		AC_DEFINE(HAVE_GETTEXT)
+	elif test "$nls_cv_use_gnu_gettext" = yes ; then
+		AC_DEFINE(HAVE_GETTEXT)
+	fi
+	if test -n "$nls_cv_header_intl" ; then
+		AC_DEFINE(HAVE_LIBINTL_H)
+	fi
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_BUNDLED_PCRE version: 3 updated: 2002/04/17 21:09:56
 dnl ---------------
 dnl Top-level macro for configuring an application with a bundled copy of
@@ -1325,7 +1410,7 @@ AC_MSG_RESULT($cf_cv_cpp_expands)
 test $cf_cv_cpp_expands = yes && AC_DEFINE(CPP_DOES_EXPAND)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CPPFLAGS version: 6 updated: 2002/10/27 18:21:42
+dnl CF_CURSES_CPPFLAGS version: 7 updated: 2003/06/06 00:48:41
 dnl ------------------
 dnl Look for the curses headers.
 AC_DEFUN([CF_CURSES_CPPFLAGS],[
@@ -1344,7 +1429,7 @@ sunos3*|sunos4*)
 	;;
 esac
 ])
-test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
 AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[
 cf_cv_ncurses_header=none
@@ -2147,7 +2232,21 @@ AC_MSG_RESULT($cf_cv_system_status)
 test $cf_cv_system_status = no && AC_DEFINE(USE_SYSTEM_STATUS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 12 updated: 2002/11/23 16:02:49
+dnl CF_GCC_VERSION version: 2 updated: 2003/05/24 15:01:41
+dnl --------------
+dnl Find version of gcc
+AC_DEFUN([CF_GCC_VERSION],[
+AC_REQUIRE([AC_PROG_CC])
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	AC_MSG_CHECKING(version of $CC)
+	GCC_VERSION="`${CC} --version|head -1 | sed -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	AC_MSG_RESULT($GCC_VERSION)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_GCC_WARNINGS version: 14 updated: 2003/05/24 15:03:15
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -2155,11 +2254,13 @@ dnl
 dnl	-Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
 dnl	-Wredundant-decls (system headers make this too noisy)
 dnl	-Wtraditional (combines too many unrelated messages, only a few useful)
-dnl	-Wwrite-strings (too noisy, but should review occasionally)
+dnl	-Wwrite-strings (too noisy, but should review occasionally).  This
+dnl		is enabled for ncurses using "--enable-const".
 dnl	-pedantic
 dnl
 AC_DEFUN([CF_GCC_WARNINGS],
 [
+AC_REQUIRE([CF_GCC_VERSION])
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
 	cat > conftest.$ac_ext <<EOF
@@ -2187,8 +2288,19 @@ EOF
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
 		if AC_TRY_EVAL(ac_compile); then
 			test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
+			case $cf_opt in #(vi
+			Wcast-qual) #(vi
+				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
+				;;
+			Winline) #(vi
+				case $GCC_VERSION in
+				3.3*)
+					CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
+					continue;;
+				esac
+				;;
+			esac
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
 		fi
 	done
 	rm -f conftest*
@@ -2254,70 +2366,6 @@ dnl Construct a search-list for a nonsta
 AC_DEFUN([CF_LIBRARY_PATH],
 [CF_SUBDIR_PATH($1,$2,lib)])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SUBDIR_PATH version: 3 updated: 2002/12/29 18:30:46
-dnl --------------
-dnl Construct a search-list for a nonstandard header/lib-file
-dnl	$1 = the variable to return as result
-dnl	$2 = the package name
-dnl	$3 = the subdirectory, e.g., bin, include or lib
-AC_DEFUN([CF_SUBDIR_PATH],
-[$1=""
-
-test -d [$]HOME && {
-	test -n "$verbose" && echo "	... testing $3-directories under [$]HOME"
-	test -d [$]HOME/$3 &&          $1="[$]$1 [$]HOME/$3"
-	test -d [$]HOME/$3/$2 &&       $1="[$]$1 [$]HOME/$3/$2"
-	test -d [$]HOME/$3/$2/$3 &&    $1="[$]$1 [$]HOME/$3/$2/$3"
-}
-
-# For other stuff under the home directory, it should be sufficient to put
-# a symbolic link for $HOME/$2 to the actual package location:
-test -d [$]HOME/$2 && {
-	test -n "$verbose" && echo "	... testing $3-directories under [$]HOME/$2"
-	test -d [$]HOME/$2/$3 &&       $1="[$]$1 [$]HOME/$2/$3"
-	test -d [$]HOME/$2/$3/$2 &&    $1="[$]$1 [$]HOME/$2/$3/$2"
-}
-
-test "$prefix" != /usr/local && \
-test -d /usr/local && {
-	test -n "$verbose" && echo "	... testing $3-directories under /usr/local"
-	test -d /usr/local/$3 &&       $1="[$]$1 /usr/local/$3"
-	test -d /usr/local/$3/$2 &&    $1="[$]$1 /usr/local/$3/$2"
-	test -d /usr/local/$3/$2/$3 && $1="[$]$1 /usr/local/$3/$2/$3"
-	test -d /usr/local/$2/$3 &&    $1="[$]$1 /usr/local/$2/$3"
-	test -d /usr/local/$2/$3/$2 && $1="[$]$1 /usr/local/$2/$3/$2"
-}
-
-test "$prefix" != NONE && \
-test -d $prefix && {
-	test -n "$verbose" && echo "	... testing $3-directories under $prefix"
-	test -d $prefix/$3 &&          $1="[$]$1 $prefix/$3"
-	test -d $prefix/$3/$2 &&       $1="[$]$1 $prefix/$3/$2"
-	test -d $prefix/$3/$2/$3 &&    $1="[$]$1 $prefix/$3/$2/$3"
-	test -d $prefix/$2/$3 &&       $1="[$]$1 $prefix/$2/$3"
-	test -d $prefix/$2/$3/$2 &&    $1="[$]$1 $prefix/$2/$3/$2"
-}
-
-test "$prefix" != /opt && \
-test -d /opt && {
-	test -n "$verbose" && echo "	... testing $3-directories under /opt"
-	test -d /opt/$3 &&             $1="[$]$1 /opt/$3"
-	test -d /opt/$3/$2 &&          $1="[$]$1 /opt/$3/$2"
-	test -d /opt/$3/$2/$3 &&       $1="[$]$1 /opt/$3/$2/$3"
-	test -d /opt/$2/$3 &&          $1="[$]$1 /opt/$2/$3"
-	test -d /opt/$2/$3/$2 &&       $1="[$]$1 /opt/$2/$3/$2"
-}
-
-test "$prefix" != /usr && \
-test -d /usr && {
-	test -n "$verbose" && echo "	... testing $3-directories under /usr"
-	test -d /usr/$3 &&             $1="[$]$1 /usr/$3"
-	test -d /usr/$3/$2 &&          $1="[$]$1 /usr/$3/$2"
-	test -d /usr/$3/$2/$3 &&       $1="[$]$1 /usr/$3/$2/$3"
-	test -d /usr/$2/$3 &&          $1="[$]$1 /usr/$2/$3"
-}
-])dnl
-dnl ---------------------------------------------------------------------------
 dnl CF_LIB_PREFIX version: 7 updated: 2001/01/12 01:23:48
 dnl -------------
 dnl Compute the library-prefix for the given host system
@@ -2795,6 +2843,43 @@ LIBS="$LIBS $cf_cv_netlibs"
 test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&AC_FD_MSG
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_OUR_MESSAGES version: 4 updated: 2003/06/06 00:48:41
+dnl ---------------
+dnl Check if we use the messages included with this program
+dnl
+dnl $1 specifies either Makefile or makefile, defaulting to the former.
+dnl
+dnl Sets variables which can be used to substitute in makefiles:
+dnl	MSG_DIR_MAKE - to make ./po directory
+dnl	SUB_MAKEFILE - makefile in ./po directory (see CF_BUNDLED_INTL)
+dnl
+AC_DEFUN([CF_OUR_MESSAGES],
+[
+cf_makefile=ifelse($1,,Makefile,$1)
+
+use_our_messages=no
+if test "$USE_NLS" = yes ; then
+if test -d $srcdir/po ; then
+AC_MSG_CHECKING(if we should use included message-library)
+	AC_ARG_ENABLE(included-msgs,
+	[  --enable-included-msgs  use included messages, for i18n support],
+	[use_our_messages=$enableval],
+	[use_our_messages=yes])
+fi
+AC_MSG_RESULT($use_our_messages)
+fi
+
+MSG_DIR_MAKE="#"
+if test "$use_our_messages" = yes
+then
+	SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:po/$cf_makefile.inn"
+	MSG_DIR_MAKE=
+fi
+
+AC_SUBST(MSG_DIR_MAKE)
+AC_SUBST(SUB_MAKEFILE)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_PATHSEP version: 3 updated: 2001/01/12 01:23:53
 dnl ----------
 dnl Provide a value for the $PATH and similar separator
@@ -3433,6 +3518,70 @@ if test "$ac_cv_header_termios_h" = yes 
 	AC_MSG_RESULT($termios_bad)
 	fi
 fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SUBDIR_PATH version: 3 updated: 2002/12/29 18:30:46
+dnl --------------
+dnl Construct a search-list for a nonstandard header/lib-file
+dnl	$1 = the variable to return as result
+dnl	$2 = the package name
+dnl	$3 = the subdirectory, e.g., bin, include or lib
+AC_DEFUN([CF_SUBDIR_PATH],
+[$1=""
+
+test -d [$]HOME && {
+	test -n "$verbose" && echo "	... testing $3-directories under [$]HOME"
+	test -d [$]HOME/$3 &&          $1="[$]$1 [$]HOME/$3"
+	test -d [$]HOME/$3/$2 &&       $1="[$]$1 [$]HOME/$3/$2"
+	test -d [$]HOME/$3/$2/$3 &&    $1="[$]$1 [$]HOME/$3/$2/$3"
+}
+
+# For other stuff under the home directory, it should be sufficient to put
+# a symbolic link for $HOME/$2 to the actual package location:
+test -d [$]HOME/$2 && {
+	test -n "$verbose" && echo "	... testing $3-directories under [$]HOME/$2"
+	test -d [$]HOME/$2/$3 &&       $1="[$]$1 [$]HOME/$2/$3"
+	test -d [$]HOME/$2/$3/$2 &&    $1="[$]$1 [$]HOME/$2/$3/$2"
+}
+
+test "$prefix" != /usr/local && \
+test -d /usr/local && {
+	test -n "$verbose" && echo "	... testing $3-directories under /usr/local"
+	test -d /usr/local/$3 &&       $1="[$]$1 /usr/local/$3"
+	test -d /usr/local/$3/$2 &&    $1="[$]$1 /usr/local/$3/$2"
+	test -d /usr/local/$3/$2/$3 && $1="[$]$1 /usr/local/$3/$2/$3"
+	test -d /usr/local/$2/$3 &&    $1="[$]$1 /usr/local/$2/$3"
+	test -d /usr/local/$2/$3/$2 && $1="[$]$1 /usr/local/$2/$3/$2"
+}
+
+test "$prefix" != NONE && \
+test -d $prefix && {
+	test -n "$verbose" && echo "	... testing $3-directories under $prefix"
+	test -d $prefix/$3 &&          $1="[$]$1 $prefix/$3"
+	test -d $prefix/$3/$2 &&       $1="[$]$1 $prefix/$3/$2"
+	test -d $prefix/$3/$2/$3 &&    $1="[$]$1 $prefix/$3/$2/$3"
+	test -d $prefix/$2/$3 &&       $1="[$]$1 $prefix/$2/$3"
+	test -d $prefix/$2/$3/$2 &&    $1="[$]$1 $prefix/$2/$3/$2"
+}
+
+test "$prefix" != /opt && \
+test -d /opt && {
+	test -n "$verbose" && echo "	... testing $3-directories under /opt"
+	test -d /opt/$3 &&             $1="[$]$1 /opt/$3"
+	test -d /opt/$3/$2 &&          $1="[$]$1 /opt/$3/$2"
+	test -d /opt/$3/$2/$3 &&       $1="[$]$1 /opt/$3/$2/$3"
+	test -d /opt/$2/$3 &&          $1="[$]$1 /opt/$2/$3"
+	test -d /opt/$2/$3/$2 &&       $1="[$]$1 /opt/$2/$3/$2"
+}
+
+test "$prefix" != /usr && \
+test -d /usr && {
+	test -n "$verbose" && echo "	... testing $3-directories under /usr"
+	test -d /usr/$3 &&             $1="[$]$1 /usr/$3"
+	test -d /usr/$3/$2 &&          $1="[$]$1 /usr/$3/$2"
+	test -d /usr/$3/$2/$3 &&       $1="[$]$1 /usr/$3/$2/$3"
+	test -d /usr/$2/$3 &&          $1="[$]$1 /usr/$2/$3"
+}
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_SYS_ERRLIST version: 6 updated: 2001/12/30 13:03:23
diff -Nurp tin-1.5.18/config.guess tin-1.6.0/config.guess
--- tin-1.5.18/config.guess	Thu May 22 13:33:47 2003
+++ tin-1.6.0/config.guess	Sat Jul 12 15:49:45 2003
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-05-22'
+timestamp='2003-06-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,6 +106,7 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 dummy=$tmp/dummy ;
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
@@ -282,6 +283,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -770,8 +774,8 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i586-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -881,6 +885,9 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -1194,6 +1201,9 @@ EOF
 	exit 0 ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
+	exit 0 ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
 esac
 
diff -Nurp tin-1.5.18/config.sub tin-1.6.0/config.sub
--- tin-1.5.18/config.sub	Mon Jun  2 14:53:32 2003
+++ tin-1.6.0/config.sub	Sat Jul 12 15:49:45 2003
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-05-24'
+timestamp='2003-06-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -229,7 +229,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
@@ -261,7 +261,7 @@ case $basic_machine in
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -771,18 +771,24 @@ case $basic_machine in
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -841,6 +847,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -848,6 +858,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -922,10 +935,6 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
@@ -1131,7 +1140,7 @@ case $os in
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1276,6 +1285,9 @@ case $basic_machine in
 		;;
 	arm*-semi)
 		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
diff -Nurp tin-1.5.18/configure tin-1.6.0/configure
--- tin-1.5.18/configure	Mon Jun  2 14:58:14 2003
+++ tin-1.6.0/configure	Mon Jul 14 19:17:33 2003
@@ -270,6 +270,7 @@ EOF
 cat <<EOF
   --disable-nls           do not use Native Language Support
   --with-included-gettext use the GNU gettext library included here
+  --enable-included-msgs  use included messages, for i18n support
   --with-x                use the X Window System
   --with-Xaw3d            link with Xaw 3d library
   --with-neXtaw           link with neXT Athena library
@@ -616,7 +617,7 @@ fi
 
 
 PACKAGE=tin
-VERSION=1.5.18
+VERSION=1.6.0
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -656,7 +657,7 @@ else { echo "configure: error: can not r
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:660: checking host system type" >&5
+echo "configure:661: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -752,7 +753,7 @@ case "$host_os" in
 			# Extract the first word of "xlc", so it can be a program name with args.
 set dummy xlc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:756: checking for $ac_word" >&5
+echo "configure:757: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XLC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -802,7 +803,7 @@ save_CFLAGS="$CFLAGS"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:806: checking for $ac_word" >&5
+echo "configure:807: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -832,7 +833,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:836: checking for $ac_word" >&5
+echo "configure:837: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -883,7 +884,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:887: checking for $ac_word" >&5
+echo "configure:888: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -915,7 +916,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:919: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:920: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -926,12 +927,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 930 "configure"
+#line 931 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -957,12 +958,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:961: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:962: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:966: checking whether we are using GNU C" >&5
+echo "configure:967: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -971,7 +972,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -990,7 +991,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:994: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:995: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1022,7 +1023,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1026: checking how to run the C preprocessor" >&5
+echo "configure:1027: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1037,13 +1038,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1041 "configure"
+#line 1042 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1054,13 +1055,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1058 "configure"
+#line 1059 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1071,13 +1072,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1075 "configure"
+#line 1076 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1103,13 +1104,13 @@ echo "$ac_t""$CPP" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1107: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1108: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 1113 "configure"
+#line 1114 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -1127,7 +1128,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 1131 "configure"
+#line 1132 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -1149,7 +1150,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1153: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1154: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1187,7 +1188,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1191: checking for a BSD compatible install" >&5
+echo "configure:1192: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1242,7 +1243,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1246: checking for $ac_word" >&5
+echo "configure:1247: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1294,14 +1295,14 @@ EOF
   do
     rm -f y.tab.ch
     echo $ac_n "checking for $cf_prog""... $ac_c" 1>&6
-echo "configure:1298: checking for $cf_prog" >&5
+echo "configure:1299: checking for $cf_prog" >&5
     cf_command="$cf_prog conftest.y"
     cf_result=no
-    if { (eval echo configure:1301: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then
+    if { (eval echo configure:1302: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then
       mv y.tab.c conftest.c
       rm -f y.tab.h
       if test "$cf_prog" = 'bison -y' ; then
-        if { (eval echo configure:1305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then
+        if { (eval echo configure:1306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then
           cf_result=yes
         fi
       else
@@ -1325,7 +1326,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1329: checking for $ac_word" >&5
+echo "configure:1330: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1356,13 +1357,13 @@ done
 
 
 echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-echo "configure:1360: checking if we must define _GNU_SOURCE" >&5
+echo "configure:1361: checking if we must define _GNU_SOURCE" >&5
 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 1366 "configure"
+#line 1367 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -1372,7 +1373,7 @@ make an error
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_gnu_source=no
 else
@@ -1382,7 +1383,7 @@ else
   cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat > conftest.$ac_ext <<EOF
-#line 1386 "configure"
+#line 1387 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
@@ -1392,7 +1393,7 @@ make an error
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_gnu_source=no
 else
@@ -1414,7 +1415,7 @@ test "$cf_cv_gnu_source" = yes && CPPFLA
 
 
         echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1418: checking for strerror in -lcposix" >&5
+echo "configure:1419: checking for strerror in -lcposix" >&5
 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1422,7 +1423,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1426 "configure"
+#line 1427 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1433,7 +1434,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:1437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1457,7 +1458,7 @@ fi
 
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1461: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1462: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1513,7 +1514,7 @@ fi
 
 
 	cat > conftest.$ac_ext <<EOF
-#line 1517 "configure"
+#line 1518 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -1529,7 +1530,7 @@ int main() {
 	struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:1533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -1628,7 +1629,7 @@ LIB_PREFIX=$LIB_PREFIX
 	
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1632: checking whether ln -s works" >&5
+echo "configure:1633: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1651,55 +1652,24 @@ fi
 
 case "$host_cpu:$host_vendor:$host_os" in
 	# check for MacOS X, exclude Darwin on ix86
-	powerpc:apple:darwin*)  #(vi
-		# replacement for AC_CHECK_LIB()
-		# don't use -f as this might be a link
-		if test -e "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation"; then
-			ac_safe=`echo "CoreFoundation/CoreFoundation.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for CoreFoundation/CoreFoundation.h""... $ac_c" 1>&6
-echo "configure:1661: checking for CoreFoundation/CoreFoundation.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1666 "configure"
-#include "confdefs.h"
-#include <CoreFoundation/CoreFoundation.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-				cat >> confdefs.h <<\EOF
+	powerpc:apple:darwin*)  #
+		cat >> confdefs.h <<\EOF
 #define MAC_OS_X 1
 EOF
 
-				LIBS="/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation $LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-		fi
 		;;
 	# check for cygwin enviroment
 	# -DSTATIC is needed for pcre
 	*:*:*cygwin*)	#(vi
 		PCRE_DEFINES="$PCRE_DEFINES -DSTATIC"
 		;;
+	# SEIUX doesn't have any usefull preprocessor symbol
+	mips:sei:seiux*)
+		cat >> confdefs.h <<\EOF
+#define SEIUX 1
+EOF
+
+		;;
 esac
 
 
@@ -1716,7 +1686,7 @@ if test "${with_ispell+set}" = set; then
   *)
    # user supplied option-value for "--with-ispell=path"
    echo $ac_n "checking for ispell""... $ac_c" 1>&6
-echo "configure:1720: checking for ispell" >&5
+echo "configure:1690: checking for ispell" >&5
    ac_cv_path_PATH_ISPELL="$withval"
    cat >> confdefs.h <<EOF
 #define PATH_ISPELL "$withval"
@@ -1733,7 +1703,7 @@ else
   # Extract the first word of "ispell", so it can be a program name with args.
 set dummy ispell; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1737: checking for $ac_word" >&5
+echo "configure:1707: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PATH_ISPELL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1790,7 +1760,7 @@ if test "${with_metamail+set}" = set; th
   *)
    # user supplied option-value for "--with-metamail=path"
    echo $ac_n "checking for metamail""... $ac_c" 1>&6
-echo "configure:1794: checking for metamail" >&5
+echo "configure:1764: checking for metamail" >&5
    ac_cv_path_PATH_METAMAIL="$withval"
    cat >> confdefs.h <<EOF
 #define PATH_METAMAIL "$withval"
@@ -1807,7 +1777,7 @@ else
   # Extract the first word of "metamail", so it can be a program name with args.
 set dummy metamail; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1811: checking for $ac_word" >&5
+echo "configure:1781: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PATH_METAMAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1864,7 +1834,7 @@ if test "${with_sum+set}" = set; then
   *)
    # user supplied option-value for "--with-sum=path"
    echo $ac_n "checking for sum""... $ac_c" 1>&6
-echo "configure:1868: checking for sum" >&5
+echo "configure:1838: checking for sum" >&5
    ac_cv_path_PATH_SUM="$withval"
    cat >> confdefs.h <<EOF
 #define PATH_SUM "$withval"
@@ -1881,7 +1851,7 @@ else
   # Extract the first word of "sum", so it can be a program name with args.
 set dummy sum; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1885: checking for $ac_word" >&5
+echo "configure:1855: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PATH_SUM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1928,12 +1898,12 @@ fi
 if test $ac_cv_path_PATH_SUM
 then
 echo $ac_n "checking if $ac_cv_path_PATH_SUM takes -r""... $ac_c" 1>&6
-echo "configure:1932: checking if $ac_cv_path_PATH_SUM takes -r" >&5
+echo "configure:1902: checking if $ac_cv_path_PATH_SUM takes -r" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_sum_r'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:1937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:1907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
 then
 	ac_cv_prog_sum_r=yes
 else
@@ -1963,7 +1933,7 @@ fi
 
 
 echo $ac_n "checking for default editor""... $ac_c" 1>&6
-echo "configure:1967: checking for default editor" >&5
+echo "configure:1937: checking for default editor" >&5
 
 # Check whether --with-editor or --without-editor was given.
 if test "${with_editor+set}" = set; then
@@ -1991,7 +1961,7 @@ if test -z "$DEFAULT_EDITOR" ; then
 	# Extract the first word of "vi", so it can be a program name with args.
 set dummy vi; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1995: checking for $ac_word" >&5
+echo "configure:1965: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_EDITOR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2036,7 +2006,7 @@ EOF
 # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2040: checking for $ac_word" >&5
+echo "configure:2010: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2090,7 +2060,7 @@ if test -z "$DEFAULT_MAILER" ; then
 # Extract the first word of "mailx", so it can be a program name with args.
 set dummy mailx; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2094: checking for $ac_word" >&5
+echo "configure:2064: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2127,7 +2097,7 @@ if test -z "$DEFAULT_MAILER" ; then
 # Extract the first word of "mail", so it can be a program name with args.
 set dummy mail; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2131: checking for $ac_word" >&5
+echo "configure:2101: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2161,7 +2131,7 @@ fi
 
 fi
 echo $ac_n "checking for default mailer""... $ac_c" 1>&6
-echo "configure:2165: checking for default mailer" >&5
+echo "configure:2135: checking for default mailer" >&5
 if test -n "$DEFAULT_MAILER" ; then
 	
 case $cf_cv_system_name in #(vi
@@ -2188,7 +2158,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6
 
 
 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6
-echo "configure:2192: checking for incoming-mail directory" >&5
+echo "configure:2162: checking for incoming-mail directory" >&5
 
 # Check whether --with-mailbox or --without-mailbox was given.
 if test "${with_mailbox+set}" = set; then
@@ -2234,7 +2204,7 @@ echo "$ac_t""$DEFAULT_MAILBOX" 1>&6
 
 ## PGP Support
 echo $ac_n "checking if you want PGP/GPG-Support""... $ac_c" 1>&6
-echo "configure:2238: checking if you want PGP/GPG-Support" >&5
+echo "configure:2208: checking if you want PGP/GPG-Support" >&5
 
 # Check whether --enable-pgp-gpg or --disable-pgp-gpg was given.
 if test "${enable_pgp_gpg+set}" = set; then
@@ -2266,7 +2236,7 @@ if test "${with_pgp+set}" = set; then
   *)
    # user supplied option-value for "--with-pgp=path"
    echo $ac_n "checking for pgp""... $ac_c" 1>&6
-echo "configure:2270: checking for pgp" >&5
+echo "configure:2240: checking for pgp" >&5
    ac_cv_path_PATH_PGP="$withval"
    cat >> confdefs.h <<EOF
 #define PATH_PGP "$withval"
@@ -2283,7 +2253,7 @@ else
   # Extract the first word of "pgp", so it can be a program name with args.
 set dummy pgp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2287: checking for $ac_word" >&5
+echo "configure:2257: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2341,7 +2311,7 @@ if test "${with_pgpk+set}" = set; then
   *)
    # user supplied option-value for "--with-pgpk=path"
    echo $ac_n "checking for pgpk""... $ac_c" 1>&6
-echo "configure:2345: checking for pgpk" >&5
+echo "configure:2315: checking for pgpk" >&5
    ac_cv_path_PATH_PGPK="$withval"
    cat >> confdefs.h <<EOF
 #define PATH_PGPK "$withval"
@@ -2358,7 +2328,7 @@ else
   # Extract the first word of "pgpk", so it can be a program name with args.
 set dummy pgpk; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2362: checking for $ac_word" >&5
+echo "configure:2332: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGPK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2416,7 +2386,7 @@ if test "${with_gpg+set}" = set; then
   *)
    # user supplied option-value for "--with-gpg=path"
    echo $ac_n "checking for gpg""... $ac_c" 1>&6
-echo "configure:2420: checking for gpg" >&5
+echo "configure:2390: checking for gpg" >&5
    ac_cv_path_PATH_GPG="$withval"
    cat >> confdefs.h <<EOF
 #define PATH_GPG "$withval"
@@ -2433,7 +2403,7 @@ else
   # Extract the first word of "gpg", so it can be a program name with args.
 set dummy gpg; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2437: checking for $ac_word" >&5
+echo "configure:2407: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PATH_GPG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2490,13 +2460,13 @@ fi
 
 
 echo $ac_n "checking for the default shell program""... $ac_c" 1>&6
-echo "configure:2494: checking for the default shell program" >&5
+echo "configure:2464: checking for the default shell program" >&5
 cf_shell_progs="$cf_cv_default_shell"
 if test -z "$cf_shell_progs" ; then
 	cf_shell_progs="sh ksh bash zsh pdksh jsh keysh ash dash"
 	# TIN preferred default shell for BSD systems is csh. Others are sh.
 	cat > conftest.$ac_ext <<EOF
-#line 2500 "configure"
+#line 2470 "configure"
 #include "confdefs.h"
 
 #include <sys/params.h>
@@ -2509,7 +2479,7 @@ make an error
 
 ; return 0; }
 EOF
-if { (eval echo configure:2513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   $cf_shell_progs="csh tcsh $cf_shell_progs"
 else
@@ -2519,11 +2489,11 @@ fi
 rm -f conftest*
 fi
 
-echo "(line 2523) testing paths of shell programs: $cf_shell_progs ..." 1>&5
+echo "(line 2493) testing paths of shell programs: $cf_shell_progs ..." 1>&5
 
 if test -s /etc/shells && test `egrep -c -v '^(#| |    |$)' /etc/shells` -gt 0; then
 	
-echo "(line 2527) testing /etc/shells ..." 1>&5
+echo "(line 2497) testing /etc/shells ..." 1>&5
 
 	for cf_prog in $cf_shell_progs
 	do
@@ -2558,14 +2528,14 @@ echo "(line 2527) testing /etc/shells ..
 	echo "$ac_t""$DEFAULT_SHELL" 1>&6
 else
 	
-echo "(line 2562) testing $PATH ..." 1>&5
+echo "(line 2532) testing $PATH ..." 1>&5
 
 for ac_prog in $cf_shell_progs
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2569: checking for $ac_word" >&5
+echo "configure:2539: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_SHELL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2618,7 +2588,7 @@ EOF
 
 ### check for this early, since it'll override several options
 echo $ac_n "checking if NNTP-support will be used""... $ac_c" 1>&6
-echo "configure:2622: checking if NNTP-support will be used" >&5
+echo "configure:2592: checking if NNTP-support will be used" >&5
 
 # Check whether --enable-nntp or --disable-nntp was given.
 if test "${enable_nntp+set}" = set; then
@@ -2640,7 +2610,7 @@ echo "$ac_t""$enableval" 1>&6
 USE_SPOOLDIR=yes
 if test "$USE_NNTP" = "yes" ; then
 echo $ac_n "checking whether to be NNTP_ONLY""... $ac_c" 1>&6
-echo "configure:2644: checking whether to be NNTP_ONLY" >&5
+echo "configure:2614: checking whether to be NNTP_ONLY" >&5
 
 # Check whether --enable-nntp-only or --disable-nntp-only was given.
 if test "${enable_nntp_only+set}" = set; then
@@ -2672,7 +2642,7 @@ fi
 
 ###	use option --enable-debug to compile-in test/development code
 echo $ac_n "checking if you want to compile-in debug support""... $ac_c" 1>&6
-echo "configure:2676: checking if you want to compile-in debug support" >&5
+echo "configure:2646: checking if you want to compile-in debug support" >&5
 
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -2699,7 +2669,7 @@ echo "$ac_t""$enableval" 1>&6
 ###	use option --disable-echo to suppress full display compiling commands
 
 echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-echo "configure:2703: checking if you want to see long compiling messages" >&5
+echo "configure:2673: checking if you want to see long compiling messages" >&5
 
 # Check whether --enable-echo or --disable-echo was given.
 if test "${enable_echo+set}" = set; then
@@ -2744,7 +2714,7 @@ echo "$ac_t""$enableval" 1>&6
 
 ### use option --enable-prototypes to turn on optional prototypes
 echo $ac_n "checking if you want to compile with fallback prototypes""... $ac_c" 1>&6
-echo "configure:2748: checking if you want to compile with fallback prototypes" >&5
+echo "configure:2718: checking if you want to compile with fallback prototypes" >&5
 
 # Check whether --enable-prototypes or --disable-prototypes was given.
 if test "${enable_prototypes+set}" = set; then
@@ -2768,7 +2738,7 @@ EXTRA_CFLAGS=""
 if test -n "$GCC"
 then
 echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-echo "configure:2772: checking if you want to turn on gcc warnings" >&5
+echo "configure:2742: checking if you want to turn on gcc warnings" >&5
 
 # Check whether --enable-warnings or --disable-warnings was given.
 if test "${enable_warnings+set}" = set; then
@@ -2790,14 +2760,26 @@ if test "$with_warnings" = "yes"
 then
 	with_ext_const=yes
 	
+
+GCC_VERSION=none
+if test "$GCC" = yes ; then
+	echo $ac_n "checking version of $CC""... $ac_c" 1>&6
+echo "configure:2768: checking version of $CC" >&5
+	GCC_VERSION="`${CC} --version|head -1 | sed -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
+	echo "$ac_t""$GCC_VERSION" 1>&6
+fi
+
+
+
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
 	cat > conftest.$ac_ext <<EOF
-#line 2797 "configure"
+#line 2779 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 	echo "checking for $CC warning options" 1>&6
-echo "configure:2801: checking for $CC warning options" >&5
+echo "configure:2783: checking for $CC warning options" >&5
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
 	cf_warn_CONST=""
@@ -2816,10 +2798,22 @@ echo "configure:2801: checking for $CC w
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo configure:2820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+		if { (eval echo configure:2802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
+			case $cf_opt in #(vi
+			Wcast-qual) #(vi
+				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
+				;;
+			Winline) #(vi
+				case $GCC_VERSION in
+				3.3*)
+					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
+
+					continue;;
+				esac
+				;;
+			esac
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-			test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
 		fi
 	done
 	rm -f conftest*
@@ -2834,7 +2828,7 @@ fi
 if test "$USE_SPOOLDIR" = "yes"; then
 	## options for directories
 	echo $ac_n "checking for news-library path""... $ac_c" 1>&6
-echo "configure:2838: checking for news-library path" >&5
+echo "configure:2832: checking for news-library path" >&5
 	
 # Check whether --with-libdir or --without-libdir was given.
 if test "${with_libdir+set}" = set; then
@@ -2872,7 +2866,7 @@ eval NEWSLIBDIR="$withval"
 	echo "$ac_t""$NEWSLIBDIR" 1>&6
 
 	echo $ac_n "checking for news spool-directory path""... $ac_c" 1>&6
-echo "configure:2876: checking for news spool-directory path" >&5
+echo "configure:2870: checking for news spool-directory path" >&5
 	
 # Check whether --with-spooldir or --without-spooldir was given.
 if test "${with_spooldir+set}" = set; then
@@ -2910,7 +2904,7 @@ eval SPOOLDIR="$withval"
 	echo "$ac_t""$SPOOLDIR" 1>&6
 
 	echo $ac_n "checking for news overview-directory path""... $ac_c" 1>&6
-echo "configure:2914: checking for news overview-directory path" >&5
+echo "configure:2908: checking for news overview-directory path" >&5
 	
 # Check whether --with-nov-dir or --without-nov-dir was given.
 if test "${with_nov_dir+set}" = set; then
@@ -2948,7 +2942,7 @@ eval NOVROOTDIR="$withval"
 	echo "$ac_t""$NOVROOTDIR" 1>&6
 
 	echo $ac_n "checking for overview filename""... $ac_c" 1>&6
-echo "configure:2952: checking for overview filename" >&5
+echo "configure:2946: checking for overview filename" >&5
 	
 # Check whether --with-nov-fname or --without-nov-fname was given.
 if test "${with_nov_fname+set}" = set; then
@@ -2984,7 +2978,7 @@ fi
 ## TODO: kick the --with-inews-dir= stuff, the check below should be enough
 ## (requires some code rework in tin)
 echo $ac_n "checking for directory containing \"inews\"""... $ac_c" 1>&6
-echo "configure:2988: checking for directory containing \"inews\"" >&5
+echo "configure:2982: checking for directory containing \"inews\"" >&5
 
 # Check whether --with-inews-dir or --without-inews-dir was given.
 if test "${with_inews_dir+set}" = set; then
@@ -3025,7 +3019,7 @@ echo "$ac_t""$INEWSDIR" 1>&6
 # Extract the first word of "inews", so it can be a program name with args.
 set dummy inews; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3029: checking for $ac_word" >&5
+echo "configure:3023: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_INEWS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3082,7 +3076,7 @@ fi
 if test "$USE_SPOOLDIR" = "yes"; then
 	## options for libraries
 	echo $ac_n "checking for optional INN-NNTP library""... $ac_c" 1>&6
-echo "configure:3086: checking for optional INN-NNTP library" >&5
+echo "configure:3080: checking for optional INN-NNTP library" >&5
 	
 # Check whether --with-inn-nntplib or --without-inn-nntplib was given.
 if test "${with_inn_nntplib+set}" = set; then
@@ -3114,7 +3108,7 @@ fi
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
 echo $ac_n "checking if you want socks library""... $ac_c" 1>&6
-echo "configure:3118: checking if you want socks library" >&5
+echo "configure:3112: checking if you want socks library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3134,7 +3128,7 @@ fi
 echo "$ac_t""$cf_cv_use_libsocks" 1>&6
 
 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6
-echo "configure:3138: checking if you want socks5 library" >&5
+echo "configure:3132: checking if you want socks5 library" >&5
 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3210,7 +3204,7 @@ cat >> confdefs.h <<\EOF
 EOF
 
 cat > conftest.$ac_ext <<EOF
-#line 3214 "configure"
+#line 3208 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -3219,7 +3213,7 @@ int main() {
 	accept((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:3223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -3233,7 +3227,7 @@ else
 	
 cf_test_netlibs=no
 echo $ac_n "checking for network libraries""... $ac_c" 1>&6
-echo "configure:3237: checking for network libraries" >&5
+echo "configure:3231: checking for network libraries" >&5
 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3244,12 +3238,12 @@ cf_test_netlibs=yes
 for ac_func in gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3248: checking for $ac_func" >&5
+echo "configure:3242: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3253 "configure"
+#line 3247 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3272,7 +3266,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3295,7 +3289,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:3299: checking for gethostname in -lnsl" >&5
+echo "configure:3293: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3303,7 +3297,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3307 "configure"
+#line 3301 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3314,7 +3308,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3347,7 +3341,7 @@ else
 	
 		
 echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6
-echo "configure:3351: checking for gethostname in -lsocket" >&5
+echo "configure:3345: checking for gethostname in -lsocket" >&5
 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3355,7 +3349,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3359 "configure"
+#line 3353 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3366,7 +3360,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:3370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3411,7 +3405,7 @@ done
 # I don't know the entrypoints - 97/7/22 TD
 # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs")
 echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
-echo "configure:3415: checking for main in -linet" >&5
+echo "configure:3409: checking for main in -linet" >&5
 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3419,14 +3413,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-linet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3423 "configure"
+#line 3417 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3451,12 +3445,12 @@ if test "$ac_cv_func_lsocket" != no ; th
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3455: checking for $ac_func" >&5
+echo "configure:3449: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3460 "configure"
+#line 3454 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3479,7 +3473,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3502,7 +3496,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3506: checking for socket in -lsocket" >&5
+echo "configure:3500: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3510,7 +3504,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3514 "configure"
+#line 3508 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3521,7 +3515,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3554,7 +3548,7 @@ else
 	
 		
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:3558: checking for socket in -lbsd" >&5
+echo "configure:3552: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3562,7 +3556,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3566 "configure"
+#line 3560 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3573,7 +3567,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3618,12 +3612,12 @@ fi
 for ac_func in gethostbyname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3622: checking for $ac_func" >&5
+echo "configure:3616: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3627 "configure"
+#line 3621 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3646,7 +3640,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3669,7 +3663,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3673: checking for gethostbyname in -lnsl" >&5
+echo "configure:3667: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3677,7 +3671,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3681 "configure"
+#line 3675 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3688,7 +3682,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:3692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3729,12 +3723,12 @@ done
 for ac_func in strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3733: checking for $ac_func" >&5
+echo "configure:3727: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3738 "configure"
+#line 3732 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3757,7 +3751,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3780,7 +3774,7 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
-echo "configure:3784: checking for strcasecmp in -lresolv" >&5
+echo "configure:3778: checking for strcasecmp in -lresolv" >&5
 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3788,7 +3782,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3792 "configure"
+#line 3786 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3799,7 +3793,7 @@ int main() {
 strcasecmp()
 ; return 0; }
 EOF
-if { (eval echo configure:3803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3871,10 +3865,10 @@ cat >> confdefs.h <<\EOF
 EOF
 
 echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6
-echo "configure:3875: checking if the socks library uses socks4 prefix" >&5
+echo "configure:3869: checking if the socks library uses socks4 prefix" >&5
 cf_use_socks4=error
 cat > conftest.$ac_ext <<EOF
-#line 3878 "configure"
+#line 3872 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -3883,7 +3877,7 @@ int main() {
 	Rinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:3887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -3895,14 +3889,14 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 3899 "configure"
+#line 3893 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int main() {
 SOCKSinit((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:3906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_use_socks4=no
 else
@@ -3967,9 +3961,9 @@ EOF
 
 fi
 echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6
-echo "configure:3971: checking if socks5p.h is available" >&5
+echo "configure:3965: checking if socks5p.h is available" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3973 "configure"
+#line 3967 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -3979,7 +3973,7 @@ int main() {
 	init((char *)0)
 ; return 0; }
 EOF
-if { (eval echo configure:3983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_use_socks5p_h=yes
 else
@@ -4005,17 +3999,17 @@ for ac_hdr in unistd.h fcntl.h sys/file.
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4009: checking for $ac_hdr" >&5
+echo "configure:4003: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4014 "configure"
+#line 4008 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4042,12 +4036,12 @@ fi
 done
 
 echo $ac_n "checking for fcntl""... $ac_c" 1>&6
-echo "configure:4046: checking for fcntl" >&5
+echo "configure:4040: checking for fcntl" >&5
 if eval "test \"`echo '$''{'ac_cv_func_fcntl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4051 "configure"
+#line 4045 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char fcntl(); below.  */
@@ -4070,7 +4064,7 @@ fcntl();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_fcntl=yes"
 else
@@ -4090,12 +4084,12 @@ else
 fi
 
 echo $ac_n "checking for lockf""... $ac_c" 1>&6
-echo "configure:4094: checking for lockf" >&5
+echo "configure:4088: checking for lockf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_lockf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4099 "configure"
+#line 4093 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char lockf(); below.  */
@@ -4118,7 +4112,7 @@ lockf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_lockf=yes"
 else
@@ -4138,12 +4132,12 @@ else
 fi
 
 echo $ac_n "checking for flock""... $ac_c" 1>&6
-echo "configure:4142: checking for flock" >&5
+echo "configure:4136: checking for flock" >&5
 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4147 "configure"
+#line 4141 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char flock(); below.  */
@@ -4166,7 +4160,7 @@ flock();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_flock=yes"
 else
@@ -4187,7 +4181,7 @@ fi
 
 
 echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6
-echo "configure:4191: checking for file-locking functions" >&5
+echo "configure:4185: checking for file-locking functions" >&5
 if eval "test \"`echo '$''{'cf_cv_lockfile'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4199,7 +4193,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se
 	case $cf_lock in #(vi
 	fcntl) #(vi
 		cat > conftest.$ac_ext <<EOF
-#line 4203 "configure"
+#line 4197 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4227,7 +4221,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:4231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -4239,7 +4233,7 @@ rm -f conftest*
 		;;
 	lockf) #(vi
 		cat > conftest.$ac_ext <<EOF
-#line 4243 "configure"
+#line 4237 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4259,7 +4253,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:4263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -4271,7 +4265,7 @@ rm -f conftest*
 		;;
 	flock)
 		cat > conftest.$ac_ext <<EOF
-#line 4275 "configure"
+#line 4269 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4294,7 +4288,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:4298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -4315,7 +4309,7 @@ echo "$ac_t""$cf_cv_lockfile" 1>&6
 
 
 echo $ac_n "checking which locking method should be used""... $ac_c" 1>&6
-echo "configure:4319: checking which locking method should be used" >&5
+echo "configure:4313: checking which locking method should be used" >&5
 ### fcntl() is preferred, if the user just disables fcntl()
 ### without specifying an alternative lockf() is preferred
 
@@ -4384,7 +4378,7 @@ fi
 
 
 echo $ac_n "checking for screen type""... $ac_c" 1>&6
-echo "configure:4388: checking for screen type" >&5
+echo "configure:4382: checking for screen type" >&5
 
 # Check whether --with-screen or --without-screen was given.
 if test "${with_screen+set}" = set; then
@@ -4400,7 +4394,7 @@ use_curses=no
 use_ncurses=no
 
 echo $ac_n "checking if you specified curses install-directory""... $ac_c" 1>&6
-echo "configure:4404: checking if you specified curses install-directory" >&5
+echo "configure:4398: checking if you specified curses install-directory" >&5
 
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
@@ -4457,7 +4451,7 @@ pdcurses) #(vi
 	;;
 none)
 	echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6
-echo "configure:4461: checking if you want to use ncurses library" >&5
+echo "configure:4455: checking if you want to use ncurses library" >&5
 	
 # Check whether --with-ncurses or --without-ncurses was given.
 if test "${with_ncurses+set}" = set; then
@@ -4470,7 +4464,7 @@ fi
 	echo "$ac_t""$use_ncurses" 1>&6
 
 	echo $ac_n "checking if you want curses rather than termcap interface""... $ac_c" 1>&6
-echo "configure:4474: checking if you want curses rather than termcap interface" >&5
+echo "configure:4468: checking if you want curses rather than termcap interface" >&5
 	
 # Check whether --enable-curses or --disable-curses was given.
 if test "${enable_curses+set}" = set; then
@@ -4507,7 +4501,7 @@ test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
-echo "configure:4511: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "configure:4505: checking for $cf_ncuhdr_root header in include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4518,7 +4512,7 @@ else
 	do
 		
 	cat > conftest.$ac_ext <<EOF
-#line 4522 "configure"
+#line 4516 "configure"
 #include "confdefs.h"
 
 
@@ -4539,7 +4533,7 @@ printf("old\n");
 	
 ; return 0; }
 EOF
-if { (eval echo configure:4543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_h=$cf_header
 	
@@ -4562,7 +4556,7 @@ if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
-echo "configure:4566: checking for $cf_ncuhdr_root include-path" >&5
+echo "configure:4560: checking for $cf_ncuhdr_root include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4657,14 +4651,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 4661 "configure"
+#line 4655 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:4668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -4691,7 +4685,7 @@ done
 		do
 			
 	cat > conftest.$ac_ext <<EOF
-#line 4695 "configure"
+#line 4689 "configure"
 #include "confdefs.h"
 
 
@@ -4712,7 +4706,7 @@ printf("old\n");
 	
 ; return 0; }
 EOF
-if { (eval echo configure:4716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_h2=$cf_header
 	
@@ -4759,14 +4753,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 4763 "configure"
+#line 4757 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:4770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -4821,7 +4815,7 @@ esac
 
 
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:4825: checking for ncurses version" >&5
+echo "configure:4819: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4847,7 +4841,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:4851: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:4845: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -4856,7 +4850,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 4860 "configure"
+#line 4854 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -4880,7 +4874,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:4884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -4911,7 +4905,7 @@ cf_nculib_root=ncurses
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:4915: checking for Gpm_Open in -lgpm" >&5
+echo "configure:4909: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4919,7 +4913,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4923 "configure"
+#line 4917 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4930,7 +4924,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:4934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4946,7 +4940,7 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-echo "configure:4950: checking for initscr in -lgpm" >&5
+echo "configure:4944: checking for initscr in -lgpm" >&5
 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4954,7 +4948,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4958 "configure"
+#line 4952 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4965,7 +4959,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4996,7 +4990,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:5000: checking for tgoto in -lmytinfo" >&5
+echo "configure:4994: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5004,7 +4998,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5008 "configure"
+#line 5002 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5015,7 +5009,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5048,12 +5042,12 @@ else
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:5052: checking for initscr" >&5
+echo "configure:5046: checking for initscr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5057 "configure"
+#line 5051 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -5076,7 +5070,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -5096,17 +5090,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
-echo "configure:5100: checking for initscr in -l$cf_nculib_root" >&5
+echo "configure:5094: checking for initscr in -l$cf_nculib_root" >&5
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 5103 "configure"
+#line 5097 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -5175,17 +5169,17 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
-echo "configure:5179: checking for -l$cf_nculib_root in $cf_libdir" >&5
+echo "configure:5173: checking for -l$cf_nculib_root in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 5182 "configure"
+#line 5176 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -5216,7 +5210,7 @@ fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:5220: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+echo "configure:5214: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
 		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
@@ -5225,14 +5219,14 @@ echo "configure:5220: checking if we can
 		fi
 	done
 	cat > conftest.$ac_ext <<EOF
-#line 5229 "configure"
+#line 5223 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:5236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -5259,9 +5253,9 @@ EOF
 for cf_hdr in stdlib.h wchar.h wctype.h
 do
 	echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6
-echo "configure:5263: checking for $cf_hdr" >&5
+echo "configure:5257: checking for $cf_hdr" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 5265 "configure"
+#line 5259 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5269,7 +5263,7 @@ echo "configure:5263: checking for $cf_h
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5296,12 +5290,12 @@ done
 
 		
   echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6
-echo "configure:5300: checking for wide char and multibyte support" >&5
+echo "configure:5294: checking for wide char and multibyte support" >&5
 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5305 "configure"
+#line 5299 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
@@ -5337,7 +5331,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0
       wcsncat(wcb2, wcb, 5);
 ; return 0; }
 EOF
-if { (eval echo configure:5341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_multibyte_able=yes
 else
@@ -5347,7 +5341,7 @@ else
   cf_save_LIBS="$LIBS"
       LIBS="-lutf8 $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 5351 "configure"
+#line 5345 "configure"
 #include "confdefs.h"
 #include <libutf8.h>
 int main() {
@@ -5373,7 +5367,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0
         wcsncat(wcb2, wcb, 5);
 ; return 0; }
 EOF
-if { (eval echo configure:5377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_multibyte_able=yes
          cat >> confdefs.h <<\EOF
@@ -5411,7 +5405,7 @@ test "$cf_cv_curses_dir" != "no" && \
 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
 
 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
-echo "configure:5415: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "configure:5409: checking for $cf_ncuhdr_root header in include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5422,7 +5416,7 @@ else
 	do
 		
 	cat > conftest.$ac_ext <<EOF
-#line 5426 "configure"
+#line 5420 "configure"
 #include "confdefs.h"
 
 
@@ -5451,7 +5445,7 @@ printf("old\n");
 	
 ; return 0; }
 EOF
-if { (eval echo configure:5455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_h=$cf_header
 	
@@ -5474,7 +5468,7 @@ if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
-echo "configure:5478: checking for $cf_ncuhdr_root include-path" >&5
+echo "configure:5472: checking for $cf_ncuhdr_root include-path" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5569,14 +5563,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 5573 "configure"
+#line 5567 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:5580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -5603,7 +5597,7 @@ done
 		do
 			
 	cat > conftest.$ac_ext <<EOF
-#line 5607 "configure"
+#line 5601 "configure"
 #include "confdefs.h"
 
 
@@ -5632,7 +5626,7 @@ printf("old\n");
 	
 ; return 0; }
 EOF
-if { (eval echo configure:5636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_h2=$cf_header
 	
@@ -5679,14 +5673,14 @@ do
 				cf_save_CPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 				cat > conftest.$ac_ext <<EOF
-#line 5683 "configure"
+#line 5677 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello")
 ; return 0; }
 EOF
-if { (eval echo configure:5690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -5741,7 +5735,7 @@ esac
 
 
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:5745: checking for ncurses version" >&5
+echo "configure:5739: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5767,7 +5761,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:5771: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:5765: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -5776,7 +5770,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 5780 "configure"
+#line 5774 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -5800,7 +5794,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -5831,7 +5825,7 @@ cf_nculib_root=ncursesw
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:5835: checking for Gpm_Open in -lgpm" >&5
+echo "configure:5829: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5839,7 +5833,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5843 "configure"
+#line 5837 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5850,7 +5844,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:5854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5866,7 +5860,7 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-echo "configure:5870: checking for initscr in -lgpm" >&5
+echo "configure:5864: checking for initscr in -lgpm" >&5
 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5874,7 +5868,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5878 "configure"
+#line 5872 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5885,7 +5879,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:5889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5916,7 +5910,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:5920: checking for tgoto in -lmytinfo" >&5
+echo "configure:5914: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5924,7 +5918,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5928 "configure"
+#line 5922 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5935,7 +5929,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:5939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5968,12 +5962,12 @@ else
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-echo "configure:5972: checking for initscr" >&5
+echo "configure:5966: checking for initscr" >&5
 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5977 "configure"
+#line 5971 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr(); below.  */
@@ -5996,7 +5990,7 @@ initscr();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_initscr=yes"
 else
@@ -6016,17 +6010,17 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
-echo "configure:6020: checking for initscr in -l$cf_nculib_root" >&5
+echo "configure:6014: checking for initscr in -l$cf_nculib_root" >&5
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 6023 "configure"
+#line 6017 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -6095,17 +6089,17 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
-echo "configure:6099: checking for -l$cf_nculib_root in $cf_libdir" >&5
+echo "configure:6093: checking for -l$cf_nculib_root in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 6102 "configure"
+#line 6096 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
@@ -6136,7 +6130,7 @@ fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
-echo "configure:6140: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+echo "configure:6134: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
 		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
@@ -6145,14 +6139,14 @@ echo "configure:6140: checking if we can
 		fi
 	done
 	cat > conftest.$ac_ext <<EOF
-#line 6149 "configure"
+#line 6143 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6175,7 +6169,7 @@ EOF
 
 		
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:6179: checking for ncurses version" >&5
+echo "configure:6173: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6201,7 +6195,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:6205: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:6199: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -6210,7 +6204,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 6214 "configure"
+#line 6208 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -6234,7 +6228,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:6238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -6257,13 +6251,13 @@ EOF
 
 		
 echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6
-echo "configure:6261: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "configure:6255: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 6267 "configure"
+#line 6261 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6273,7 +6267,7 @@ int main() {
 	long x = winnstr(stdscr, "", 0)
 ; return 0; }
 EOF
-if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_need_xopen_extension=no
 else
@@ -6281,7 +6275,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 6285 "configure"
+#line 6279 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -6292,7 +6286,7 @@ int main() {
 	long x = winnstr(stdscr, "", 0)
 ; return 0; }
 EOF
-if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_need_xopen_extension=yes
 else
@@ -6315,7 +6309,7 @@ test $cf_cv_need_xopen_extension = yes &
 		
 
 echo $ac_n "checking for extra include directories""... $ac_c" 1>&6
-echo "configure:6319: checking for extra include directories" >&5
+echo "configure:6313: checking for extra include directories" >&5
 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6336,10 +6330,10 @@ esac
 fi
 
 echo "$ac_t""$cf_cv_curses_incdir" 1>&6
-test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
 echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6
-echo "configure:6343: checking if we have identified curses headers" >&5
+echo "configure:6337: checking if we have identified curses headers" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6352,14 +6346,14 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat > conftest.$ac_ext <<EOF
-#line 6356 "configure"
+#line 6350 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int main() {
 initscr(); tgoto("?", 0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:6363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -6382,17 +6376,17 @@ for ac_hdr in $cf_cv_ncurses_header
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6386: checking for $ac_hdr" >&5
+echo "configure:6380: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6391 "configure"
+#line 6385 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6423,16 +6417,16 @@ done
 		
 
 echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6
-echo "configure:6427: checking if we have identified curses libraries" >&5
+echo "configure:6421: checking if we have identified curses libraries" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6429 "configure"
+#line 6423 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); tgoto("?", 0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:6436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6448,7 +6442,7 @@ if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-echo "configure:6452: checking for tgoto in -lmytinfo" >&5
+echo "configure:6446: checking for tgoto in -lmytinfo" >&5
 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6456,7 +6450,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmytinfo  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6460 "configure"
+#line 6454 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6467,7 +6461,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:6471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6490,7 +6484,7 @@ fi
 	;;
 hpux10.*|hpux11.*) #(vi
 	echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
-echo "configure:6494: checking for initscr in -lcur_colr" >&5
+echo "configure:6488: checking for initscr in -lcur_colr" >&5
 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6498,7 +6492,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcur_colr  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6502 "configure"
+#line 6496 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6509,7 +6503,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6532,7 +6526,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
-echo "configure:6536: checking for initscr in -lHcurses" >&5
+echo "configure:6530: checking for initscr in -lHcurses" >&5
 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6540,7 +6534,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lHcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6544 "configure"
+#line 6538 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6551,7 +6545,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6604,12 +6598,12 @@ if test ".$ac_cv_func_initscr" != .yes ;
 	# Check for library containing tgoto.  Do this before curses library
 	# because it may be needed to link the test-case for initscr.
 	echo $ac_n "checking for tgoto""... $ac_c" 1>&6
-echo "configure:6608: checking for tgoto" >&5
+echo "configure:6602: checking for tgoto" >&5
 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6613 "configure"
+#line 6607 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto(); below.  */
@@ -6632,7 +6626,7 @@ tgoto();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_tgoto=yes"
 else
@@ -6653,7 +6647,7 @@ else
 		for cf_term_lib in $cf_check_list termcap termlib unknown
 		do
 			echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
-echo "configure:6657: checking for tgoto in -l$cf_term_lib" >&5
+echo "configure:6651: checking for tgoto in -l$cf_term_lib" >&5
 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6661,7 +6655,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_term_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6665 "configure"
+#line 6659 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6672,7 +6666,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:6676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6702,7 +6696,7 @@ fi
 	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
 	do
 		echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
-echo "configure:6706: checking for initscr in -l$cf_curs_lib" >&5
+echo "configure:6700: checking for initscr in -l$cf_curs_lib" >&5
 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -6710,7 +6704,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$cf_curs_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6714 "configure"
+#line 6708 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6721,7 +6715,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6747,16 +6741,16 @@ fi
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
 		echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
-echo "configure:6751: checking if we can link with $cf_curs_lib library" >&5
+echo "configure:6745: checking if we can link with $cf_curs_lib library" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 6753 "configure"
+#line 6747 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6772,16 +6766,16 @@ rm -f conftest*
 		:
 	elif test "$cf_term_lib" != predefined ; then
 		echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
-echo "configure:6776: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+echo "configure:6770: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 6778 "configure"
+#line 6772 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr(); tgoto((char *)0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=no
 else
@@ -6791,14 +6785,14 @@ else
   
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 6795 "configure"
+#line 6789 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:6802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -6819,7 +6813,7 @@ fi
 
 		
 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:6823: checking for ncurses version" >&5
+echo "configure:6817: checking for ncurses version" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6845,7 +6839,7 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo configure:6849: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
+	{ (eval echo configure:6843: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
@@ -6854,7 +6848,7 @@ EOF
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 6858 "configure"
+#line 6852 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -6878,7 +6872,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:6882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -6901,13 +6895,13 @@ EOF
 
 		
 echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6
-echo "configure:6905: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "configure:6899: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 6911 "configure"
+#line 6905 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6917,7 +6911,7 @@ int main() {
 	long x = winnstr(stdscr, "", 0)
 ; return 0; }
 EOF
-if { (eval echo configure:6921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_need_xopen_extension=no
 else
@@ -6925,7 +6919,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 6929 "configure"
+#line 6923 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -6936,7 +6930,7 @@ int main() {
 	long x = winnstr(stdscr, "", 0)
 ; return 0; }
 EOF
-if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_need_xopen_extension=yes
 else
@@ -6959,7 +6953,7 @@ fi
 
 ## substitute externally-installed PCRE library for our bundled version
 echo $ac_n "checking if you want to use installed version of pcre""... $ac_c" 1>&6
-echo "configure:6963: checking if you want to use installed version of pcre" >&5
+echo "configure:6957: checking if you want to use installed version of pcre" >&5
 
 # Check whether --with-pcre or --without-pcre was given.
 if test "${with_pcre+set}" = set; then
@@ -7030,7 +7024,7 @@ fi
 
 ## debugging libraries (do this after other libraries)
 echo $ac_n "checking if you want dbmalloc library""... $ac_c" 1>&6
-echo "configure:7034: checking if you want dbmalloc library" >&5
+echo "configure:7028: checking if you want dbmalloc library" >&5
 debug_malloc=none
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -7038,7 +7032,7 @@ if test "${with_dbmalloc+set}" = set; th
   withval="$with_dbmalloc"
   echo "$ac_t""yes" 1>&6
 	 echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6
-echo "configure:7042: checking for debug_malloc in -ldbmalloc" >&5
+echo "configure:7036: checking for debug_malloc in -ldbmalloc" >&5
 ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7046,7 +7040,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldbmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7050 "configure"
+#line 7044 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7057,7 +7051,7 @@ int main() {
 debug_malloc()
 ; return 0; }
 EOF
-if { (eval echo configure:7061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7074,17 +7068,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "dbmalloc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dbmalloc.h""... $ac_c" 1>&6
-echo "configure:7078: checking for dbmalloc.h" >&5
+echo "configure:7072: checking for dbmalloc.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7083 "configure"
+#line 7077 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7115,14 +7109,14 @@ fi
 
 
 echo $ac_n "checking if you want dmalloc library""... $ac_c" 1>&6
-echo "configure:7119: checking if you want dmalloc library" >&5
+echo "configure:7113: checking if you want dmalloc library" >&5
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
   withval="$with_dmalloc"
   echo "$ac_t""yes" 1>&6
 	 echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6
-echo "configure:7126: checking for dmalloc_debug in -ldmalloc" >&5
+echo "configure:7120: checking for dmalloc_debug in -ldmalloc" >&5
 ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7130,7 +7124,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7134 "configure"
+#line 7128 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7141,7 +7135,7 @@ int main() {
 dmalloc_debug()
 ; return 0; }
 EOF
-if { (eval echo configure:7145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7158,17 +7152,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "dmalloc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dmalloc.h""... $ac_c" 1>&6
-echo "configure:7162: checking for dmalloc.h" >&5
+echo "configure:7156: checking for dmalloc.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7167 "configure"
+#line 7161 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7199,7 +7193,7 @@ fi
 
 
 echo $ac_n "checking if you want debugging-trace""... $ac_c" 1>&6
-echo "configure:7203: checking if you want debugging-trace" >&5
+echo "configure:7197: checking if you want debugging-trace" >&5
 
 # Check whether --with-trace or --without-trace was given.
 if test "${with_trace+set}" = set; then
@@ -7217,12 +7211,12 @@ EOF
 
 	EXTRAOBJS="$EXTRAOBJS trace.o"
 	echo $ac_n "checking for _tracef""... $ac_c" 1>&6
-echo "configure:7221: checking for _tracef" >&5
+echo "configure:7215: checking for _tracef" >&5
 if eval "test \"`echo '$''{'ac_cv_func__tracef'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7226 "configure"
+#line 7220 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _tracef(); below.  */
@@ -7245,7 +7239,7 @@ _tracef();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__tracef=yes"
 else
@@ -7267,7 +7261,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for _tracef in -l${cf_with_screen}_g""... $ac_c" 1>&6
-echo "configure:7271: checking for _tracef in -l${cf_with_screen}_g" >&5
+echo "configure:7265: checking for _tracef in -l${cf_with_screen}_g" >&5
 ac_lib_var=`echo ${cf_with_screen}_g'_'_tracef | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7275,7 +7269,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l${cf_with_screen}_g  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7279 "configure"
+#line 7273 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7286,7 +7280,7 @@ int main() {
 _tracef()
 ; return 0; }
 EOF
-if { (eval echo configure:7290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7318,7 +7312,7 @@ fi
 
 ## options for miscellaneous definitions
 echo $ac_n "checking for domain-name""... $ac_c" 1>&6
-echo "configure:7322: checking for domain-name" >&5
+echo "configure:7316: checking for domain-name" >&5
 
 # Check whether --with-domain-name or --without-domain-name was given.
 if test "${with_domain_name+set}" = set; then
@@ -7347,7 +7341,7 @@ echo "$ac_t""$DOMAIN_NAME" 1>&6
 
 if test "$USE_NNTP" = "yes" ; then
 echo $ac_n "checking for NNTP default-server""... $ac_c" 1>&6
-echo "configure:7351: checking for NNTP default-server" >&5
+echo "configure:7345: checking for NNTP default-server" >&5
 
 # Check whether --with-nntp-default-server or --without-nntp-default-server was given.
 if test "${with_nntp_default_server+set}" = set; then
@@ -7413,7 +7407,7 @@ EOF
 
 ## optional features
 echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6
-echo "configure:7417: checking whether to use MH style mail handling for mailgroups" >&5
+echo "configure:7411: checking whether to use MH style mail handling for mailgroups" >&5
 
 # Check whether --enable-mh-mail-handling or --disable-mh-mail-handling was given.
 if test "${enable_mh_mail_handling+set}" = set; then
@@ -7432,7 +7426,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6
-echo "configure:7436: checking whether to enable 8-bit keycodes" >&5
+echo "configure:7430: checking whether to enable 8-bit keycodes" >&5
 
 # Check whether --enable-8bit-keys or --disable-8bit-keys was given.
 if test "${enable_8bit_keys+set}" = set; then
@@ -7458,7 +7452,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6
-echo "configure:7462: checking whether to enable ANSI-color" >&5
+echo "configure:7456: checking whether to enable ANSI-color" >&5
 
 # Check whether --enable-color or --disable-color was given.
 if test "${enable_color+set}" = set; then
@@ -7475,7 +7469,7 @@ use_color=$enableval
 echo "$ac_t""$use_color" 1>&6
 
 echo $ac_n "checking whether to enable posting-etiquette""... $ac_c" 1>&6
-echo "configure:7479: checking whether to enable posting-etiquette" >&5
+echo "configure:7473: checking whether to enable posting-etiquette" >&5
 
 # Check whether --enable-etiquette or --disable-etiquette was given.
 if test "${enable_etiquette+set}" = set; then
@@ -7494,7 +7488,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to strictly observe RFC2047 and break long lines""... $ac_c" 1>&6
-echo "configure:7498: checking whether to strictly observe RFC2047 and break long lines" >&5
+echo "configure:7492: checking whether to strictly observe RFC2047 and break long lines" >&5
 
 # Check whether --enable-break-long-lines or --disable-break-long-lines was given.
 if test "${enable_break_long_lines+set}" = set; then
@@ -7513,7 +7507,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to force MM_CHARSET obeyance when decoding mime""... $ac_c" 1>&6
-echo "configure:7517: checking whether to force MM_CHARSET obeyance when decoding mime" >&5
+echo "configure:7511: checking whether to force MM_CHARSET obeyance when decoding mime" >&5
 
 # Check whether --enable-mime-strict-charset or --disable-mime-strict-charset was given.
 if test "${enable_mime_strict_charset+set}" = set; then
@@ -7539,7 +7533,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6
-echo "configure:7543: checking for MIME character-set" >&5
+echo "configure:7537: checking for MIME character-set" >&5
 
 # Check whether --with-mime-default-charset or --without-mime-default-charset was given.
 if test "${with_mime_default_charset+set}" = set; then
@@ -7561,7 +7555,7 @@ EOF
 echo "$ac_t""$MM_CHARSET" 1>&6
 
 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6
-echo "configure:7565: checking for default ISO/ASCII table" >&5
+echo "configure:7559: checking for default ISO/ASCII table" >&5
 
 # Check whether --with-iso-to-ascii or --without-iso-to-ascii was given.
 if test "${with_iso_to_ascii+set}" = set; then
@@ -7583,7 +7577,7 @@ EOF
 echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6
 
 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6
-echo "configure:7587: checking whether to enable locale support" >&5
+echo "configure:7581: checking whether to enable locale support" >&5
 
 # Check whether --enable-locale or --disable-locale was given.
 if test "${enable_locale+set}" = set; then
@@ -7602,7 +7596,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6
-echo "configure:7606: checking whether to enable posting" >&5
+echo "configure:7600: checking whether to enable posting" >&5
 
 # Check whether --enable-posting or --disable-posting was given.
 if test "${enable_posting+set}" = set; then
@@ -7621,7 +7615,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6
-echo "configure:7625: checking whether to enable shell escape" >&5
+echo "configure:7619: checking whether to enable shell escape" >&5
 
 # Check whether --enable-shell-escape or --disable-shell-escape was given.
 if test "${enable_shell_escape+set}" = set; then
@@ -7640,7 +7634,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6
-echo "configure:7644: checking whether to have fascist newsadmin" >&5
+echo "configure:7638: checking whether to have fascist newsadmin" >&5
 
 # Check whether --enable-fascist-newsadmin or --disable-fascist-newsadmin was given.
 if test "${enable_fascist_newsadmin+set}" = set; then
@@ -7659,7 +7653,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to enable inverse video and highlighting""... $ac_c" 1>&6
-echo "configure:7663: checking whether to enable inverse video and highlighting" >&5
+echo "configure:7657: checking whether to enable inverse video and highlighting" >&5
 
 # Check whether --enable-inverse-video or --disable-inverse-video was given.
 if test "${enable_inverse_video+set}" = set; then
@@ -7678,7 +7672,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6
-echo "configure:7682: checking whether to enable piping support" >&5
+echo "configure:7676: checking whether to enable piping support" >&5
 
 # Check whether --enable-piping or --disable-piping was given.
 if test "${enable_piping+set}" = set; then
@@ -7697,7 +7691,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6
-echo "configure:7701: checking whether to enable printer support" >&5
+echo "configure:7695: checking whether to enable printer support" >&5
 
 # Check whether --enable-printing or --disable-printing was given.
 if test "${enable_printing+set}" = set; then
@@ -7716,7 +7710,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to unique tmp-files by appending .pid""... $ac_c" 1>&6
-echo "configure:7720: checking whether to unique tmp-files by appending .pid" >&5
+echo "configure:7714: checking whether to unique tmp-files by appending .pid" >&5
 
 # Check whether --enable-append-pid or --disable-append-pid was given.
 if test "${enable_append_pid+set}" = set; then
@@ -7742,7 +7736,7 @@ fi
 echo "$ac_t""$enableval" 1>&6
 
 echo $ac_n "checking whether to fallback to XHDR XREF if XOVER isn't supported""... $ac_c" 1>&6
-echo "configure:7746: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5
+echo "configure:7740: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5
 
 # Check whether --enable-xhdr-xref or --disable-xhdr-xref was given.
 if test "${enable_xhdr_xref+set}" = set; then
@@ -7769,7 +7763,7 @@ echo "$ac_t""$enableval" 1>&6
 
 ### bypass a bug in old versions of leafnode & NNTPcache
 echo $ac_n "checking whether to send a GROUP command before a LISTGROUP""... $ac_c" 1>&6
-echo "configure:7773: checking whether to send a GROUP command before a LISTGROUP" >&5
+echo "configure:7767: checking whether to send a GROUP command before a LISTGROUP" >&5
 
 # Check whether --enable-broken-listgroup-fix or --disable-broken-listgroup-fix was given.
 if test "${enable_broken_listgroup_fix+set}" = set; then
@@ -7789,7 +7783,7 @@ echo "$ac_t""$enableval" 1>&6
 
 ### checks for the location of the system-wide default setting file
 echo $ac_n "checking for directory containing tin.defaults file""... $ac_c" 1>&6
-echo "configure:7793: checking for directory containing tin.defaults file" >&5
+echo "configure:7787: checking for directory containing tin.defaults file" >&5
 
 # Check whether --with-defaults-dir or --without-defaults-dir was given.
 if test "${with_defaults_dir+set}" = set; then
@@ -7832,7 +7826,7 @@ EOF
 
 ### check for ipv6 support
 echo $ac_n "checking whether to enable IPv6""... $ac_c" 1>&6
-echo "configure:7836: checking whether to enable IPv6" >&5
+echo "configure:7830: checking whether to enable IPv6" >&5
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
 if test "${enable_ipv6+set}" = set; then
@@ -7853,7 +7847,7 @@ if test "$enableval" = "yes"; then
 	
 
 echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6
-echo "configure:7857: checking ipv6 stack type" >&5
+echo "configure:7851: checking ipv6 stack type" >&5
 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7873,7 +7867,7 @@ do
 		;;
 	inria) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 7877 "configure"
+#line 7871 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -7891,7 +7885,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 7895 "configure"
+#line 7889 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -7909,7 +7903,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat > conftest.$ac_ext <<EOF
-#line 7913 "configure"
+#line 7907 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -7936,7 +7930,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat > conftest.$ac_ext <<EOF
-#line 7940 "configure"
+#line 7934 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -7954,7 +7948,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat > conftest.$ac_ext <<EOF
-#line 7958 "configure"
+#line 7952 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -7972,7 +7966,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat > conftest.$ac_ext <<EOF
-#line 7976 "configure"
+#line 7970 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -8005,7 +7999,7 @@ cf_ipv6lib=none
 cf_ipv6dir=none
 
 echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6
-echo "configure:8009: checking for IPv6 library if required" >&5
+echo "configure:8003: checking for IPv6 library if required" >&5
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
 	;;
@@ -8039,7 +8033,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6
 if test "$cf_ipv6lib" != "none"; then
 
 	cat > conftest.$ac_ext <<EOF
-#line 8043 "configure"
+#line 8037 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8050,7 +8044,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:8054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -8147,12 +8141,12 @@ rm -f conftest*
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
 	echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
-echo "configure:8151: checking for getaddrinfo" >&5
+echo "configure:8145: checking for getaddrinfo" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8156 "configure"
+#line 8150 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo(); below.  */
@@ -8175,7 +8169,7 @@ getaddrinfo();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getaddrinfo=yes"
 else
@@ -8195,10 +8189,10 @@ else
 
 		cf_save_LIBS="$LIBS"
 		echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6
-echo "configure:8199: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+echo "configure:8193: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat > conftest.$ac_ext <<EOF
-#line 8202 "configure"
+#line 8196 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8209,7 +8203,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:8213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
@@ -8278,10 +8272,10 @@ test -d /usr && {
 			for cf_libdir in $cf_search
 			do
 				echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6
-echo "configure:8282: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+echo "configure:8276: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat > conftest.$ac_ext <<EOF
-#line 8285 "configure"
+#line 8279 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8292,7 +8286,7 @@ int main() {
 getaddrinfo(0, 0, 0, 0)
 ; return 0; }
 EOF
-if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
@@ -8325,7 +8319,7 @@ fi
 
 
 echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6
-echo "configure:8329: checking working getaddrinfo" >&5
+echo "configure:8323: checking working getaddrinfo" >&5
 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8334,7 +8328,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 8338 "configure"
+#line 8332 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8413,7 +8407,7 @@ int main()
 }
 
 EOF
-if { (eval echo configure:8417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_getaddrinfo=yes
 else
@@ -8457,12 +8451,12 @@ fi
 for ac_func in getaddrinfo getnameinfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8461: checking for $ac_func" >&5
+echo "configure:8455: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8466 "configure"
+#line 8460 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8485,7 +8479,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8514,7 +8508,7 @@ done
 
 ### checks for operator characteristics (should be the last option)
 echo $ac_n "checking whether to make a coffee while compiling""... $ac_c" 1>&6
-echo "configure:8518: checking whether to make a coffee while compiling" >&5
+echo "configure:8512: checking whether to make a coffee while compiling" >&5
 
 # Check whether --with-coffee or --without-coffee was given.
 if test "${with_coffee+set}" = set; then
@@ -8539,7 +8533,7 @@ fi
 ### checks for compiler characteristics
 
 echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6
-echo "configure:8543: checking for makeflags variable" >&5
+echo "configure:8537: checking for makeflags variable" >&5
 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8584,12 +8578,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:8588: checking for working const" >&5
+echo "configure:8582: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8593 "configure"
+#line 8587 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -8638,7 +8632,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:8642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -8659,21 +8653,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:8663: checking for inline" >&5
+echo "configure:8657: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 8670 "configure"
+#line 8664 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:8677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -8700,13 +8694,13 @@ esac
 
 
 echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6
-echo "configure:8704: checking for ansi token expansion/substitution" >&5
+echo "configure:8698: checking for ansi token expansion/substitution" >&5
 if eval "test \"`echo '$''{'cf_cv_cpp_expands'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 8710 "configure"
+#line 8704 "configure"
 #include "confdefs.h"
 
 #define string(n) #n
@@ -8714,7 +8708,7 @@ int main() {
 char *s = string(token)
 ; return 0; }
 EOF
-if { (eval echo configure:8718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_cpp_expands=yes
 else
@@ -8735,13 +8729,13 @@ EOF
 
 
 echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6
-echo "configure:8739: checking for ansi token concatenation" >&5
+echo "configure:8733: checking for ansi token concatenation" >&5
 if eval "test \"`echo '$''{'cf_cv_cpp_concats'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 8745 "configure"
+#line 8739 "configure"
 #include "confdefs.h"
 
 #define concat(a,b) a ## b
@@ -8749,7 +8743,7 @@ int main() {
 char *firstlast = "y", *s = concat(first,last)
 ; return 0; }
 EOF
-if { (eval echo configure:8753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_cpp_concats=yes
 else
@@ -8770,20 +8764,20 @@ EOF
 
 
 echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6
-echo "configure:8774: checking if nested parameters work" >&5
+echo "configure:8768: checking if nested parameters work" >&5
 if eval "test \"`echo '$''{'cf_cv_nested_params'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 8780 "configure"
+#line 8774 "configure"
 #include "confdefs.h"
 
 int main() {
 extern void (*sigdisp(int sig, void (*func)(int sig)))(int sig)
 ; return 0; }
 EOF
-if { (eval echo configure:8787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_nested_params=yes
 else
@@ -8809,19 +8803,19 @@ bison*)
 	# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:8813: checking for working alloca.h" >&5
+echo "configure:8807: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8818 "configure"
+#line 8812 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:8825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -8842,12 +8836,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:8846: checking for alloca" >&5
+echo "configure:8840: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8851 "configure"
+#line 8845 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -8875,7 +8869,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:8879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -8907,12 +8901,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:8911: checking whether alloca needs Cray hooks" >&5
+echo "configure:8905: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8916 "configure"
+#line 8910 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8937,12 +8931,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8941: checking for $ac_func" >&5
+echo "configure:8935: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8946 "configure"
+#line 8940 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8965,7 +8959,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8992,7 +8986,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:8996: checking stack direction for C alloca" >&5
+echo "configure:8990: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9000,7 +8994,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 9004 "configure"
+#line 8998 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -9019,7 +9013,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:9023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -9049,12 +9043,12 @@ esac
 
 ###	Checks for header files.
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:9053: checking for ANSI C header files" >&5
+echo "configure:9047: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9058 "configure"
+#line 9052 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9062,7 +9056,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9079,7 +9073,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 9083 "configure"
+#line 9077 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -9097,7 +9091,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 9101 "configure"
+#line 9095 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -9118,7 +9112,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 9122 "configure"
+#line 9116 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -9129,7 +9123,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
 exit (0); }
 
 EOF
-if { (eval echo configure:9133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -9157,12 +9151,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:9161: checking for $ac_hdr that defines DIR" >&5
+echo "configure:9155: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9166 "configure"
+#line 9160 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -9170,7 +9164,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:9174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -9195,7 +9189,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:9199: checking for opendir in -ldir" >&5
+echo "configure:9193: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9203,7 +9197,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9207 "configure"
+#line 9201 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9214,7 +9208,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:9218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9236,7 +9230,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:9240: checking for opendir in -lx" >&5
+echo "configure:9234: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9244,7 +9238,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9248 "configure"
+#line 9242 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9255,7 +9249,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:9259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9278,12 +9272,12 @@ fi
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:9282: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:9276: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9287 "configure"
+#line 9281 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -9292,7 +9286,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:9296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -9313,12 +9307,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:9317: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:9311: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9322 "configure"
+#line 9316 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -9334,7 +9328,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:9338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -9413,9 +9407,9 @@ for cf_hdr in \
 
 do
 	echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6
-echo "configure:9417: checking for $cf_hdr" >&5
+echo "configure:9411: checking for $cf_hdr" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 9419 "configure"
+#line 9413 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9423,7 +9417,7 @@ echo "configure:9417: checking for $cf_h
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9459,17 +9453,17 @@ unistd.h \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9463: checking for $ac_hdr" >&5
+echo "configure:9457: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9468 "configure"
+#line 9462 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9500,17 +9494,17 @@ if test "$ISC" = yes ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9504: checking for $ac_hdr" >&5
+echo "configure:9498: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9509 "configure"
+#line 9503 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9545,16 +9539,16 @@ if test "$ac_cv_header_termios_h" = yes 
 	esac
 	if test "$termios_bad" = maybe ; then
 	echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6
-echo "configure:9549: checking whether termios.h needs _POSIX_SOURCE" >&5
+echo "configure:9543: checking whether termios.h needs _POSIX_SOURCE" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 9551 "configure"
+#line 9545 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int main() {
 struct termios foo; int x = foo.c_iflag
 ; return 0; }
 EOF
-if { (eval echo configure:9558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   termios_bad=no
 else
@@ -9563,7 +9557,7 @@ else
   rm -rf conftest*
   
 		cat > conftest.$ac_ext <<EOF
-#line 9567 "configure"
+#line 9561 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -9572,7 +9566,7 @@ int main() {
 struct termios foo; int x = foo.c_iflag
 ; return 0; }
 EOF
-if { (eval echo configure:9576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   termios_bad=unknown
 else
@@ -9595,7 +9589,7 @@ fi
 
 
 echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:9599: checking declaration of size-change" >&5
+echo "configure:9593: checking declaration of size-change" >&5
 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9609,7 +9603,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat > conftest.$ac_ext <<EOF
-#line 9613 "configure"
+#line 9607 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -9648,7 +9642,7 @@ int main() {
 	
 ; return 0; }
 EOF
-if { (eval echo configure:9652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sizechange=yes
 else
@@ -9687,7 +9681,7 @@ fi
 
 
 echo $ac_n "checking if sys/time.h conflicts with sys/select.h""... $ac_c" 1>&6
-echo "configure:9691: checking if sys/time.h conflicts with sys/select.h" >&5
+echo "configure:9685: checking if sys/time.h conflicts with sys/select.h" >&5
 if eval "test \"`echo '$''{'cf_cv_sys_select_timeval'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9695,7 +9689,7 @@ else
 for cf_opts in no yes
 do
 cat > conftest.$ac_ext <<EOF
-#line 9699 "configure"
+#line 9693 "configure"
 #include "confdefs.h"
 
 #define yes 1
@@ -9723,7 +9717,7 @@ int main() {
 struct timeval foo
 ; return 0; }
 EOF
-if { (eval echo configure:9727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sys_select_timeval=$cf_opts
 	 break
@@ -9747,12 +9741,12 @@ EOF
 
 ###	Checks for Datatypes.
 echo $ac_n "checking for gid_t""... $ac_c" 1>&6
-echo "configure:9751: checking for gid_t" >&5
+echo "configure:9745: checking for gid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_gid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9756 "configure"
+#line 9750 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9780,12 +9774,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:9784: checking for mode_t" >&5
+echo "configure:9778: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9789 "configure"
+#line 9783 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9813,12 +9807,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:9817: checking for off_t" >&5
+echo "configure:9811: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9822 "configure"
+#line 9816 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9846,12 +9840,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:9850: checking for pid_t" >&5
+echo "configure:9844: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9855 "configure"
+#line 9849 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9879,12 +9873,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:9883: checking for size_t" >&5
+echo "configure:9877: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9888 "configure"
+#line 9882 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9912,12 +9906,12 @@ EOF
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:9916: checking for ssize_t" >&5
+echo "configure:9910: checking for ssize_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9921 "configure"
+#line 9915 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9945,12 +9939,12 @@ EOF
 fi
 
 echo $ac_n "checking for time_t""... $ac_c" 1>&6
-echo "configure:9949: checking for time_t" >&5
+echo "configure:9943: checking for time_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9954 "configure"
+#line 9948 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9978,12 +9972,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9982: checking for uid_t in sys/types.h" >&5
+echo "configure:9976: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9987 "configure"
+#line 9981 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -10013,9 +10007,9 @@ fi
 
 
 echo $ac_n "checking for quad_t""... $ac_c" 1>&6
-echo "configure:10017: checking for quad_t" >&5
+echo "configure:10011: checking for quad_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10019 "configure"
+#line 10013 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10028,7 +10022,7 @@ int main() {
 quad_t x; x = 0
 ; return 0; }
 EOF
-if { (eval echo configure:10032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_quad_t=yes
 else
@@ -10047,9 +10041,9 @@ EOF
 fi
 
 echo $ac_n "checking for long long""... $ac_c" 1>&6
-echo "configure:10051: checking for long long" >&5
+echo "configure:10045: checking for long long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10053 "configure"
+#line 10047 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10058,7 +10052,7 @@ int main() {
 long long x; x = 0
 ; return 0; }
 EOF
-if { (eval echo configure:10062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_long_long=yes
 else
@@ -10080,7 +10074,7 @@ fi
 # libuu/uudeview
 # only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found
 echo $ac_n "checking for UUInitialize in -luu""... $ac_c" 1>&6
-echo "configure:10084: checking for UUInitialize in -luu" >&5
+echo "configure:10078: checking for UUInitialize in -luu" >&5
 ac_lib_var=`echo uu'_'UUInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10088,7 +10082,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-luu  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10092 "configure"
+#line 10086 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10099,7 +10093,7 @@ int main() {
 UUInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:10103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10116,17 +10110,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "uudeview.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for uudeview.h""... $ac_c" 1>&6
-echo "configure:10120: checking for uudeview.h" >&5
+echo "configure:10114: checking for uudeview.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10125 "configure"
+#line 10119 "configure"
 #include "confdefs.h"
 #include <uudeview.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10172,24 +10166,24 @@ else
   
 cf_cv_termlib=none
 cat > conftest.$ac_ext <<EOF
-#line 10176 "configure"
+#line 10170 "configure"
 #include "confdefs.h"
 
 int main() {
 char *x=(char*)tgoto("",0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:10183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 10186 "configure"
+#line 10180 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=tigetstr("")
 ; return 0; }
 EOF
-if { (eval echo configure:10193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_termlib=terminfo
 else
@@ -10218,16 +10212,16 @@ if test "$cf_cv_termlib" = none; then
 	for cf_func in tigetstr tgetstr
 	do
 		echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6
-echo "configure:10222: checking for $cf_func in -l$cf_lib" >&5
+echo "configure:10216: checking for $cf_func in -l$cf_lib" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 10224 "configure"
+#line 10218 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=$cf_func("")
 ; return 0; }
 EOF
-if { (eval echo configure:10231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -10254,7 +10248,7 @@ fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
 	echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:10258: checking for initscr in -lcurses" >&5
+echo "configure:10252: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10262,7 +10256,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10266 "configure"
+#line 10260 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10273,7 +10267,7 @@ int main() {
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:10277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10294,7 +10288,7 @@ else
 fi
 
 	echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10298: checking for tgoto in -ltermcap" >&5
+echo "configure:10292: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10302,7 +10296,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10306 "configure"
+#line 10300 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10313,7 +10307,7 @@ int main() {
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10346,11 +10340,11 @@ fi
 	# terminfo-based termcap interfaces may be prototyped in <curses.h>,
 	# which may/may not be compatible with <termcap.h>
 	echo $ac_n "checking if we should include termcap.h""... $ac_c" 1>&6
-echo "configure:10350: checking if we should include termcap.h" >&5
+echo "configure:10344: checking if we should include termcap.h" >&5
 	cf_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -I$srcdir/include"
 	cat > conftest.$ac_ext <<EOF
-#line 10354 "configure"
+#line 10348 "configure"
 #include "confdefs.h"
 
 #define HAVE_TERMCAP_H 1
@@ -10363,7 +10357,7 @@ make an error
 
 ; return 0; }
 EOF
-if { (eval echo configure:10367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -10381,7 +10375,7 @@ EOF
 
 	
 echo $ac_n "checking for term.h""... $ac_c" 1>&6
-echo "configure:10385: checking for term.h" >&5
+echo "configure:10379: checking for term.h" >&5
 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10391,7 +10385,7 @@ for cf_header in \
 	term.h
 do
 	cat > conftest.$ac_ext <<EOF
-#line 10395 "configure"
+#line 10389 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -10400,7 +10394,7 @@ int main() {
 WINDOW *x
 ; return 0; }
 EOF
-if { (eval echo configure:10404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_term_header=$cf_header
 else
@@ -10434,7 +10428,7 @@ esac
 
 
 echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6
-echo "configure:10438: checking if we should include curses.h or termcap.h" >&5
+echo "configure:10432: checking if we should include curses.h or termcap.h" >&5
 if eval "test \"`echo '$''{'cf_cv_need_curses_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10452,7 +10446,7 @@ do
     test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts"
 
     cat > conftest.$ac_ext <<EOF
-#line 10456 "configure"
+#line 10450 "configure"
 #include "confdefs.h"
 /* $cf_c_opts $cf_t_opts */
 $CHECK_DECL_HDRS
@@ -10460,7 +10454,7 @@ int main() {
 char *x = (char *)tgoto("")
 ; return 0; }
 EOF
-if { (eval echo configure:10464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   test "$cf_cv_need_curses_h" = no && {
 	     cf_cv_need_curses_h=maybe
@@ -10473,7 +10467,7 @@ else
   rm -rf conftest*
   echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 10477 "configure"
+#line 10471 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -10481,7 +10475,7 @@ int main() {
 char *x = (char *)tgoto("",0,0)
 ; return 0; }
 EOF
-if { (eval echo configure:10485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_need_curses_h=yes
 	 cf_ok_c_opts=$cf_c_opts
@@ -10557,7 +10551,7 @@ esac
 
 
 echo $ac_n "checking declaration of tputs 3rd param""... $ac_c" 1>&6
-echo "configure:10561: checking declaration of tputs 3rd param" >&5
+echo "configure:10555: checking declaration of tputs 3rd param" >&5
 if eval "test \"`echo '$''{'cf_cv_type_outchar'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10573,10 +10567,10 @@ for Q in int void; do
 for R in int char; do
 for S in "" const; do
 	
-echo "(line 10577) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
+echo "(line 10571) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
 
 	cat > conftest.$ac_ext <<EOF
-#line 10580 "configure"
+#line 10574 "configure"
 #include "confdefs.h"
 $CHECK_DECL_HDRS
 int main() {
@@ -10585,7 +10579,7 @@ extern $Q OutChar($R);
 	tputs("", 1, OutChar)
 ; return 0; }
 EOF
-if { (eval echo configure:10589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_type_outchar="$Q OutChar($R)"
 	 cf_cv_found=yes
@@ -10640,14 +10634,14 @@ EOF
 elif test ".$cf_cv_termlib" = .termcap ; then
 	# BSD 'tputs()' may need 'PC' to be set.
 	cat > conftest.$ac_ext <<EOF
-#line 10644 "configure"
+#line 10638 "configure"
 #include "confdefs.h"
 
 int main() {
 extern char PC; PC = 0
 ; return 0; }
 EOF
-if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_EXTERN_TCAP_PC 1
@@ -10666,13 +10660,13 @@ fi
 
 
 echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:10670: checking if external errno is declared" >&5
+echo "configure:10664: checking if external errno is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10676 "configure"
+#line 10670 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -10685,7 +10679,7 @@ int main() {
 long x = (long) errno
 ; return 0; }
 EOF
-if { (eval echo configure:10689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_errno=yes
 else
@@ -10713,13 +10707,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:10717: checking if external errno exists" >&5
+echo "configure:10711: checking if external errno exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10723 "configure"
+#line 10717 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -10729,7 +10723,7 @@ int main() {
 errno = 2
 ; return 0; }
 EOF
-if { (eval echo configure:10733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_errno=yes
 else
@@ -10761,12 +10755,12 @@ fi
 for ac_func in strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10765: checking for $ac_func" >&5
+echo "configure:10759: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10770 "configure"
+#line 10764 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10789,7 +10783,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10816,13 +10810,13 @@ else
 
     
 echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6
-echo "configure:10820: checking if external sys_nerr is declared" >&5
+echo "configure:10814: checking if external sys_nerr is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10826 "configure"
+#line 10820 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -10835,7 +10829,7 @@ int main() {
 long x = (long) sys_nerr
 ; return 0; }
 EOF
-if { (eval echo configure:10839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_sys_nerr=yes
 else
@@ -10863,13 +10857,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6
-echo "configure:10867: checking if external sys_nerr exists" >&5
+echo "configure:10861: checking if external sys_nerr exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10873 "configure"
+#line 10867 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -10879,7 +10873,7 @@ int main() {
 sys_nerr = 2
 ; return 0; }
 EOF
-if { (eval echo configure:10883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_sys_nerr=yes
 else
@@ -10908,13 +10902,13 @@ fi
 
     
 echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6
-echo "configure:10912: checking if external sys_errlist is declared" >&5
+echo "configure:10906: checking if external sys_errlist is declared" >&5
 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10918 "configure"
+#line 10912 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -10927,7 +10921,7 @@ int main() {
 long x = (long) sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:10931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_dcl_sys_errlist=yes
 else
@@ -10955,13 +10949,13 @@ fi
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
 echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6
-echo "configure:10959: checking if external sys_errlist exists" >&5
+echo "configure:10953: checking if external sys_errlist exists" >&5
 if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 10965 "configure"
+#line 10959 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -10971,7 +10965,7 @@ int main() {
 sys_errlist = 2
 ; return 0; }
 EOF
-if { (eval echo configure:10975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_have_sys_errlist=yes
 else
@@ -11066,12 +11060,12 @@ for ac_func in \
 $cf_tc_funcs 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11070: checking for $ac_func" >&5
+echo "configure:11064: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11075 "configure"
+#line 11069 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11094,7 +11088,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11120,12 +11114,12 @@ done
 
 
 echo $ac_n "checking for flock""... $ac_c" 1>&6
-echo "configure:11124: checking for flock" >&5
+echo "configure:11118: checking for flock" >&5
 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11129 "configure"
+#line 11123 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char flock(); below.  */
@@ -11148,7 +11142,7 @@ flock();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_flock=yes"
 else
@@ -11170,7 +11164,7 @@ else
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6
-echo "configure:11174: checking for flock in -lbsd" >&5
+echo "configure:11168: checking for flock in -lbsd" >&5
 ac_lib_var=`echo bsd'_'flock | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11178,7 +11172,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11182 "configure"
+#line 11176 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11189,7 +11183,7 @@ int main() {
 flock()
 ; return 0; }
 EOF
-if { (eval echo configure:11193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11218,12 +11212,12 @@ fi
 
 
   echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6
-echo "configure:11222: checking for wide char and multibyte support" >&5
+echo "configure:11216: checking for wide char and multibyte support" >&5
 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11227 "configure"
+#line 11221 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
@@ -11259,7 +11253,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0
       wcsncat(wcb2, wcb, 5);
 ; return 0; }
 EOF
-if { (eval echo configure:11263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_multibyte_able=yes
 else
@@ -11269,7 +11263,7 @@ else
   cf_save_LIBS="$LIBS"
       LIBS="-lutf8 $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 11273 "configure"
+#line 11267 "configure"
 #include "confdefs.h"
 #include <libutf8.h>
 int main() {
@@ -11295,7 +11289,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0
         wcsncat(wcb2, wcb, 5);
 ; return 0; }
 EOF
-if { (eval echo configure:11299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_multibyte_able=yes
          cat >> confdefs.h <<\EOF
@@ -11327,12 +11321,12 @@ echo "$ac_t""$am_cv_multibyte_able" 1>&6
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:11331: checking return type of signal handlers" >&5
+echo "configure:11325: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11336 "configure"
+#line 11330 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -11349,7 +11343,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:11353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -11369,7 +11363,7 @@ EOF
 
 
 echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6
-echo "configure:11373: checking declaration of signal arguments" >&5
+echo "configure:11367: checking declaration of signal arguments" >&5
 if eval "test \"`echo '$''{'cf_cv_sig_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11378,7 +11372,7 @@ cf_cv_sig_args=
 for cf_test in "int sig" "int sig, ..."
 do
 	cat > conftest.$ac_ext <<EOF
-#line 11382 "configure"
+#line 11376 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -11386,7 +11380,7 @@ int main() {
 extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch)
 ; return 0; }
 EOF
-if { (eval echo configure:11390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sig_args="$cf_test";break
 else
@@ -11412,13 +11406,13 @@ EOF
 if test "$ac_cv_func_sigaction" = yes; then
 
 echo $ac_n "checking whether sigaction needs _POSIX_SOURCE""... $ac_c" 1>&6
-echo "configure:11416: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "configure:11410: checking whether sigaction needs _POSIX_SOURCE" >&5
 if eval "test \"`echo '$''{'cf_cv_sigact_bad'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 11422 "configure"
+#line 11416 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11427,7 +11421,7 @@ int main() {
 struct sigaction act
 ; return 0; }
 EOF
-if { (eval echo configure:11431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_sigact_bad=no
 else
@@ -11448,13 +11442,13 @@ EOF
 
 
 echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6
-echo "configure:11452: checking if we have sigaction/related functions" >&5
+echo "configure:11446: checking if we have sigaction/related functions" >&5
 if eval "test \"`echo '$''{'cf_cv_sigaction_funcs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 11458 "configure"
+#line 11452 "configure"
 #include "confdefs.h"
 
 #ifdef SVR4_ACTION
@@ -11472,7 +11466,7 @@ int main() {
     sigaction (SIGBUS,&sa,&osa);
 ; return 0; }
 EOF
-if { (eval echo configure:11476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_sigaction_funcs=yes
 else
@@ -11494,7 +11488,7 @@ EOF
 fi
 
 echo $ac_n "checking for fork""... $ac_c" 1>&6
-echo "configure:11498: checking for fork" >&5
+echo "configure:11492: checking for fork" >&5
 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11503,7 +11497,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_fork=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 11507 "configure"
+#line 11501 "configure"
 #include "confdefs.h"
 
 int main()
@@ -11513,7 +11507,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:11517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_func_fork=yes
 else
@@ -11535,12 +11529,12 @@ EOF
 
 
 echo $ac_n "checking for memmove""... $ac_c" 1>&6
-echo "configure:11539: checking for memmove" >&5
+echo "configure:11533: checking for memmove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11544 "configure"
+#line 11538 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove(); below.  */
@@ -11563,7 +11557,7 @@ memmove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_memmove=yes"
 else
@@ -11582,12 +11576,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for bcopy""... $ac_c" 1>&6
-echo "configure:11586: checking for bcopy" >&5
+echo "configure:11580: checking for bcopy" >&5
 if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11591 "configure"
+#line 11585 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy(); below.  */
@@ -11610,7 +11604,7 @@ bcopy();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_bcopy=yes"
 else
@@ -11626,7 +11620,7 @@ if eval "test \"`echo '$ac_cv_func_'bcop
   echo "$ac_t""yes" 1>&6
   
 	echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6
-echo "configure:11630: checking if bcopy does overlapping moves" >&5
+echo "configure:11624: checking if bcopy does overlapping moves" >&5
 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11635,7 +11629,7 @@ else
   cf_cv_good_bcopy=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 11639 "configure"
+#line 11633 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -11648,7 +11642,7 @@ int main() {
 }
 		
 EOF
-if { (eval echo configure:11652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_good_bcopy=yes
 else
@@ -11686,9 +11680,9 @@ fi
 
 
 echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6
-echo "configure:11690: checking if select expects int * arguments" >&5
+echo "configure:11684: checking if select expects int * arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11692 "configure"
+#line 11686 "configure"
 #include "confdefs.h"
 #include <time.h>
 EOF
@@ -11708,7 +11702,7 @@ rm -f conftest*
 
 
 echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6
-echo "configure:11712: checking whether closedir returns void" >&5
+echo "configure:11706: checking whether closedir returns void" >&5
 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11716,13 +11710,13 @@ else
   ac_cv_func_closedir_void=yes
 else
   cat > conftest.$ac_ext <<EOF
-#line 11720 "configure"
+#line 11714 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_header_dirent>
 int closedir(); main() { exit(closedir(opendir(".")) != 0); }
 EOF
-if { (eval echo configure:11726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_closedir_void=no
 else
@@ -11746,7 +11740,7 @@ fi
 
 ## AC_FUNC_SETPGRP
 echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:11750: checking whether setvbuf arguments are reversed" >&5
+echo "configure:11744: checking whether setvbuf arguments are reversed" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11754,7 +11748,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 11758 "configure"
+#line 11752 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -11768,7 +11762,7 @@ main () {
   exit(0);			/* Non-reversed systems segv here.  */
 }
 EOF
-if { (eval echo configure:11772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -11805,12 +11799,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11809: checking for $ac_func" >&5
+echo "configure:11803: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11814 "configure"
+#line 11808 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11833,7 +11827,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11860,13 +11854,13 @@ done
 
 
 echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6
-echo "configure:11864: checking for type sigaction_t" >&5
+echo "configure:11858: checking for type sigaction_t" >&5
 if eval "test \"`echo '$''{'cf_cv_type_sigaction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11870 "configure"
+#line 11864 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -11874,7 +11868,7 @@ int main() {
 sigaction_t x
 ; return 0; }
 EOF
-if { (eval echo configure:11878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_type_sigaction=yes
 else
@@ -11894,13 +11888,13 @@ EOF
 
 
 echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6
-echo "configure:11898: checking for nonconflicting termios.h" >&5
+echo "configure:11892: checking for nonconflicting termios.h" >&5
 if eval "test \"`echo '$''{'cf_cv_use_termios_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11904 "configure"
+#line 11898 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_IOCTL_H
@@ -11922,7 +11916,7 @@ int main() {
 	(void) tcgetattr (0, &save_tty)
 ; return 0; }
 EOF
-if { (eval echo configure:11926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_use_termios_h=yes
 else
@@ -11953,13 +11947,13 @@ fi
 
 
 echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6
-echo "configure:11957: checking for passwd.pw_gecos" >&5
+echo "configure:11951: checking for passwd.pw_gecos" >&5
 if eval "test \"`echo '$''{'cf_cv_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 11963 "configure"
+#line 11957 "configure"
 #include "confdefs.h"
 
 #include <pwd.h>
@@ -11970,7 +11964,7 @@ int main() {
 	char bar = foo.pw_gecos
 ; return 0; }
 EOF
-if { (eval echo configure:11974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_pw_gecos=yes
 else
@@ -11990,13 +11984,13 @@ EOF
 
 
 echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6
-echo "configure:11994: checking for tm.tm_gmtoff" >&5
+echo "configure:11988: checking for tm.tm_gmtoff" >&5
 if eval "test \"`echo '$''{'cf_cv_tm_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 12000 "configure"
+#line 11994 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -12016,7 +12010,7 @@ int main() {
 	long bar = foo.tm_gmtoff
 ; return 0; }
 EOF
-if { (eval echo configure:12020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_tm_gmtoff=yes
 else
@@ -12036,7 +12030,7 @@ EOF
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:12040: checking for long file names" >&5
+echo "configure:12034: checking for long file names" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12084,17 +12078,17 @@ for ac_hdr in sys/wait.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12088: checking for $ac_hdr" >&5
+echo "configure:12082: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12093 "configure"
+#line 12087 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12131,17 +12125,17 @@ for ac_hdr in wait.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12135: checking for $ac_hdr" >&5
+echo "configure:12129: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12140 "configure"
+#line 12134 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12171,17 +12165,17 @@ for ac_hdr in waitstatus.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12175: checking for $ac_hdr" >&5
+echo "configure:12169: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12180 "configure"
+#line 12174 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12222,13 +12216,13 @@ fi
 
 
 echo $ac_n "checking for union wait""... $ac_c" 1>&6
-echo "configure:12226: checking for union wait" >&5
+echo "configure:12220: checking for union wait" >&5
 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 12232 "configure"
+#line 12226 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -12239,7 +12233,7 @@ int x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:12243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -12250,7 +12244,7 @@ else
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 12254 "configure"
+#line 12248 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int main() {
@@ -12265,7 +12259,7 @@ union wait x;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:12269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -12290,7 +12284,7 @@ EOF
 
 
 echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6
-echo "configure:12294: checking if the system function returns usable child-status" >&5
+echo "configure:12288: checking if the system function returns usable child-status" >&5
 if eval "test \"`echo '$''{'cf_cv_system_status'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12299,7 +12293,7 @@ else
   cf_cv_system_status=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 12303 "configure"
+#line 12297 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12332,7 +12326,7 @@ int main()
 }
 
 EOF
-if { (eval echo configure:12336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_system_status=no
 else
@@ -12343,11 +12337,11 @@ else
   cf_cv_system_status=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 12347 "configure"
+#line 12341 "configure"
 #include "confdefs.h"
 int main() { exit(system("exit 23") != (23 << 8)); }
 EOF
-if { (eval echo configure:12351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_system_status=yes
 else
@@ -12390,13 +12384,13 @@ EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
 echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6
-echo "configure:12394: checking for obsolete/broken version of ncurses" >&5
+echo "configure:12388: checking for obsolete/broken version of ncurses" >&5
 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 cat > conftest.$ac_ext <<EOF
-#line 12400 "configure"
+#line 12394 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -12410,7 +12404,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_ncurses_broken=no
 else
@@ -12435,13 +12429,13 @@ fi
 
 		
 echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6
-echo "configure:12439: checking if curses supports color attributes" >&5
+echo "configure:12433: checking if curses supports color attributes" >&5
 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 12445 "configure"
+#line 12439 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -12456,7 +12450,7 @@ chtype x = COLOR_BLUE;
 	
 ; return 0; }
 EOF
-if { (eval echo configure:12460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_color_curses=yes
 else
@@ -12507,7 +12501,7 @@ if test $check_sig_const = yes ; then
 	
 
 echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6
-echo "configure:12511: checking for redefinable signal constants" >&5
+echo "configure:12505: checking for redefinable signal constants" >&5
 if eval "test \"`echo '$''{'cf_cv_sig_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12519,7 +12513,7 @@ if test -n "$cf_cv_sig_args"; then
   cf_cv_sig_const=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 12523 "configure"
+#line 12517 "configure"
 #include "confdefs.h"
 
 #define NEW_DFL	((RETSIGTYPE (*)($cf_test))0)
@@ -12546,7 +12540,7 @@ int main()
 	exit(0);
 }
 EOF
-if { (eval echo configure:12550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_sig_const=yes
 else
@@ -12572,13 +12566,13 @@ fi
 
 
 echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6
-echo "configure:12576: checking for ANSI qsort" >&5
+echo "configure:12570: checking for ANSI qsort" >&5
 if eval "test \"`echo '$''{'cf_cv_comptype'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 	cat > conftest.$ac_ext <<EOF
-#line 12582 "configure"
+#line 12576 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -12590,7 +12584,7 @@ extern int compare(const void *, const v
 	 qsort(foo, sizeof(foo)/sizeof(*foo), sizeof(*foo), compare)
 ; return 0; }
 EOF
-if { (eval echo configure:12594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_cv_comptype=yes
 else
@@ -12618,7 +12612,7 @@ fi
 
 
 echo $ac_n "checking if application can dump core""... $ac_c" 1>&6
-echo "configure:12622: checking if application can dump core" >&5
+echo "configure:12616: checking if application can dump core" >&5
 if eval "test \"`echo '$''{'cf_cv_corefile'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12627,7 +12621,7 @@ else
   cf_cv_corefile=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 12631 "configure"
+#line 12625 "configure"
 #include "confdefs.h"
 
 #include <signal.h>
@@ -12668,7 +12662,7 @@ int main()
 #endif
 }
 EOF
-if { (eval echo configure:12672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_corefile=yes
 else
@@ -12714,18 +12708,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd
 
 
 echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6
-echo "configure:12718: checking for missing "${ac_func}" extern" >&5
+echo "configure:12712: checking for missing "${ac_func}" extern" >&5
 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 
-echo "(line 12724) testing for missing "${ac_func}" external ..." 1>&5
+echo "(line 12718) testing for missing "${ac_func}" external ..." 1>&5
 
 cf_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $CHECK_DECL_FLAG"
 cat > conftest.$ac_ext <<EOF
-#line 12729 "configure"
+#line 12723 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -12739,7 +12733,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   if test -n "$CHECK_DECL_HDRS" ; then
 # try to work around system headers which are infested with non-standard syntax
@@ -12747,7 +12741,7 @@ if { (eval echo configure:12743: \"$ac_l
 cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 cat > conftest.$ac_ext <<EOF
-#line 12751 "configure"
+#line 12745 "configure"
 #include "confdefs.h"
 
 #define DECL_${cf_1_up}
@@ -12757,7 +12751,7 @@ int main() {
 long x = 0
 ; return 0; }
 EOF
-if { (eval echo configure:12761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -12806,18 +12800,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd
 
 
 echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6
-echo "configure:12810: checking for missing "${ac_func}" extern" >&5
+echo "configure:12804: checking for missing "${ac_func}" extern" >&5
 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 
-echo "(line 12816) testing for missing "${ac_func}" external ..." 1>&5
+echo "(line 12810) testing for missing "${ac_func}" external ..." 1>&5
 
 cf_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $CHECK_DECL_FLAG"
 cat > conftest.$ac_ext <<EOF
-#line 12821 "configure"
+#line 12815 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -12831,7 +12825,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   if test -n "$CHECK_DECL_HDRS" ; then
 # try to work around system headers which are infested with non-standard syntax
@@ -12839,7 +12833,7 @@ if { (eval echo configure:12835: \"$ac_l
 cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 cat > conftest.$ac_ext <<EOF
-#line 12843 "configure"
+#line 12837 "configure"
 #include "confdefs.h"
 
 #define DECL_${cf_1_up}
@@ -12849,7 +12843,7 @@ int main() {
 long x = 0
 ; return 0; }
 EOF
-if { (eval echo configure:12853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -12896,18 +12890,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd
 
 
 echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6
-echo "configure:12900: checking for missing "${ac_func}" extern" >&5
+echo "configure:12894: checking for missing "${ac_func}" extern" >&5
 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 
-echo "(line 12906) testing for missing "${ac_func}" external ..." 1>&5
+echo "(line 12900) testing for missing "${ac_func}" external ..." 1>&5
 
 cf_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $CHECK_DECL_FLAG"
 cat > conftest.$ac_ext <<EOF
-#line 12911 "configure"
+#line 12905 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -12921,7 +12915,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   if test -n "$CHECK_DECL_HDRS" ; then
 # try to work around system headers which are infested with non-standard syntax
@@ -12929,7 +12923,7 @@ if { (eval echo configure:12925: \"$ac_l
 cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 cat > conftest.$ac_ext <<EOF
-#line 12933 "configure"
+#line 12927 "configure"
 #include "confdefs.h"
 
 #define DECL_${cf_1_up}
@@ -12939,7 +12933,7 @@ int main() {
 long x = 0
 ; return 0; }
 EOF
-if { (eval echo configure:12943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -13038,18 +13032,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd
 
 
 echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6
-echo "configure:13042: checking for missing "${ac_func}" extern" >&5
+echo "configure:13036: checking for missing "${ac_func}" extern" >&5
 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 
-echo "(line 13048) testing for missing "${ac_func}" external ..." 1>&5
+echo "(line 13042) testing for missing "${ac_func}" external ..." 1>&5
 
 cf_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $CHECK_DECL_FLAG"
 cat > conftest.$ac_ext <<EOF
-#line 13053 "configure"
+#line 13047 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -13063,7 +13057,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   if test -n "$CHECK_DECL_HDRS" ; then
 # try to work around system headers which are infested with non-standard syntax
@@ -13071,7 +13065,7 @@ if { (eval echo configure:13067: \"$ac_l
 cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 cat > conftest.$ac_ext <<EOF
-#line 13075 "configure"
+#line 13069 "configure"
 #include "confdefs.h"
 
 #define DECL_${cf_1_up}
@@ -13081,7 +13075,7 @@ int main() {
 long x = 0
 ; return 0; }
 EOF
-if { (eval echo configure:13085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -13125,18 +13119,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd
 
 
 echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6
-echo "configure:13129: checking for missing "${ac_func}" extern" >&5
+echo "configure:13123: checking for missing "${ac_func}" extern" >&5
 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 
-echo "(line 13135) testing for missing "${ac_func}" external ..." 1>&5
+echo "(line 13129) testing for missing "${ac_func}" external ..." 1>&5
 
 cf_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $CHECK_DECL_FLAG"
 cat > conftest.$ac_ext <<EOF
-#line 13140 "configure"
+#line 13134 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -13150,7 +13144,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   if test -n "$CHECK_DECL_HDRS" ; then
 # try to work around system headers which are infested with non-standard syntax
@@ -13158,7 +13152,7 @@ if { (eval echo configure:13154: \"$ac_l
 cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 cat > conftest.$ac_ext <<EOF
-#line 13162 "configure"
+#line 13156 "configure"
 #include "confdefs.h"
 
 #define DECL_${cf_1_up}
@@ -13168,7 +13162,7 @@ int main() {
 long x = 0
 ; return 0; }
 EOF
-if { (eval echo configure:13172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -13215,18 +13209,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd
 
 
 echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6
-echo "configure:13219: checking for missing "${ac_func}" extern" >&5
+echo "configure:13213: checking for missing "${ac_func}" extern" >&5
 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 
-echo "(line 13225) testing for missing "${ac_func}" external ..." 1>&5
+echo "(line 13219) testing for missing "${ac_func}" external ..." 1>&5
 
 cf_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $CHECK_DECL_FLAG"
 cat > conftest.$ac_ext <<EOF
-#line 13230 "configure"
+#line 13224 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -13240,7 +13234,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   if test -n "$CHECK_DECL_HDRS" ; then
 # try to work around system headers which are infested with non-standard syntax
@@ -13248,7 +13242,7 @@ if { (eval echo configure:13244: \"$ac_l
 cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 cat > conftest.$ac_ext <<EOF
-#line 13252 "configure"
+#line 13246 "configure"
 #include "confdefs.h"
 
 #define DECL_${cf_1_up}
@@ -13258,7 +13252,7 @@ int main() {
 long x = 0
 ; return 0; }
 EOF
-if { (eval echo configure:13262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval 'cf_cv_func_'${ac_func}'=yes'
 else
@@ -13296,7 +13290,7 @@ fi
 
 
 echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6
-echo "configure:13300: checking for working TIOCGWINSZ" >&5
+echo "configure:13294: checking for working TIOCGWINSZ" >&5
 if eval "test \"`echo '$''{'cf_cv_use_tiocgwinsz'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -13307,7 +13301,7 @@ else
   cf_cv_use_tiocgwinsz=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 13311 "configure"
+#line 13305 "configure"
 #include "confdefs.h"
 
 $CHECK_DECL_HDRS
@@ -13332,7 +13326,7 @@ int main()
 	exit(0);	/* we cannot guarantee this is run interactively */
 }
 EOF
-if { (eval echo configure:13336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cf_cv_use_tiocgwinsz=yes
 else
@@ -13374,23 +13368,23 @@ EOF
 esac
 
 ### Use gettext
-### this also calles AM_LANGINFO_CODESET and AM_ICONV
-### so we don't need to do the tests ourself
+### this also calls AM_LANGINFO_CODESET and AM_ICONV
+### so we don't need to do the tests ourselves.
 for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13384: checking for $ac_hdr" >&5
+echo "configure:13378: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13389 "configure"
+#line 13383 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13419,12 +13413,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13423: checking for $ac_func" >&5
+echo "configure:13417: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13428 "configure"
+#line 13422 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13447,7 +13441,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -13472,7 +13466,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:13476: checking for working mmap" >&5
+echo "configure:13470: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -13480,7 +13474,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 13484 "configure"
+#line 13478 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -13620,7 +13614,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:13624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -13644,12 +13638,12 @@ fi
 
 
     echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
-echo "configure:13648: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "configure:13642: checking whether we are using the GNU C Library 2.1 or newer" >&5
 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13653 "configure"
+#line 13647 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -13687,23 +13681,28 @@ echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&
 
 	
 
+
+cf_makefile=Makefile
+
+test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
+
                                     
    for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13697: checking for $ac_hdr" >&5
+echo "configure:13696: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13702 "configure"
+#line 13701 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13734,12 +13733,12 @@ getgid getuid mempcpy munmap putenv sete
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13738: checking for $ac_func" >&5
+echo "configure:13737: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13743 "configure"
+#line 13742 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13762,7 +13761,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -13803,7 +13802,7 @@ fi
 
 
   echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:13807: checking for iconv" >&5
+echo "configure:13806: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -13811,7 +13810,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 13815 "configure"
+#line 13814 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -13821,7 +13820,7 @@ iconv_t cd = iconv_open("","");
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:13825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -13833,7 +13832,7 @@ rm -f conftest*
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 13837 "configure"
+#line 13836 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -13843,7 +13842,7 @@ iconv_t cd = iconv_open("","");
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:13847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -13864,13 +13863,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
 EOF
 
     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:13868: checking for iconv declaration" >&5
+echo "configure:13867: checking for iconv declaration" >&5
     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 13874 "configure"
+#line 13873 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13889,7 +13888,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_proto_iconv_arg1=""
 else
@@ -13918,19 +13917,19 @@ EOF
 
    
   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:13922: checking for nl_langinfo and CODESET" >&5
+echo "configure:13921: checking for nl_langinfo and CODESET" >&5
 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13927 "configure"
+#line 13926 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int main() {
 char* cs = nl_langinfo(CODESET);
 ; return 0; }
 EOF
-if { (eval echo configure:13934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_langinfo_codeset=yes
 else
@@ -13953,19 +13952,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:13957: checking for LC_MESSAGES" >&5
+echo "configure:13956: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13962 "configure"
+#line 13961 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:13969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -13986,7 +13985,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:13990: checking whether NLS is requested" >&5
+echo "configure:13989: checking whether NLS is requested" >&5
         
     
 # Check whether --enable-nls or --disable-nls was given.
@@ -14010,7 +14009,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:14014: checking whether included gettext is requested" >&5
+echo "configure:14013: checking whether included gettext is requested" >&5
       
 # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
@@ -14031,17 +14030,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:14035: checking for libintl.h" >&5
+echo "configure:14034: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14040 "configure"
+#line 14039 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14058,12 +14057,12 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:14062: checking for GNU gettext in libc" >&5
+echo "configure:14061: checking for GNU gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14067 "configure"
+#line 14066 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -14072,7 +14071,7 @@ bindtextdomain ("", "");
 return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:14076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libc=yes
 else
@@ -14088,14 +14087,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_lib
 
 	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
 	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:14092: checking for GNU gettext in libintl" >&5
+echo "configure:14091: checking for GNU gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   gt_save_LIBS="$LIBS"
 		LIBS="$LIBS -lintl $LIBICONV"
 		cat > conftest.$ac_ext <<EOF
-#line 14099 "configure"
+#line 14098 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -14104,7 +14103,7 @@ bindtextdomain ("", "");
 return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:14108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libintl=yes
 else
@@ -14137,12 +14136,12 @@ EOF
 	     for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14141: checking for $ac_func" >&5
+echo "configure:14140: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14146 "configure"
+#line 14145 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14165,7 +14164,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -14195,7 +14194,7 @@ done
 
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14199: checking for $ac_word" >&5
+echo "configure:14198: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14229,7 +14228,7 @@ fi
 	     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14233: checking for $ac_word" >&5
+echo "configure:14232: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14267,7 +14266,7 @@ fi
 
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14271: checking for $ac_word" >&5
+echo "configure:14270: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14318,7 +14317,7 @@ fi
 
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14322: checking for $ac_word" >&5
+echo "configure:14321: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14352,7 +14351,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14356: checking for $ac_word" >&5
+echo "configure:14355: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14389,7 +14388,7 @@ fi
 
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14393: checking for $ac_word" >&5
+echo "configure:14392: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14461,7 +14460,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14465: checking for $ac_word" >&5
+echo "configure:14464: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14494,7 +14493,7 @@ done
       ac_verc_fail=yes
     else
             echo $ac_n "checking version of bison""... $ac_c" 1>&6
-echo "configure:14498: checking version of bison" >&5
+echo "configure:14497: checking version of bison" >&5
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -14541,7 +14540,7 @@ echo "configure:14498: checking version 
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:14545: checking for catalogs to be installed" >&5
+echo "configure:14544: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
          useit=no
@@ -14580,32 +14579,150 @@ echo "configure:14545: checking for cata
       INTL_LIBTOOL_SUFFIX_PREFIX=
    
 
-LIBS="$LIBS $LIBICONV"
+
+INTLDIR_MAKE=
+MSG_DIR_MAKE=
+SUB_MAKEFILE=
+
+
+cf_makefile=Makefile
+
+use_our_messages=no
+if test "$USE_NLS" = yes ; then
+if test -d $srcdir/po ; then
+echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6
+echo "configure:14595: checking if we should use included message-library" >&5
+	
+# Check whether --enable-included-msgs or --disable-included-msgs was given.
+if test "${enable_included_msgs+set}" = set; then
+  enableval="$enable_included_msgs"
+  use_our_messages=$enableval
+else
+  use_our_messages=yes
+fi
+
+fi
+echo "$ac_t""$use_our_messages" 1>&6
+fi
+
+MSG_DIR_MAKE="#"
+if test "$use_our_messages" = yes
+then
+	SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:po/$cf_makefile.inn"
+	MSG_DIR_MAKE=
+fi
+
+
+
+
+
 if test "$USE_INCLUDED_LIBINTL" = yes ; then
-	CPPFLAGS="-I../intl $CPPFLAGS"
-	INTLDIR_MAKE=""
-	INTL_MAKEFILE="intl/Makefile"
+        if test "$nls_cv_force_use_gnu_gettext" = yes ; then
+		SUB_MAKEFILE="$SUB_MAKEFILE intl/$cf_makefile"
+	elif test "$nls_cv_use_gnu_gettext" = yes ; then
+		SUB_MAKEFILE="$SUB_MAKEFILE intl/$cf_makefile"
+	else
+		INTLDIR_MAKE="#"
+	fi
+	if test -z "$INTLDIR_MAKE"; then
+		cat >> confdefs.h <<\EOF
+#define HAVE_LIBGETTEXT_H 1
+EOF
+
+	fi
+else
+	INTLDIR_MAKE="#"
+	if test "$USE_NLS" = yes ; then
+		for ac_hdr in libintl.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:14641: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 14646 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:14651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
 else
-	INTLDIR_MAKE='#'
-	INTL_MAKEFILE=""
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-if test "$USE_NLS" = yes ; then
-	MSG_DIR_MAKE=""
-	PO_MAKEFILE="po/Makefile.in:po/Makefile.inn po/Makefile"
+	fi
+fi
+
+if test -z "$INTLDIR_MAKE" ; then
+	CPPFLAGS="-I../intl $CPPFLAGS"
+fi
+
+if test "$BUILD_INCLUDED_LIBINTL" = yes ; then
+	GT_YES="#"
+	GT_NO=
 else
-	MSG_DIR_MAKE="#"
-	PO_MAKEFILE=""
+	GT_YES=
+	GT_NO="#"
 fi
 
 
 
+
+
+
+
+if test "$USE_INCLUDED_LIBINTL" = yes ; then
+	if test "$nls_cv_force_use_gnu_gettext" = yes ; then
+		cat >> confdefs.h <<\EOF
+#define HAVE_GETTEXT 1
+EOF
+
+	elif test "$nls_cv_use_gnu_gettext" = yes ; then
+		cat >> confdefs.h <<\EOF
+#define HAVE_GETTEXT 1
+EOF
+
+	fi
+	if test -n "$nls_cv_header_intl" ; then
+		cat >> confdefs.h <<\EOF
+#define HAVE_LIBINTL_H 1
+EOF
+
+	fi
+fi
+
+LIBS="$LIBS $LIBICONV"
+
+
 for cf_hdr in iconv.h
 do
 	echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6
-echo "configure:14607: checking for $cf_hdr" >&5
+echo "configure:14724: checking for $cf_hdr" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 14609 "configure"
+#line 14726 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14613,7 +14730,7 @@ echo "configure:14607: checking for $cf_
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14639,13 +14756,13 @@ fi
 done
 
 echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6
-echo "configure:14643: checking for iconv_open() //TRANSLIT extension" >&5
+echo "configure:14760: checking for iconv_open() //TRANSLIT extension" >&5
 if test "$cross_compiling" = yes; then
   echo "$ac_t""unknown" 1>&6
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 14649 "configure"
+#line 14766 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ICONV_H
@@ -14662,7 +14779,7 @@ int main() {
 	exit(0);
 }
 EOF
-if { (eval echo configure:14666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cat >> confdefs.h <<\EOF
 #define HAVE_ICONV_OPEN_TRANSLIT 1
@@ -14690,7 +14807,7 @@ if test "$cf_cv_termlib" = pdcurses ; th
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:14694: checking for X" >&5
+echo "configure:14811: checking for X" >&5
 
 
 # Check whether --with-x or --without-x was given.
@@ -14753,12 +14870,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 14757 "configure"
+#line 14874 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14827,14 +14944,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14831 "configure"
+#line 14948 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:14838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -14934,7 +15051,7 @@ clix*)
 	# FIXME: modify the library lookup in autoconf to
 	# allow _s.a suffix ahead of .a
 	echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6
-echo "configure:14938: checking for open in -lc_s" >&5
+echo "configure:15055: checking for open in -lc_s" >&5
 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14942,7 +15059,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14946 "configure"
+#line 15063 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14953,7 +15070,7 @@ int main() {
 open()
 ; return 0; }
 EOF
-if { (eval echo configure:14957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14970,7 +15087,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
   echo "$ac_t""yes" 1>&6
   LIBS="-lc_s $LIBS"
 	echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6
-echo "configure:14974: checking for gethostname in -lbsd" >&5
+echo "configure:15091: checking for gethostname in -lbsd" >&5
 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14978,7 +15095,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14982 "configure"
+#line 15099 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14989,7 +15106,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:14993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15006,7 +15123,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
   echo "$ac_t""yes" 1>&6
   LIBS="-lbsd $LIBS"
 	echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6
-echo "configure:15010: checking for gethostname in -lnsl_s" >&5
+echo "configure:15127: checking for gethostname in -lnsl_s" >&5
 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15014,7 +15131,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15018 "configure"
+#line 15135 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15025,7 +15142,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:15029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15042,7 +15159,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
   echo "$ac_t""yes" 1>&6
   LIBS="-lnsl_s $LIBS"
 	echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6
-echo "configure:15046: checking for XOpenDisplay in -lX11_s" >&5
+echo "configure:15163: checking for XOpenDisplay in -lX11_s" >&5
 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15050,7 +15167,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15054 "configure"
+#line 15171 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15061,7 +15178,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:15065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15078,7 +15195,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
   echo "$ac_t""yes" 1>&6
   LIBS="-lX11_s $LIBS"
 	echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6
-echo "configure:15082: checking for XtAppInitialize in -lXt_s" >&5
+echo "configure:15199: checking for XtAppInitialize in -lXt_s" >&5
 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15086,7 +15203,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXt_s  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15090 "configure"
+#line 15207 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15097,7 +15214,7 @@ int main() {
 XtAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:15101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15138,7 +15255,7 @@ fi
 	;;
 *)
 	echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:15142: checking for socket in -lsocket" >&5
+echo "configure:15259: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15146,7 +15263,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15150 "configure"
+#line 15267 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15157,7 +15274,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:15161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15185,7 +15302,7 @@ else
 fi
 
 	echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
-echo "configure:15189: checking for gethostname in -lnsl" >&5
+echo "configure:15306: checking for gethostname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15193,7 +15310,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15197 "configure"
+#line 15314 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15204,7 +15321,7 @@ int main() {
 gethostname()
 ; return 0; }
 EOF
-if { (eval echo configure:15208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15255,17 +15372,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:15259: checking whether -R must be followed by a space" >&5
+echo "configure:15376: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 15262 "configure"
+#line 15379 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:15269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -15281,14 +15398,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 15285 "configure"
+#line 15402 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:15292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -15320,7 +15437,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:15324: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:15441: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15328,7 +15445,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15332 "configure"
+#line 15449 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15339,7 +15456,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:15343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15361,7 +15478,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:15365: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:15482: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15369,7 +15486,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15373 "configure"
+#line 15490 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15380,7 +15497,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:15384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15409,12 +15526,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:15413: checking for gethostbyname" >&5
+echo "configure:15530: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15418 "configure"
+#line 15535 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -15437,7 +15554,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -15458,7 +15575,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:15462: checking for gethostbyname in -lnsl" >&5
+echo "configure:15579: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15466,7 +15583,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15470 "configure"
+#line 15587 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15477,7 +15594,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:15481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15507,12 +15624,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:15511: checking for connect" >&5
+echo "configure:15628: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15516 "configure"
+#line 15633 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -15535,7 +15652,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -15556,7 +15673,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:15560: checking for connect in -lsocket" >&5
+echo "configure:15677: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15564,7 +15681,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15568 "configure"
+#line 15685 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15575,7 +15692,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:15579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15599,12 +15716,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:15603: checking for remove" >&5
+echo "configure:15720: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15608 "configure"
+#line 15725 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -15627,7 +15744,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -15648,7 +15765,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:15652: checking for remove in -lposix" >&5
+echo "configure:15769: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15656,7 +15773,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15660 "configure"
+#line 15777 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15667,7 +15784,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:15671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15691,12 +15808,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:15695: checking for shmat" >&5
+echo "configure:15812: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15700 "configure"
+#line 15817 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -15719,7 +15836,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -15740,7 +15857,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:15744: checking for shmat in -lipc" >&5
+echo "configure:15861: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15748,7 +15865,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15752 "configure"
+#line 15869 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15759,7 +15876,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:15763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15792,7 +15909,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:15796: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:15913: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15800,7 +15917,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15804 "configure"
+#line 15921 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15811,7 +15928,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:15815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15877,14 +15994,14 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat > conftest.$ac_ext <<EOF
-#line 15881 "configure"
+#line 15998 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello world");
 ; return 0; }
 EOF
-if { (eval echo configure:15888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -15902,7 +16019,7 @@ rm -f conftest*
 fi
 
 	echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:15906: checking for XOpenDisplay in -lX11" >&5
+echo "configure:16023: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15910,7 +16027,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15914 "configure"
+#line 16031 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15921,7 +16038,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:15925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15942,7 +16059,7 @@ else
 fi
 
 	echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-echo "configure:15946: checking for XtAppInitialize in -lXt" >&5
+echo "configure:16063: checking for XtAppInitialize in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15950,7 +16067,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15954 "configure"
+#line 16071 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15961,7 +16078,7 @@ int main() {
 XtAppInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:15965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16029,14 +16146,14 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat > conftest.$ac_ext <<EOF
-#line 16033 "configure"
+#line 16150 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello world");
 ; return 0; }
 EOF
-if { (eval echo configure:16040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -16089,7 +16206,7 @@ fi
 
 
 echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-echo "configure:16093: checking for XextCreateExtension in -lXext" >&5
+echo "configure:16210: checking for XextCreateExtension in -lXext" >&5
 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16097,7 +16214,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXext  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16101 "configure"
+#line 16218 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16108,7 +16225,7 @@ int main() {
 XextCreateExtension()
 ; return 0; }
 EOF
-if { (eval echo configure:16112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16147,13 +16264,13 @@ do
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
 			echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
-echo "configure:16151: checking for $cf_test in $cf_path" >&5
+echo "configure:16268: checking for $cf_test in $cf_path" >&5
 		else
 			echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-echo "configure:16154: checking for $cf_test" >&5
+echo "configure:16271: checking for $cf_test" >&5
 		fi
 		cat > conftest.$ac_ext <<EOF
-#line 16157 "configure"
+#line 16274 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -16162,7 +16279,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:16166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -16209,23 +16326,23 @@ do
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
 				echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
-echo "configure:16213: checking for $cf_lib in $cf_path" >&5
+echo "configure:16330: checking for $cf_lib in $cf_path" >&5
 			else
 				LIBS="$cf_lib $LIBS"
 				echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
-echo "configure:16217: checking for $cf_test in $cf_lib" >&5
+echo "configure:16334: checking for $cf_test in $cf_lib" >&5
 			fi
 			cf_SAVE="$LIBS"
 			LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 			cat > conftest.$ac_ext <<EOF
-#line 16222 "configure"
+#line 16339 "configure"
 #include "confdefs.h"
 
 int main() {
 $cf_test()
 ; return 0; }
 EOF
-if { (eval echo configure:16229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_result=yes
 else
@@ -16304,14 +16421,14 @@ fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat > conftest.$ac_ext <<EOF
-#line 16308 "configure"
+#line 16425 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello world");
 ; return 0; }
 EOF
-if { (eval echo configure:16315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -16329,7 +16446,7 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:16333: checking for XOpenDisplay in -lX11" >&5
+echo "configure:16450: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16337,7 +16454,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16341 "configure"
+#line 16458 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16348,7 +16465,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:16352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16369,14 +16486,14 @@ else
 fi
 
 echo $ac_n "checking for XCurses library""... $ac_c" 1>&6
-echo "configure:16373: checking for XCurses library" >&5
+echo "configure:16490: checking for XCurses library" >&5
 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 LIBS="-lXCurses $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16380 "configure"
+#line 16497 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -16386,7 +16503,7 @@ int main() {
 XCursesExit();
 ; return 0; }
 EOF
-if { (eval echo configure:16390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cf_cv_lib_XCurses=yes
 else
@@ -16585,8 +16702,7 @@ ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "$PCRE_MAKEFILE
-	$INTL_MAKEFILE
-	$PO_MAKEFILE
+	$SUB_MAKEFILE
 	src/Makefile include/autoconf.h:include/autoconf.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -16696,8 +16812,11 @@ s%@INSTOBJEXT@%$INSTOBJEXT%g
 s%@GENCAT@%$GENCAT%g
 s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
 s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
-s%@INTLDIR_MAKE@%$INTLDIR_MAKE%g
 s%@MSG_DIR_MAKE@%$MSG_DIR_MAKE%g
+s%@SUB_MAKEFILE@%$SUB_MAKEFILE%g
+s%@INTLDIR_MAKE@%$INTLDIR_MAKE%g
+s%@GT_YES@%$GT_YES%g
+s%@GT_NO@%$GT_NO%g
 s%@X_CFLAGS@%$X_CFLAGS%g
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
@@ -16744,8 +16863,7 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"$PCRE_MAKEFILE
-	$INTL_MAKEFILE
-	$PO_MAKEFILE
+	$SUB_MAKEFILE
 	src/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
diff -Nurp tin-1.5.18/configure.in tin-1.6.0/configure.in
--- tin-1.5.18/configure.in	Mon Jun  2 14:58:13 2003
+++ tin-1.6.0/configure.in	Mon Jul 14 19:17:31 2003
@@ -2,7 +2,7 @@ dnl Project   : tin - a Usenet reader
 dnl Module    : configure.in
 dnl Author    : Thomas E. Dickey <dickey@herndon4.his.com>
 dnl Created   : 1995-08-24
-dnl Updated   : 2003-05-16
+dnl Updated   : 2003-06-18
 dnl Notes     :
 dnl
 dnl Copyright (c) 1995-2003 Thomas E. Dickey <dickey@herndon4.his.com>
@@ -44,7 +44,7 @@ AC_PREFIX_DEFAULT(/usr/local)
 
 dnl PACKAGE is required for GNU gettext
 PACKAGE=tin
-VERSION=1.5.18
+VERSION=1.6.0
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -99,20 +99,18 @@ AC_PROG_LN_S
 
 case "$host_cpu:$host_vendor:$host_os" in
 	# check for MacOS X, exclude Darwin on ix86
-	powerpc:apple:darwin*)  #(vi
-		# replacement for AC_CHECK_LIB()
-		# don't use -f as this might be a link
-		if test -e "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation"; then
-			AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
-				AC_DEFINE(MAC_OS_X)
-				LIBS="/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation $LIBS"])
-		fi
+	powerpc:apple:darwin*)  #
+		AC_DEFINE(MAC_OS_X)
 		;;
 	# check for cygwin enviroment
 	# -DSTATIC is needed for pcre
 	*:*:*cygwin*)	#(vi
 		PCRE_DEFINES="$PCRE_DEFINES -DSTATIC"
 		;;
+	# SEIUX doesn't have any usefull preprocessor symbol
+	mips:sei:seiux*)
+		AC_DEFINE(SEIUX)
+		;;
 esac
 
 
@@ -1114,27 +1112,10 @@ DMALLOC)
 esac
 
 ### Use gettext
-### this also calles AM_LANGINFO_CODESET and AM_ICONV
-### so we don't need to do the tests ourself
-AM_GNU_GETTEXT
+### this also calls AM_LANGINFO_CODESET and AM_ICONV
+### so we don't need to do the tests ourselves.
+CF_BUNDLED_INTL
 LIBS="$LIBS $LIBICONV"
-if test "$USE_INCLUDED_LIBINTL" = yes ; then
-	CPPFLAGS="-I../intl $CPPFLAGS"
-	INTLDIR_MAKE=""
-	INTL_MAKEFILE="intl/Makefile"
-else
-	INTLDIR_MAKE='#'
-	INTL_MAKEFILE=""
-fi
-AC_SUBST(INTLDIR_MAKE)
-if test "$USE_NLS" = yes ; then
-	MSG_DIR_MAKE=""
-	PO_MAKEFILE="po/Makefile.in:po/Makefile.inn po/Makefile"
-else
-	MSG_DIR_MAKE="#"
-	PO_MAKEFILE=""
-fi
-AC_SUBST(MSG_DIR_MAKE)
 
 CF_CHECK_HEADERS(iconv.h)
 AC_MSG_CHECKING(for iconv_open() //TRANSLIT extension)
@@ -1190,6 +1171,5 @@ CF_DEFINE_STRING(TIN_LDFLAGS,  "$LDFLAGS
 CF_DEFINE_STRING(TIN_LIBS,     "$LIBS")
 
 AC_OUTPUT($PCRE_MAKEFILE
-	$INTL_MAKEFILE
-	$PO_MAKEFILE
+	$SUB_MAKEFILE
 	src/Makefile)
diff -Nurp tin-1.5.18/doc/CHANGES tin-1.6.0/doc/CHANGES
--- tin-1.5.18/doc/CHANGES	Mon Jun  2 14:57:45 2003
+++ tin-1.6.0/doc/CHANGES	Mon Jul 14 19:17:02 2003
@@ -1,3 +1,68 @@
+-- 1.6.0 release 20030714 "Vatersay" --
+
+U167) Matt Anton <tin@syrius.org>
+      ADD. added a few missing french translations
+      FIX. fr.po
+
+U166) Andreas Metzler <tin-dev@downhill.at.eu.org>
+      BUG. revert bogus cleanup
+      FIX. page.c
+
+U165) Michael Bienia <michael@vorlon.ping.de>
+      BUG. manpage cleanups
+      BUG. //TRANSLIT might not work correct
+      BUG. changing thread_articles via 'M'enu while beeing an 'emtpy'
+           group caused a crash
+      ADD. +/-MULTIBYTE_ABLE to -V output
+      FIX. config.c, main.c, misc.c, tin.1, tin.5
+
+U164) Dirk Nimmich <nimmich@muenster.de>
+      BUG. didn't unfold MIME-header before trying to parse the arguments
+      BUG. art.c didn't compile with --enable-debug
+      BUG. memleak in main.c
+      BUG. newnews timestamps in tinrc got trashed when running multiple
+           tins concurrently
+      BUG. oldnewsrc got trashed when starting multiple tin concurrently
+      NOP. various cleanups
+      FIX. active.c, art.c, config.c, lang.c, main.c, newsrc.c, nntplib.c
+           rfc2046.c
+
+U163) Jason Faultless <jason@altarstone.com>
+      ADD. overhaul find_nov_file() mechanism
+      BUG. reading local spool always cached overview files
+      BUG. spurious private overview cache dirs created
+      BUG. private overview dirs not recreated properly
+      BUG. private overview dirs not always uniquely named
+      FIX. extern.h, proto.h, art.c, init.c, lang.c, main.c, misc.c
+           newsrc.c, open.c, post.c, refs.c, tin.1
+
+U162) Thomas E. Dickey <dickey@invisible-island.net>
+      BUG. -lintl may not be linked to executable if using a "externl" lib
+      FIX. aclocal.m4, configure[.in], Makefile[.in], Makefile.inn
+
+U161) Corinna Vinschen <corinna@vinschen.de>
+      BUG. page header truncated too early
+      ADD. Sort threads with equal scores by article sort order
+      FIX. art.c, page.c, tin.h
+
+U160) Toomas Soome <Toomas.Soome@microlink.ee>
+      ADD. updated estonian translation
+      FIX. et.po
+
+U159) Urs Janssen <urs@tin.org>
+      ADD. manpage updates
+      ADD. updated german and french translation
+      ADD. config.guess, config.sub update
+      ADD. cleanup SEIUX handling
+      BUG. possible bufferoverrun with charset conversion
+      BUG. search in a localized Menu didn't use the translated text
+      FIX. extern.h, tin.h, lang.c, post.c, search.c, tin.5, de.po
+           fr.po, config.guess, config.sub, configure[.in], autoconf.h[in]
+
+U158) Andreas Metzler <tin-dev@downhill.at.eu.org>
+      ADD. updated german translation
+      FIX. de.po
+
 -- 1.5.18 release 20030602 "Darts" --
 
 U157) Michael Velten <tin@michnet.de>
diff -Nurp tin-1.5.18/doc/INSTALL tin-1.6.0/doc/INSTALL
--- tin-1.5.18/doc/INSTALL	Thu May  8 23:09:35 2003
+++ tin-1.6.0/doc/INSTALL	Sat Jul 12 15:49:45 2003
@@ -15,38 +15,39 @@ Note: The section 'News machine names' i
 
 The following configure options and defines are documented in detail:
 ---------------------------------------------------------------------
-  --disable-fcntl                         --with-dbmalloc
-  --enable-8bit-keys                      --with-defaults-dir
-  --enable-append-pid                     --with-dmalloc
-  --enable-break-long-lines               --with-domain-name
-  --enable-broken-listgroup-fix           --with-editor
-  --enable-color                          --with-gpg
-  --enable-curses                         --with-inews-dir
-  --enable-debug                          --with-inn-nntplib
-  --enable-echo                           --with-iso-to-ascii
-  --enable-etiquette                      --with-ispell
-  --enable-fascist-newsadmin              --with-libdir
-  --enable-flock                          --with-curses-dir
-  --enable-inverse-video                  --with-mailbox
-  --enable-locale                         --with-mailer
-  --enable-lockf                          --with-metamail
-  --enable-mh-mail-handling               --with-mime-default-charset
-  --enable-mime-strict-charset            --with-ncurses
-  --enable-nntp                           --with-nntp-default-server
-  --enable-nntp-only                      --with-nov-dir
-  --enable-pgp-gpg                        --with-nov-fname
-  --enable-piping                         --with-pcre
-  --enable-posting                        --with-pgp
-  --enable-printing                       --with-pgpk
-  --enable-prototypes                     --with-screen
-  --enable-shell-escape                   --with-shell
-  --enable-warnings                       --with-spooldir
-  --enable-xhdr-xref                      --with-trace
-  --enable-nls                            --with-included-gettext
-  --prefix                                --exec-prefix
-  --bindir                                --mandir
-  --program-prefix                        --program-suffix
-  --program-transform-name
+  --disable-fcntl                         --program-suffix
+  --disable-included-msgs                 --program-transform-name
+  --enable-8bit-keys                      --with-coffee
+  --enable-append-pid                     --with-curses-dir
+  --enable-break-long-lines               --with-dbmalloc
+  --enable-broken-listgroup-fix           --with-defaults-dir
+  --enable-color                          --with-dmalloc
+  --enable-curses                         --with-domain-name
+  --enable-debug                          --with-editor
+  --enable-echo                           --with-gpg
+  --enable-etiquette                      --with-included-gettext
+  --enable-fascist-newsadmin              --with-inews-dir
+  --enable-flock                          --with-inn-nntplib
+  --enable-inverse-video                  --with-iso-to-ascii
+  --enable-locale                         --with-ispell
+  --enable-lockf                          --with-libdir
+  --enable-mh-mail-handling               --with-libiconv-prefix
+  --enable-mime-strict-charset            --with-mailbox
+  --enable-nls                            --with-mailer
+  --enable-nntp                           --with-metamail
+  --enable-nntp-only                      --with-mime-default-charset
+  --enable-pgp-gpg                        --with-ncurses
+  --enable-piping                         --with-nntp-default-server
+  --enable-posting                        --with-nov-dir
+  --enable-printing                       --with-nov-fname
+  --enable-prototypes                     --with-pcre
+  --enable-shell-escape                   --with-pgp
+  --enable-warnings                       --with-pgpk
+  --enable-xhdr-xref                      --with-screen
+  --exec-prefix                           --with-shell
+  --mandir                                --with-spooldir
+  --prefix                                --with-trace
+  --program-prefix
 
   ENFORCE_RFC1034                         NNTP_INEWS
   EVIL_INSIDE                             NNTP_SERVER_FILE
@@ -505,6 +506,11 @@ Support is enabled by default, the --dis
 --with-included-gettext  (default:off)
 If NLS is enabled, the --with-included-gettext option causes the build
 procedure to prefer its copy of GNU gettext.
+
+--disable-included-msgs  (default:off)
+If NLS is enabled, the --disable-included-msgs option causes the build
+procedure to assume message libraries are already installed, and to
+not build them.
 
 HAVE_LIBUU (default: set automatically)
 HAVE_UUDEVIEW_H (default: set automatically)
diff -Nurp tin-1.5.18/doc/TODO tin-1.6.0/doc/TODO
--- tin-1.5.18/doc/TODO	Wed May 21 19:14:30 2003
+++ tin-1.6.0/doc/TODO	Sat Jul 12 15:49:45 2003
@@ -22,17 +22,15 @@ o  single quotes in attachment names are
 o  'C'atchup in pager is still not correct (we don't ever enter the next group)
    [20030515 Urs Janssen <urs@tin.org>]
 
-!o  reconnect problem reported in debian bug #188052
-!   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=188052>
+o  reconnect problem reported in debian bug #188052
+   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=188052>
+   [probabely fixed]
 
-!o  reconnect problem reported in debian bug #143417
-!   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=143417>
+o  reconnect problem reported in debian bug #143417
+   <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=143417>
 
-!o  crash after reconnect when saving multiple files reported in
-!   <nntp://news.tin.org/20030219101902.GA20318@preusse-16223.user.cis.dfn.de>
-
-!o  'article loss' reported in
-!   <nntp://news.tin.org/20020915165856.GA1541@martinkl.dialup.fu-berlin.de>
+o  'article loss' reported in
+   <nntp://news.tin.org/20020915165856.GA1541@martinkl.dialup.fu-berlin.de>
 
 o  piping/printing articles grabbles screen
    [20030501 Urs Janssen <urs@tin.org>]
@@ -43,19 +41,6 @@ o  better integrate saving of MIME/non-M
    [mostly done]
    [Jason Faultless <jason@altarstone.com>]
 
-o  running multiple tins in parallel (each connected to a different
-   server) will trash all newnews=timestamps (and other config changes)
-   except the last form the formerly running tins on quit.
-   same problem with .oldnewsrc
-   [20020215 Mario Holbe <Mario.Holbe@RZ.TU-Ilmenau.DE>]
-   having $NNTPSERVER[:$NNTPPORT]-subdirs (or something defined via an extra
-   field in newsrctbl) below .tin-dir for each server (and port) would be a
-   good solution.
-
-o  $NNTPSERVER is only appended to $TIN_INDEX_NEWSDIR if -g cmd-line
-   option is used, we should change that and always append it to avoid using
-   a wrong cache after changing $NNTPSERVER...
-
 o  attributes are ignored for mail-actions (except mail_to_author())
    cause mail_loop() usualy doesn't know the group we are in.
    [20020211 Andreas Metzler <tin-dev@downhill.at.eu.org>]
@@ -113,17 +98,16 @@ o  remove built in path of external comm
    [for metamail/ispell $METAMAIL/$ISPELL could be used to override
     systempath and progname]
 
-o  overview file cacheing code is over-complex and broken in places
-   - if cache-dir is removed during the session it's not recreated
+o  overview file cacheing code is over-complex
    - cache the original overview info instead of rebuilding it from
      the processed (decoded etc.) data, no matter if it's broken (e.g.
      contains raw 8 bit data) as we have to deal with that anyway. if there
      are no original overviews, cache the original data from the postings
      headers.
-   - when reading from local spool, overviews are always cached
+   - Add docs to explain how to create system-wide overviews
 
 o  tin uses the first sig-isolator as recent one, USEFOR says it should
-   use the last. There is no consense that tin should follow this USEFOR
+   use the last. There is no consensus that tin should follow this USEFOR
    requirement.
 
 o  iso2asc conversion is missing for 'internal' strings (e.g. 'M'enu)
@@ -222,6 +206,9 @@ o  add maildir support (besides MBOX{O,R
     <http://www.qmail.org/man/man5/mbox.html> for MBOXCL and MBOXCL2)
    [20020215 Urs Janssen <urs@tin.org>]
 
+o  add $LOCKEXT support
+   [20030611 Urs Janssen <urs@tin.org>]
+
 o  add xxencode (<http://www.ctan.org/tex-archive/tools/xxcode/xxdecode.c>),
    base224 (<http://b-news.sf.net/>), xBin <http://www.xbin.org/> and
    yenc (hide/decode-)support (see <http://nerv.cx/liyang/software/yydecode/>
@@ -683,7 +670,9 @@ o  make mm_network_charset an "option_li
    undesired (UTF-1, UTF-7, UTF-16*, UTF-32*, UCS-2, UCS-4, ...) encodings.
    add configure check for the hardcoded charsets (try iconv_open(x,
    us-ascii) on each...) and disable those not available.
-   (think about more network charsets, e.g. ISO-2022-JP-3)
+   (think about more network charsets (GB2312, Shift_JIS,
+    ISO-8859-6[-{I,E}], ISO-8859-8[-{I,E}]), ISO-8859-11, VISCII, VIQR;
+    check wether KOI8-RU is still used/valid)
    [done except configure check 20010907 urs@tin.org]
 
 Docs/online help
@@ -693,7 +682,8 @@ o  add installation guide (in html)
 o  better document keymap feature
 
 o  man page always needs work and proof reading
-   e.g. 'U', 'V' in pager need better documentation
+   e.g. 'U', 'V' in pager need better documentation, random organization
+   feature isn't documented at all
 
 o  tin.defaults could use more documentation in manpage (tin.5)
 
diff -Nurp tin-1.5.18/doc/WHATSNEW tin-1.6.0/doc/WHATSNEW
--- tin-1.5.18/doc/WHATSNEW	Mon May 12 03:05:51 2003
+++ tin-1.6.0/doc/WHATSNEW	Sat Jul 12 15:49:45 2003
@@ -1,5 +1,4 @@
-New features and changes in tin-1.5
-(Information correct as of Feb 06th 2000)
+New features and changes in tin-1.6
 
 New Features
 ------------
diff -Nurp tin-1.5.18/doc/internals.txt tin-1.6.0/doc/internals.txt
--- tin-1.5.18/doc/internals.txt	Thu May  8 23:09:35 2003
+++ tin-1.6.0/doc/internals.txt	Sat Jul 12 15:49:45 2003
@@ -4,6 +4,8 @@ I/O in tin (updated 05/01/98)
 All critical I/O, be it NNTP data or not, should be done with
 tin_fgets() This handles data formatting, removes any trailing \n and \r
 and deals with timeouts, reconnections and user aborts.
+It always returns a full line of data - all memory management is handled
+internally.
 
 It supports the use of 'q' to abort the operation and 'Q' to exit tin
 without error recovery.
@@ -11,12 +13,12 @@ without error recovery.
 tin_errno will be set to !0 to flag errors. Currently the only
 supported error is 'user aborted with q'.
 
-Closing NNTP data files should be done with TIN_FCLOSE(fp) as the NNTP
+Closing data streams should be done with TIN_FCLOSE(fp) as the NNTP
 socket should be kept open, whereas local spool fd's must be closed.
 TIN_FCLOSE() takes care of this.
 
 If you wish to quit reading a NNTP stream, then call drain_buffer(fp) to
-clear out any pending data on NNTP socket.
+clear out any pending data on the NNTP socket.
 
 nntp_command(command, valid_response, rest_of_data) should be used for
 sending all generic NNTP command. It returns a fd to the open stream
@@ -25,14 +27,20 @@ for reading the rest of the data.
 
 Example of a typical exchange:
 
-if (nntp_command ("GROUP comp.thing", OK_GROUP, NULL) != NULL) {
+if ((fp = nntp_command ("GROUP comp.thing", OK_GROUP, NULL)) != NULL) {
 
-	while ((ptr = tin_fgets(buff, sizeof(buff), nntp_rd_fd)) != NULL)
+	while ((ptr = tin_fgets(fp, FALSE)) != NULL)
 		process_data(ptr);
 
-	if (tin_errno != 0)
-		return (read_error);
+#ifdef NNTP_ABLE
+	if (ptr)
+		drain_buffer(fp);
+#endif /* NNTP_ABLE */
 
+	TIN_FCLOSE(fp);
+
+	if (tin_errno)
+		handle_abort();
 }
 
 
diff -Nurp tin-1.5.18/doc/nov_tests tin-1.6.0/doc/nov_tests
--- tin-1.5.18/doc/nov_tests	Thu Jan  1 01:00:00 1970
+++ tin-1.6.0/doc/nov_tests	Sat Jul 12 15:49:45 2003
@@ -0,0 +1,31 @@
+Regressions used to test NOV caching:
+
+All the following with OVER configured on the NNTP server (where used)
+and a system wide local .overview type file
+
+caching = OFF, read local spool        => should use system wide nov file
+                                          should not read or write private cache
+
+caching = OFF, read via NNTP           => should read via OVER only
+                                          should not read or write private cache
+
+caching = ON, read local spool         => should use system wide nov file
+                                          should not read or write private cache
+caching = ON, read via NNTP
+        private cache not present      => OVER info used to create private cache
+        private cache is present       => private cache read and used
+        partial private cache(*)       => private cache read and used, completed
+                                          using OVER and written back
+
+The following with local .overview nov files NOT present...
+caching = OFF, read local spool        => no cache read or written
+
+caching = ON, read local spool
+        private cache not present      => private cache created as best as
+                                          possible from headers
+        private cache is present       => private cache read and used
+        partial private cache          => private cache updated with missing
+                                          header info
+
+(*) partial = end missing - There is certainly no way at present for 'holes'
+    to be filled
diff -Nurp tin-1.5.18/doc/opt-case.1 tin-1.6.0/doc/opt-case.1
--- tin-1.5.18/doc/opt-case.1	Thu May  8 23:09:35 2003
+++ tin-1.6.0/doc/opt-case.1	Sat Jul 12 15:49:45 2003
@@ -93,7 +93,7 @@
 .nr % 0
 .rr F
 .\}
-.TH OPT-CASE 1 "0.2.1" "31/Aug/2001" "Optimize case insensitive regexp filters for tin"
+.TH OPT-CASE 1 "0.2.2" "June 26th, 2003" "Optimize case insensitive regexp filters"
 .UC
 .if n .hy 0
 .if n .na
diff -Nurp tin-1.5.18/doc/tin.1 tin-1.6.0/doc/tin.1
--- tin-1.5.18/doc/tin.1	Thu May 15 23:28:03 2003
+++ tin-1.6.0/doc/tin.1	Sat Jul 12 15:49:45 2003
@@ -3,12 +3,13 @@
 .\" Module    : tin.1
 .\" Author    : I. Lea, U. Janssen
 .\" Created   : 1991-08-23
-.\" Updated   : 2003-05-15
+.\" Updated   : 2003-06-29
 .\" Notes     : use american english; still needs some work, i.e.:
 .\"             - document authorization (.newsauth)
+.\"             - document random organization feature
 .\"
 .\"
-.TH tin 1 "May 15th, 2003" "1.5.18" "A Usenet newsreader"
+.TH tin 1 "June 29th, 2003" "1.6.0" "A Usenet newsreader"
 .\"
 .\"
 .SH NAME
@@ -52,7 +53,7 @@ option) via a NNTP (Network News Transpo
 automatically utilize NOV
 .BR newsoverview (5)
 style index files if available locally or via the NNTP [X]OVER command
-(\fBRFC2980\fB).
+(\fBRFC2980\fP).
 .PP
 .B tin
 has four separate levels of operation: Selection level, Group level,
@@ -138,7 +139,7 @@ started.
 Directory in which to store newsgroup index files. Default is
 \fI${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news\fR.
 This option has no effect if \fBtin\fP retrieves its index files via
-NNTP and \fBcache_overview_files \fP is turned off.
+NNTP and \fBcache_overview_files\fP is turned off.
 .TP
 .BI -l
 Get number of articles per group from the
@@ -203,7 +204,7 @@ information read section "AUTOMATIC MAIL
 Create/update index files for every group in
 \fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR or file specified by the ''\fB-f\fP''
 option. This option is disabled if \fBtin\fP retrieves its index files via a
-NNTP server and \fBcache_overview_files \fP is turned off.
+NNTP server and \fBcache_overview_files\fP is turned off.
 .TP
 .B -v
 Verbose mode for ''\fB-c\fP'', ''\fB-M\fP'', ''\fB-N\fP'', ''\fB-S\fP'',
@@ -332,7 +333,7 @@ then you will receive an error from your
 group to post to.
 .PP
 At the Group level the title contains the name of the group, the number of
-conversation threads, the threading-method, the limit of articles to get,
+conversation threads, the threading method, the limit of articles to get,
 the total number of articles, the number of hot articles, the number of
 recent articles and the number of killed articles. I.e.:
 .PP
@@ -375,10 +376,10 @@ used) looks like this:
 .PP
 .\" FIXME - make this autoscale
 .nf
-->   0      [   7]  What is this funny tree in the thr  Robert F. Simmig
-     1      [  12]  +->                                 Sephan Wagner <s
-     2      [ 230]  | `->Tin thread-level (was: What is Bob Johnson <bob
-     3      [  22]  `->tin threading menu               Brian Richardson
+->   1      [   7]  What is this funny tree in the thr  Robert F. Simmig
+     2      [  12]  +->                                 Sephan Wagner <s
+     3      [ 230]  | `->Tin thread-level (was: What is Bob Johnson <bob
+     4      [  22]  `->tin threading menu               Brian Richardson
 
 .fi
 .PP
@@ -459,7 +460,7 @@ the same effect.
 .B ShellEscape '!'
 Shell escape. \fBShellEscape\fP by itself will launch a shell,
 \fBShellEscape\fP <command> will run an external <command>. This facility
-may have been disabled by the System Administrator
+may have been disabled by the System Administrator.
 .TP
 .B ToggleColor '&'
 Toggle use of ANSI color.
@@ -517,10 +518,10 @@ Choose a range of articles to be affecte
 section "RANGES" for more information.
 .TP
 .B SelectSortActive '.'
-Sort the list of newsgroups
+Sort the list of newsgroups.
 .TP
 .B SearchRepeat '\\\\'
-Repeat the previous search
+Repeat the previous search.
 .TP
 .B SearchSubjF '/'
 Search for a group by name and description (if displayed).
@@ -765,7 +766,7 @@ Mark article/thread as read and move ont
 Open the thread under the current cursor position.
 .TP
 .B LookupMessage 'L'
-Look up article by ''Message:-ID:''.
+Look up article by ''Message-ID:''.
 .TP
 .B GroupMail 'm'
 Mail current article / thread / auto-selected (hot) articles / articles
@@ -800,7 +801,7 @@ Return to previous level.
 Quit \fBtin\fP - don't ask the user to confirm.
 .TP
 .B GroupToggleReadUnread 'r'
-Toggle the display between all articles and unread articles
+Toggle the display between all articles and unread articles.
 .TP
 .B GroupBugReport 'R'
 Mail a bug report or comment to <tin-bugs@tin.org>. This is the best way of
@@ -820,7 +821,7 @@ Toggle tag-status of current article / t
 ('\fBs\fP') / \fBGroupRepost\fP ('\fBx\fP').
 .TP
 .B GroupTagParts 'T'
-Automatically tag in order all the parts of the current multi-part message
+Automatically tag in order all the parts of the current multi-part message.
 .TP
 .B GroupToggleThreading 'u'
 Cycle the threading mode through no threading, threading by subject,
@@ -871,7 +872,7 @@ section "RANGES" for more information.
 Re-enter the last message that was viewed.
 .TP
 .B SearchRepeat '\\\\'
-Repeat the previous search
+Repeat the previous search.
 .TP
 .B SearchSubjF '/'
 Search forward for a specified subject.
@@ -936,7 +937,7 @@ Toggle inverse video.
 Mark article as read and move onto the next unread article.
 .TP
 .B LookupMessage 'L'
-Look up article by ''Message:-ID:''.
+Look up article by ''Message-ID:''.
 .TP
 .B ThreadMail 'm'
 Mail current article / thread / auto-selected (hot) articles / articles
@@ -966,7 +967,7 @@ Toggle tag status of current article for
 or reposting.
 .TP
 .B ThreadUntag 'U'
-Untag all tagged threads
+Untag all tagged threads.
 .TP
 .B Post 'w'
 Post an article to current group. If posting fails for some reason, you'll
@@ -1040,7 +1041,7 @@ scrolling up will hide it again.
 Re-enter the last message that was viewed.
 .TP
 .B SearchRepeat '\\\\'
-Repeat the previous search
+Repeat the previous search.
 .TP
 .B SearchSubjF '/'
 Forward search the text of this article.
@@ -1126,10 +1127,10 @@ Post a followup to the current article w
 article.
 .TP
 .B PageFirstPage 'g'
-Goto the start of the article
+Goto the start of the article.
 .TP
 .B PageLastPage 'G'
-Goto the end of the article
+Goto the end of the article.
 .TP
 .B ToggleInfoLastLine 'i'
 Display the subject of the current article in the last line.
@@ -1242,10 +1243,10 @@ At startup, \fBtin\fP reads in the confi
 .BR tin (5)).
 They contain a list of variables that can be used to configure the way
 \fBtin\fP works. If it exists, the global configuration file,
-\fI${TIN_LIBDIR-"/usr/lib/news"}/tinrc\fR is read. After that, the users
-own configuration file is read from \fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR.
-The global file is useful for distributing system-wide defaults to new users
-who have no private tinrc yet.
+\fI${TIN_LIBDIR-NEWSLIBDIR}/tinrc\fR is read. After that, the user's own
+configuration file is read from \fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR. The
+global file is useful for distributing system-wide defaults to new users who
+have no private tinrc yet.
 .PP
 The variables are user configurable by editing
 \fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR directly. Most of them can also be
@@ -1323,7 +1324,7 @@ Default is OFF.
 .TP
 .B Send you a blind cc automatically (auto_bcc)
 If ON automatically put your name in the ''Bcc:'' field when mailing an
-article. Default is OFF
+article. Default is OFF.
 .TP
 .B Send you a cc automatically (auto_cc)
 If ON automatically put your name in the ''Cc:'' field when mailing an
@@ -1369,10 +1370,10 @@ Standard background color
 .B Color of sender (From:) (col_from)
 Color of sender (From:)
 .TP
-.B col_head
+.B Color of article header lines (col_head)
 Color of header-lines
 .TP
-.B col_help
+.B Color of help text (col_help)
 Color of help pages
 .TP
 .B Color for inverse text (background) (col_invers_bg)
@@ -1397,10 +1398,10 @@ and \fBword_highlight\fP.
 Color of words emphasized like -this-. See also \fBword_h_display_marks\fP
 and \fBword_highlight\fP.
 .TP
-.B col_minihelp
+.B Color of mini help menu (col_minihelp)
 Color of mini help menu
 .TP
-.B col_newsheaders
+.B Color of actual news header fields (col_newsheaders)
 Color of actual news header fields
 .TP
 .B Standard foreground color (col_normal)
@@ -1428,8 +1429,8 @@ Color of article subject
 .B Color of text lines (col_text)
 Color of text-lines
 .TP
-.B col_title
-Color of title text on all the menu screens
+.B Color of help/mail sign (col_title)
+Color of help/mail sign
 .TP
 .B Which actions require confirmation (confirm_choice)
 Ask for manual confirmation to protect the user.
@@ -1453,65 +1454,85 @@ Ask for confirmation before marking all 
 .\" most of these default_* settings are not available from the menu
 .\" as they are intended for internal use only.
 .TP
-.B default_art_search
+.B (default_art_search)
 .TP
-.B default_author_search
+.B (default_author_search)
 .TP
-.B default_config_search
-The last article/author/config option that was searched for
+.B (default_config_search)
+The last article/author/config option that was searched for.
 .TP
-.B default_editor_format
+.B Invocation of your editor (default_editor_format)
 The format string used to create the editor start command with parameters.
 Default is "%E +%N %F" (i.e., /bin/vi +7 .article).
 .TP
-.B default_filter_days
+.B (default_filter_days)
 Default is 28.
 .TP
-.B default_filter_kill_case
-Defaults for quick (1 key) kill filter case.
+.B (default_filter_kill_case)
+Default for quick (1 key) kill filter case.
 ON = filter case sensitive, OFF = ignore case. Default is OFF.
 .TP
-.B default_filter_kill_expire
-Defaults for quick (1 key) kill filter expire.
+.B (default_filter_kill_expire)
+Default for quick (1 key) kill filter expire.
 ON = limit to \fBdefault_filter_days\fP, OFF = don't ever expire. Default
 is OFF.
 .TP
-.B default_filter_kill_global
-Defaults for quick (1 key) kill filter global.
-ON=apply to all groups OFF=apply to current group. Default is ON.
+.B (default_filter_kill_global)
+Default for quick (1 key) kill filter global.
+ON=apply to all groups, OFF=apply to current group. Default is ON.
 .TP
-.B default_filter_kill_header
-Defaults for quick (1 key) kill filter header.
-0,1 = ''Subject:'', 2,3 = ''From:'',
-4 = ''Message-ID:'' & full ''References:'' line,
-5 = ''Message-ID:'' & last ''References:'' entry only,
-6 = ''Message-ID:'' entry only, 7 = ''Lines:''
-.TP
-.B default_filter_select_case
-Defaults for quick (1 key) auto-selection filter case. ON=filter case
-sensitive OFF=ignore case. Default is OFF.
+.B (default_filter_kill_header)
+Default for quick (1 key) kill filter header.
+.RS +.5i
+.IP 0,1 4
+ ''Subject:''
+.IP 2,3
+ ''From:''
+.IP 4
+ ''Message-ID:'' & full ''References:'' line
+.IP 5
+ ''Message-ID:'' & last ''References:'' entry only
+.IP 6
+ ''Message-ID:'' entry only
+.IP 7
+ ''Lines:''
+.RE
+.TP
+.B (default_filter_select_case)
+Default for quick (1 key) auto-selection filter case. ON=filter case
+sensitive, OFF=ignore case. Default is OFF.
 .TP
-.B default_filter_select_expire
-Defaults for quick (1 key) auto-selection filter expire.
+.B (default_filter_select_expire)
+Default for quick (1 key) auto-selection filter expire.
 ON = limit to \fBdefault_filter_days\fP, OFF = don't ever expire.
 Default is OFF.
 .TP
-.B default_filter_select_global
-Defaults for quick (1 key) auto-selection filter global.
+.B (default_filter_select_global)
+Default for quick (1 key) auto-selection filter global.
 ON=apply to all groups OFF=apply to current group. Default is ON.
 .TP
-.B default_filter_select_header
-Defaults for quick (1 key) auto-selection filter header.
-0,1 = ''Subject:'', 2,3 = ''From:'',
-4 = ''Message-ID:'' & full ''References:'' line,
-5 = ''Message-ID:'' & last ''References:'' entry only,
-6 = ''Message-ID:'' entry only, 7 = ''Lines:''
+.B (default_filter_select_header)
+Default for quick (1 key) auto-selection filter header.
+.RS +.5i
+.IP 0,1 4
+ ''Subject:''
+.IP 2,3
+ ''From:''
+.IP 4
+ ''Message-ID:'' & full ''References:'' line
+.IP 5
+ ''Message-ID:'' & last ''References:'' entry only
+.IP 6
+ ''Message-ID:'' entry only
+.IP 7
+ ''Lines:''
+.RE
 .TP
-.B default_goto_group
+.B (default_goto_group)
 .TP
-.B default_group_search
+.B (default_group_search)
 .TP
-.B default_mail_address
+.B (default_mail_address)
 .TP
 .B Mail directory (default_maildir)
 The directory where articles/threads are to be saved in
@@ -1530,15 +1551,15 @@ different command-line parameters to be 
 "%F"' (i.e., elm -s "subject" "iain" < .article) or 'sendmail -oi -oem -t <
 %F' (i.e. sendmail -oi -oem -t < .article).
 .TP
-.B default_move_group
+.B (default_move_group)
 .TP
-.B default_pattern
+.B (default_pattern)
 .TP
-.B default_pipe_command
+.B (default_pipe_command)
 .TP
-.B default_post_newsgroups
+.B (default_post_newsgroups)
 .TP
-.B default_post_subject
+.B (default_post_subject)
 .TP
 .B Printer program with options (default_printer)
 The printer program with options that is to be used to print articles.
@@ -1547,39 +1568,39 @@ The default is
 for BSD machines and
 .BR lp (1)
 for SysV machines. Printing from \fBtin\fP may have been disabled by the
-System Administrator
+System Administrator.
 .TP
-.B default_range_group
+.B (default_range_group)
 .TP
-.B default_range_select
+.B (default_range_select)
 .TP
-.B default_range_thread
+.B (default_range_thread)
 .TP
-.B default_repost_group
+.B (default_repost_group)
 .TP
-.B default_save_file
+.B (default_save_file)
 .TP
-.B default_save_mode
+.B (default_save_mode)
 .TP
 .B Directory to save arts/threads in (default_savedir)
 Directory where articles/threads are saved. Default is
 \fI${TIN_HOMEDIR-"$HOME"}/News\fR.
 .TP
-.B default_select_pattern
+.B (default_select_pattern)
 .TP
-.B default_shell_command
+.B (default_shell_command)
 .TP
 .B Create signature from path/command (default_sigfile)
 The path that specifies the signature file to use when posting, following
 up to or replying to an article. If the path is a directory then the
 signature will be randomly generated from files that are in the specified
 directory. If the path starts with a ! the program the path points to will
-be executed to generate a signature. Tin will pass the name of the
+be executed to generate a signature. \fBtin\fP will pass the name of the
 current newsgroup as argument to the program. --none will suppress any
 signature.
 Default is \fI${TIN_HOMEDIR-"$HOME"}/.Sig\fR.
 .TP
-.B default_subject_search
+.B (default_subject_search)
 .TP
 .B Draw -> instead of highlighted bar (draw_arrow)
 Allows groups/articles to be selected by an arrow '->' if set ON or
@@ -1607,22 +1628,22 @@ Maximum length of the names of newsgroup
 the newsgroup description can be displayed. Default is 32.
 .TP
 .B Display uue data as an attachment (hide_uue)
-By default (OFF) raw uuencoded data is displayed.
-If ON, then sections of uuencoded data will be shown with a single tag line
-showing the size and filename (much the same as a MIME attachment).
-If set to ALL then any line that looks like uuencoded data will be folded
-into a tag line. This is useful when uuencoded data is split across
-more than one article but can also lead to false positives.
-This setting can also be toggled in the article viewer.
+If set to 'No' then raw uuencoded data is displayed. If set to 'Yes' then
+sections of uuencoded data will be shown with a single tag line showing the
+size and filename (much the same as a MIME attachment). If set to 'Hide all'
+then any line that looks like uuencoded data will be folded into a tag line.
+This is useful when uuencoded data is split across more than one article but
+can also lead to false positives. This setting can also be toggled in the
+article viewer. Default is 'No'.
 .TP
 .B External inews (inews_prog)
 Path, name and options of external
-.BR inews (1)
-If you are reading via NNTP the default value is --internal (use built in
+.BR inews (1).
+If you are reading via NNTP the default value is --internal (use built-in
 NNTP inews), else it is "inews -h". The article is passed to
 \fBinews_prog\fP on STDIN via '< article'.
 .TP
-.B info_in_last_line
+.B (info_in_last_line)
 .\" this is missing from the Menu
 If ON, show current group description or article subject in the last line
 (not in the pager and global menu) - \fBToggleInfoLastLine\fP ('\fBi\fP')
@@ -1641,18 +1662,27 @@ If ON keep all failed postings in \fI${T
 besides keeping the last failed posting in
 \fI${TIN_HOMEDIR-"$HOME"}/dead.article\fR. Default is ON.
 .TP
-.B Handling of killed articles (kill_level)
-This option controls the processing and display of articles that are
-killed. There are 3 options: 0 (default) is the 'traditional'
-behavior of \fBtin\fP. Only unread articles are killed once only by
-marking them read. As filtering only happens on unread articles with
-\fBkill_level\fP set to 0, \fBart_marked_killed\fP and
-\fBart_marked_read_selected\fP are only shown once. When you reenter
-the group the mark will be gone. Options 1 and 2 will process all
-articles in the group and therefore there is a processing overhead
-when using them. Option 1 will thread killed articles as normal but
-they will be marked with \fBart_marked_killed\fP. Option 2 simply
-does not display killed articles at all.
+.B Filter which articles (kill_level)
+This option controls the processing and display of articles that are killed.
+There are 3 options:
+.RS +.5i
+.IP 0 3
+\fBKill only unread arts\fP is the 'traditional' behavior of \fBtin\fP. Only
+unread articles are killed once only by marking them read.  As filtering
+only happens on unread articles with \fBkill_level\fP set to 0,
+\fBart_marked_killed\fP and \fBart_marked_read_selected\fP are only shown
+once. When you reenter the group the mark will be gone.
+.IP 1
+\fBKill all arts & show with K\fP will process all articles in the group and
+therefore there is a processing overhead when using this option. Killed
+articles are threaded as normal but they will be marked with
+\fBart_marked_killed\fP.
+.IP 2
+\fBKill all arts and never show\fP will process all articles in the group
+and therefore there is a processing overhead when using this option. Killed
+articles simply does not get displayed at all.
+.RE
+Default is 0 (\fBKill only unread arts\fP).
 .TP
 .B Use 8bit characters in mail headers (mail_8bit_header)
 Allows 8bit characters unencoded in the header of mail message. Default is
@@ -1702,7 +1732,7 @@ See also \fBask_for_metamail\fP.
 .B MM_CHARSET (mm_charset)
 Charset supported locally, which is also used for MIME header
 (charset parameter and charset name in header encoding) in mail and
-news posting. If \fBMIME_STRICT_CHARSET\fP is defined at the compile
+news postings. If \fBMIME_STRICT_CHARSET\fP is defined at compile
 time, text in charset other than the value of this parameter is
 considered not displayable and represented as '?'. Otherwise, all
 character sets are regarded as compatible with the display. If it's
@@ -1729,30 +1759,30 @@ EUC-{CN,JP,KR,TW}, ISO-2022-{CN,CN-EXT,J
 Not all values might work on your system, see
 .BR iconv_open (3)
 for more details. If it's not set, the value of the environment variable
-\fB$MM_CHARSET\fP is used. US-ASCII or compile-time default is used in case
+$\fBMM_CHARSET\fP is used. US-ASCII or compile-time default is used in case
 neither of them is defined.
 .TP
 .B Attribute of highlighting with _dash_ (mono_markdash)
-Character attribute of words emphasized like _this_. It does depend on your
+Character attribute of words emphasized like _this_. It depends on your
 terminal which attributes are usable. See also \fBword_h_display_marks\fP
 and \fBword_highlight\fP.
 .TP
 .B Attribute of highlighting with /slash/ (mono_markslash)
-Character attribute of words emphasized like /this/. It does depend on your
+Character attribute of words emphasized like /this/. It depends on your
 terminal which attributes are usable. See also \fBword_h_display_marks\fP
 and \fBword_highlight\fP.
 .TP
 .B Attribute of highlighting with *stars* (mono_markstar)
-Character attribute of words emphasized like *this*. It does depend on your
+Character attribute of words emphasized like *this*. It depends on your
 terminal which attributes are usable. See also \fBword_h_display_marks\fP
 and \fBword_highlight\fP.
 .TP
 .B Attribute of highlighting with -stroke- (mono_markstroke)
-Character attribute of words emphasized like -this-. It does depend on your
+Character attribute of words emphasized like -this-. It depends on your
 terminal which attributes are usable. See also \fBword_h_display_marks\fP
 and \fBword_highlight\fP.
 .TP
-.B newnews
+.B (newnews)
 These are internal timers used by \fBtin\fP to keep track of new newsgroups.
 Do not change them unless you understand what they are for.
 .TP
@@ -1769,13 +1799,13 @@ example of using both options might be i
 Thing(tm), but thought Alan and Pape were miscreants... well then you would
 do something like this:
 \fInews_headers_to_display=X-\fR
-\fInews_headers_to_not_display=X-Alan X-Pape\fR
+\fInews_headers_to_not_display=X-Alan X-Pape\fR.
 Not defining anything turns off this option.
 .TP
 .B Quote line when following up (news_quote_format)
 Format of quote line when posting/following up an article (%A=Address,
 %D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname,
-%C=Firstname, %I=Initials). Default is "%F wrote:"
+%C=Firstname, %I=Initials). Default is "%F wrote:".
 .TP
 .B PgDn goes to next unread article (pgdn_goto_next)
 If ON the Page Down keys will go to the next unread article when pressed
@@ -1786,7 +1816,7 @@ If ON put cursor at first unread article
 article. Default is ON.
 .TP
 .B Use 8bit characters in news headers (post_8bit_header)
-Allows 8bit characters unencoded in the header of news article.
+Allows 8bit characters unencoded in the header of a news article.
 Default is OFF. Only enacted if \fBpost_mime_encoding\fP is also set
 to 8bit. In a number of local hierarchies where 8bit characters are
 used, using unencoded (raw) 8bit characters in header is acceptable
@@ -1833,7 +1863,7 @@ If ON only save/print/pipe/mail unread a
 Default is OFF.
 .TP
 .B Show empty Followup-To in editor (prompt_followupto)
-If ON show empty Followup-To header when editing an article. Default is OFF.
+If ON show empty ''Followup-To:'' header when editing an article. Default is OFF.
 .TP
 .B Characters used as quote-marks (quote_chars)
 The character used in quoting included text to article followups and mail
@@ -1853,17 +1883,17 @@ reply to it, the signature will be quote
 .B Regex used to show quoted lines (quote_regex)
 A regular expression that will be applied when reading articles. All
 matching lines are shown in \fBcol_quote\fP. If \fBquote_regex\fP is
-blank, then \fBtin\fP uses a built in default.
+blank, then \fBtin\fP uses a built-in default.
 .TP
 .B Regex used to show twice quoted l. (quote_regex2)
 A regular expression that will be applied when reading articles. All
 matching lines are shown in \fBcol_quote2\fP. If \fBquote_regex2\fP is
-blank, then \fBtin\fP uses a built in default.
+blank, then \fBtin\fP uses a built-in default.
 .TP
 .B Regex used to show >= 3 times q.l. (quote_regex3)
 A regular expression that will be applied when reading articles. All
 matching lines are shown in \fBcol_quote3\fP. If \fBquote_regex3\fP is
-blank, then \fBtin\fP uses a built in default.
+blank, then \fBtin\fP uses a built-in default.
 .TP
 .B Interval in seconds to reread active (reread_active_file_secs)
 The news \fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file is
@@ -1943,7 +1973,7 @@ If ON show only new/unread articles othe
 Default is ON.
 .TP
 .B Show only groups with unread arts (show_only_unread_groups)
-If ON show only subscribed to groups that contain unread articles. Default
+If ON show only subscribed groups that contain unread articles. Default
 is OFF.
 .TP
 .B Display signatures (show_signatures)
@@ -1959,7 +1989,7 @@ If ON add signature to reposted articles
 .B Regex used to highlight /slashes/ (slashes_regex)
 A regular expression that will be applied when reading articles. All
 matching words are shown in \fBcol_markslash\fP or \fBmono_markslash\fP. If
-\fBslashes_regex\fP is blank, then \fBtin\fP uses a built in default.
+\fBslashes_regex\fP is blank, then \fBtin\fP uses a built-in default.
 .TP
 .B Sort articles by (sort_article_type)
 This specifies how articles should be sorted. Sort by ascending Date (6) is
@@ -2020,7 +2050,7 @@ Default is OFF.
 .B Regex used to highlight *stars* (stars_regex)
 A regular expression that will be applied when reading articles. All
 matching words are shown in \fBcol_markstar\fP or \fBmono_markstar\fP. If
-\fBstars_regex\fP is blank, then \fBtin\fP uses a built in default.
+\fBstars_regex\fP is blank, then \fBtin\fP uses a built-in default.
 .TP
 .B Start editor with line offset (start_editor_offset)
 Set ON if the editor used for posting, follow-ups and bug reports has the
@@ -2049,7 +2079,7 @@ If ON, then unsubscribed groups will be 
 .B Regex used to highlight -strokes- (strokes_regex)
 A regular expression that will be applied when reading articles. All
 matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP.
-If \fBstrokes_regex\fP is blank, then \fBtin\fP uses a built in default.
+If \fBstrokes_regex\fP is blank, then \fBtin\fP uses a built-in default.
 .TP
 .B Tab goes to next unread article (tab_goto_next_unread)
 If enabled pressing \fBPageNextUnread\fP ('\fB<TAB>\fP') at the Article
@@ -2061,7 +2091,7 @@ If enabled a search for the next unread 
 articles to find also previous unread articles. If disabled the search
 stops at the end of the thread list. Default is ON.
 .TP
-.B Display "a as Umlaut-a (tex2iso_conv)
+.B Display \&"a as Umlaut-a (tex2iso_conv)
 If ON, show "a as Umlaut-a, etc. Default is OFF. This behavior can also be
 toggled in the article viewer via \fBPageToggleTex2iso\fP ('\fB"\fP').
 .TP
@@ -2113,7 +2143,7 @@ doesn't exist, this option is disabled. 
 .B Regex used to highlight _underline_ (underscores_regex)
 A regular expression that will be applied when reading articles. All
 matching words are shown in \fBcol_markdash\fP or \fBmono_markdash\fP. If
-\fBunderscores_regex\fP is blank, then \fBtin\fP uses a built in default.
+\fBunderscores_regex\fP is blank, then \fBtin\fP uses a built-in default.
 .TP
 .B Remove ~/.article after posting (unlink_article)
 If ON remove \fI~/.article\fR after posting. Default is ON.
@@ -2202,16 +2232,19 @@ set.
 .\"
 .\"
 .SS "GROUP ATTRIBUTES"
-\fBtin\fP allows certain attributes to be set on a per group basis. These
-group attributes are read from the file
-\fI${TIN_HOMEDIR-"$HOME"}/.tin/attributes\fR
-A later version will provide a menu interface to set all the attributes.
-At present you will have to edit the file with your editor.
+\fBtin\fP allows certain attributes to be set on a per group basis. If it
+exists, the global attributes file,
+\fI${TIN_LIBDIR-NEWSLIBDIR}/attributes\fR is read. After that, the user's
+own attributes file \fI${TIN_HOMEDIR-"$HOME"}/.tin/attributes\fR is read.
+The global attributes file is useful for distributing system-wide defaults
+to new users who have no private attributes file yet. A later version will
+provide a menu interface to set all the attributes. At present you will have
+to edit the file with your editor.
 .PP
 Note that the \fIscope=<grouplist>\fR line has to be specified before the
 attributes are specified for that list. All attributes are set to a
 reasonable default so you only have to specify the attribute that you want
-to change (i.e., savedir). All toggle attributes are set by specifying
+to change (e.g., savedir). All toggle attributes are set by specifying
 ON/OFF. Otherwise, these function exactly the same as their global
 equivalents. For more details see
 .BR tin (5).
@@ -2238,7 +2271,7 @@ auto-selection rule are marked with a ''
 .PP
 Filtering rules can be manually entered into
 \fI${TIN_HOMEDIR-"$HOME"}/.tin/filter\fR (but don't do this whilst running
-\fBtin\fP else you will lose your changes) or by using an on screen menu
+\fBtin\fP else you will lose your changes) or by using an on-screen menu
 within \fBtin\fP.
 .PP
 The filtering capabilities of \fBtin\fP have been significantly enhanced
@@ -2249,7 +2282,7 @@ documentation directory.
 .\" This file can also be read online at http://www.tin.org/FIXME
 .PP
 .\" FIXME - Next paragraph is out of date
-The on screen filtering menu is accessed by pressing '\fB^K\fP' at the Group
+The on-screen filtering menu is accessed by pressing '\fB^K\fP' at the Group
 and Article levels. It allows the user to kill or select an article that
 matches the current ''Subject:'' line, ''From:'' line or a string entered by
 the user. The user entered string can be applied to the ''Subject:'' or
@@ -2366,7 +2399,7 @@ Tagged articles must have already been t
 command. All tagged articles can be untagged by a \fB*Untag\fP ('\fBU\fP')
 untag command.
 .PP
-If a regex pattern is selected you are asked to enter a pattern (i.e., to
+If a regex pattern is selected you are asked to enter a pattern (e.g., to
 match all articles subject lines containing 'net News' you enter "net
 News"). Any articles that match the entered expression will be mailed, piped
 etc. See also the \fBwildcard\fP tinrc variable for advanced pattern
@@ -2375,7 +2408,7 @@ matching options.
 Various expansion characters are recognized when entering the directory
 and file to save to. Environment variables (prefixed with '$') and user home
 directories (prefixed by '~' or '~username') can be specified.
-Environment variables can themselves contain other special characters
+Environment variables can themselves contain other special characters.
 .PP
 To save articles to a mailbox enter '=<mailbox name>' when asked for the
 save filename. If you enter just '=' then articles will be saved to a
@@ -2506,12 +2539,9 @@ The following newsgroups provide useful 
 .ti -\w'\(em'u
 \(emnews.answers (Frequently Asked Questions (FAQ) about many different themes)
 .PP
-Many prompts (i.e., 'Mark everything as read? (y/n): y') within \fBtin\fP
-offer a default choice that the cursor is positioned on. By pressing
-\&'\fB<CR>\fP' the default value is taken.
-.PP
-Many prompts (i.e., 'Post subject []>') within \fBtin\fP can be aborted by
-pressing '\fB<ESC>\fP'.
+Many prompts within \fBtin\fP offer a default choice that the cursor is
+positioned on. By pressing '\fB<CR>\fP' the default value is taken.
+Most prompts can be aborted by pressing '\fB<ESC>\fP'.
 .PP
 When \fBtin\fP is run in an
 .BR xterm (1x)
@@ -2522,9 +2552,9 @@ is resized.
 .PP
 \fBtin\fP will reread the
 \fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file at set
-intervals to show any newly arrived news.
+intervals (\fBreread_active_file_secs\fP) to show any newly arrived news.
 .PP
-If you find large number of New newsgroups cluttering up your screen,
+If you find large number of new newsgroups cluttering up your screen,
 pressing \fBSelectToggleReadDisplay\fP ('\fBr\fP') will make them go away.
 .\"
 .\"
@@ -2594,20 +2624,37 @@ but after one click of any button.
 .\"
 .\"
 .SS "INDEX FILES"
-If your news server supports NOV index files
-.BR newsoverview (5)
-(most modern installations will), then this section can be ignored.
+If your news server supports NOV index files (see
+.BR newsoverview (5),
+most modern installations will) and you have a fast connection to
+your news server then this section can be ignored.
+.PP
+If your news server doesn't support NOV index files or you have a
+very slow connection to your news server then \fBtin\fP can cache the
+index for each newsgroup if \fBcache_overview_files\fP is set to ON.
+Note that this cache can use up large amounts of diskspace if you
+read a lot of groups and/or high traffic groups.
+.PP
+Each user creates/updates his/her own index files that are stored in
+\fI${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news/\fR. If
+you are reading via NNTP then the news server name will be appended
+to keep the indexes for different servers separate. If you are
+reading off the local spool and local overview files already exist
+then turning on caching will have no effect. Likewise unless you see
+significant delays entering a group when reading via NNTP then
+turning on caching will have little or no effect.
+.PP
+Entering a group the first time tends to be slow because the index
+file must be built from scratch. To alleviate the slowness start
+\fBtin\fP to create all index files for the groups you subscribe to
+with \fBtin -u -v\fP and go for a coffee. Subsequent readings of a
+group will only need to do incremental updating of the index file and
+will be much faster as only new articles will need to be cached.
 .PP
-If your news server doesn't support NOV index files, \fBtin\fP will maintain
-an index for each newsgroup. Each user creates/updates his/her own index
-files that are stored in
-\fI${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news\fR. A good way
-to keep index files updated is by doing a \fBtin -U\fP that will update
-index files in the background while you are reading news in the foreground.
-You can also update index files via the system batcher
+As indexing might take some time you may want to run \fBtin\fP form
+the system batcher
 .BR cron (1)
-with the
-\&''\fB-u\fP'' option:
+with the ''\fB-u\fP'' option:
 .PP
 .RS
 .nf
@@ -2617,14 +2664,19 @@ with the
 .fi
 .RE
 .PP
-Entering a group the first time tends to be slow because the index file must
-be built from scratch. To alleviate the slowness start \fBtin\fP to create
-all index files for the groups you subscribe to with \fBtin -u -v\fP and go
-for a coffee. Subsequent readings of a group will cause incremental updating
-of the index file.
+If you are low on local disk space you should consider using
+\fBgetart_limit\fP to limit the size of cached indexes and also
+manually purge cached data for groups you are not reading anymore
+with something like:
 .PP
-If reading news remotely and updating index files locally, operation will be
-somewhat slower because the articles must be retrieved from the NNTP server.
+.RS
+.nf
+.ft CW
+find ${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news* \\
+-type f -name "[0-9]*.[0-9]" -atime +28 | xargs rm -f
+.ft P
+.fi
+.RE
 .\"
 .\"
 .SH FILES
@@ -2665,7 +2717,7 @@ For a detailed description see
 .IR ${TIN_HOMEDIR-"$HOME"}/.newsrc
 .PP
 
-.IR ${TIN_HOMEDIR-"$HOME"}/.oldnewsrc
+.IR ${TIN_HOMEDIR-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/.oldnewsrc
 .PP
 
 .IR ${TIN_HOMEDIR-"$HOME"}/.signature
@@ -2694,7 +2746,7 @@ For a detailed description see
 .IR ${TIN_HOMEDIR-"$HOME"}/.tin/active.save
 .PP
 
-.\" .IR ${TIN_LIBDIR-"/news/etc"}/attributes
+.\" .IR ${TIN_LIBDIR-NEWSLIBDIR}/attributes
 .IR /etc/tin/attributes
 .br
 .IR ${TIN_HOMEDIR-"$HOME"}/.tin/attributes
@@ -2723,7 +2775,10 @@ For a detailed description see
 .IR ${TIN_HOMEDIR-"$HOME"}/.tin/postponed.articles
 .PP
 
-.\" .IR ${TIN_LIBDIR-"/news/etc"}/tinrc
+.IR ${TIN_HOMEDIR-"$HOME"}/.tin/$NNTPSERVER:${NNTPPORT+":$NNTPPORT"}/serverrc
+.PP
+
+.\" .IR ${TIN_LIBDIR-NEWSLIBDIR}/tinrc
 .IR /etc/tin/tinrc
 .br
 .IR ${TIN_HOMEDIR-"$HOME"}/.tin/tinrc
@@ -2735,22 +2790,22 @@ For a detailed description see
 .IR /usr/local/share/locale/${LC_MESSAGES}/LC_MESSAGES/tin.mo
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}"/"${TIN_ACTIVEFILE-active}
+.IR ${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/active.times
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/active.times
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/newsgroups
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/newsgroups
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/organization
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/organization
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/overview.fmt
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/overview.fmt
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/subscriptions
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/subscriptions
 .PP
 .\"
 .\"
@@ -2788,47 +2843,48 @@ environment.
 .TP
 .B TIN_HOMEDIR
 Define this variable if you do not want the \fI.tin\fR directory in
-\fI$HOME/\fR. (i.e., if you want all \fBtin\fP's private files in
+\fI$HOME/\fR. E.g., if you want all \fBtin\fP's private files in
 \fI/tmp/.tin\fR you would set $\fBTIN_HOMEDIR\fP to \fI/tmp\fR.
 .TP
 .B TIN_INDEX_NEWSDIR
 Define this variable if you do not want the \fI.news\fR directory in
-\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. (i.e., if you want all \fBtin\fP's
+\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's
 news index files in \fI/tmp/.news\fR you would set $\fBTIN_INDEX_NEWSDIR\fP
 to \fI/tmp\fR.
 .TP
 .B TIN_INDEX_MAILDIR
 Define this variable if you do not want the \fI.mail\fR directory in
-\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. (i.e., if you want all \fBtin\fP's
+\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's
 mail index files in \fI/tmp/.mail\fR you would set $\fBTIN_INDEX_MAILDIR\fP
 to \fI/tmp\fR.
 .TP
 .B TIN_INDEX_SAVEDIR
 Define this variable if you do not want the \fI.save\fR directory in
-\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. (i.e., if you want all \fBtin\fP's
+\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's
 save index files in \fI/tmp/.save\fR you would set $\fBTIN_INDEX_SAVEDIR\fP
 to \fI/tmp\fR.
 .TP
 .B TIN_LIBDIR
-Define this variable if you want to override the \fBNEWSLIBDIR\fP path that
-was compiled into the \fBtin\fP binary via the Makefile. If tin is running
-in NNTP mode setting this variable has no effect.
+Define this variable if you want to override the \fBNEWSLIBDIR\fP path
+that was compiled into the \fBtin\fP binary, default is \fI/usr/lib/news\fR.
+If tin is running in NNTP mode setting this variable has no effect.
 .TP
 .B TIN_SPOOLDIR
 Define this variable if you want to override the \fBSPOOLDIR\fP path that
-was compiled into the \fBtin\fP binary via the Makefile. If tin is running
-in NNTP mode setting this variable has no effect.
+was compiled into the \fBtin\fP binary, default is \fI/var/spool/news\fR.
+If tin is running in NNTP mode setting this variable has no effect.
 .TP
 .B TIN_NOVROOTDIR
 Define this variable if you want to override the \fBNOVROOTDIR\fP path that
-was compiled into the \fBtin\fP binary via the Makefile. If tin is running
-in NNTP mode setting this variable has no effect.
+was compiled into the \fBtin\fP binary, default is \fBSPOOLDIR\fP
+(see above). If tin is running in NNTP mode setting this variable has no
+effect.
 .TP
 .B TIN_ACTIVEFILE
 Define this variable if you want to override the \fBNEWSLIBDIR/active\fP
-path that was compiled into the \fBtin\fP binary via the Makefile. If tin is
-running in NNTP mode setting this variable has no effect. If
-$\fBTIN_LIBDIR\fP is set it prepended to $\fBTIN_ACTIVEFILE\fP.
+path that was compiled into the \fBtin\fP binary. If tin is running in NNTP
+mode setting this variable has no effect. If $\fBTIN_LIBDIR\fP is set it
+is prepended to $\fBTIN_ACTIVEFILE\fP.
 .TP
 .B NNTPSERVER
 The default NNTP server to remotely read news from. This variable only
@@ -2847,7 +2903,7 @@ variable instead of the system default.
 .TP
 .B ISO2ASC
 Set the ISO to ASCII charset decoding table character to use in decoding
-an articles text. Values can range from 0 to 6.
+an article text. Values can range from 0 to 6.
 .TP
 .B ORGANIZATION
 Set the article header field ''Organization:'' to the contents of the
@@ -2892,7 +2948,7 @@ Full path to the users mailbox.
 .B VISUAL
 This variable has precedence over the default editor (i.e.,
 .BR vi (1))
-that is used in all editing operations within \fBtin\fP (i.e., posting,
+that is used in all editing operations within \fBtin\fP (e.g., posting,
 replying, follow-ups, ...). Evaluation order is
 \fI${VISUAL-"${EDITOR-vi}"}\fR. See
 .BR environ (5)
@@ -2942,27 +2998,27 @@ files. See also
 .B METAMAIL
 Set this variable to point to
 .BR metamail (1)
-or a replacement (i.e. metamutt). This can be used to override the value of
+or a replacement (e.g. metamutt). This can be used to override the value of
 \fBmetamail_prog\fP.
 .TP
 .B NOMETAMAIL
 Set this variable to disable the use of
 .BR metamail (1)
-or a replacement (i.e. metamutt).
+or a replacement (e.g. metamutt).
 .TP
 .B MM_CHARSET
 .TP
 .B ISPELL
 Set this variable to point to
 .BR ispell (1)
-or a replacement and it's cmd-line options.
+or a replacement and its cmd-line options.
 .TP
 .B PGPOPTS
 Define any additional options that you wish to pass to your
 .BR pgp (1)
 or
 .BR gpg (1)
-program
+program.
 .TP
 .B PGPPATH
 Override the name of the
@@ -2984,7 +3040,7 @@ unsets \fB$LC_CTYPE\fP right before any 
 It's value should be of the form
 \fIlanguage\fR[\fI_territory\fR][\fI.codeset\fR][\fI@modifier\fR]. See
 .BR environ (5)
-for more infos.
+for more information.
 .\" TODO: document LC_CTYPEs influence on
 .\"       ~/.tin/keymap.*, 8bit char display, ...
 .TP
@@ -2995,7 +3051,7 @@ It's value should be of the form
 .BR locale (5)
 and
 .BR environ (5)
-for more infos.
+for more information.
 .TP
 .B LC_ALL
 This variable overrides the value of the \fB$LANG\fP variable and any
@@ -3004,7 +3060,7 @@ other \fB$LC_\fP variable. It's value sh
 .BR locale (5)
 and
 .BR environ (5)
-for more infos.
+for more information.
 .TP
 .B LANG
 This variable determines the
@@ -3013,7 +3069,7 @@ category for any category not specifical
 starting with \fB$LC_\fP. It's value should be of the form
 \fIlanguage\fR[\fI_territory\fR][\fI.codeset\fR]. See
 .BR environ (5)
-for more infos.
+for more information.
 .TP
 .B COLUMNS
 A decimal integer > 0 used to indicate the user's preferred width in column
@@ -3039,7 +3095,7 @@ not set \fB$LINES\fP unless they wish to
 The type of terminal in use. This is used when looking up termcap sequences.
 See
 .BR environ (5)
-for more infos.
+for more information.
 .\"
 .\"
 .\" .SH DIAGNOSTICS
@@ -3086,7 +3142,7 @@ March 1991; its first version was releas
 itself was heavily influenced by notesfiles a public domain UNIX version of
 PLATO Notes, developed at the University of Illinois by Ray Essick and Rob
 Kolstad in 1982. For a version overview see
-<HTTP://www.tin.org/history.html>
+<http://www.tin.org/history.html>
 .\"
 .\"
 .SH CREDITS
diff -Nurp tin-1.5.18/doc/tin.5 tin-1.6.0/doc/tin.5
--- tin-1.5.18/doc/tin.5	Thu May 15 23:32:58 2003
+++ tin-1.6.0/doc/tin.5	Sat Jul 12 15:49:45 2003
@@ -2,10 +2,10 @@
 .\" Module    : tin.5
 .\" Author    : U. Janssen
 .\" Created   : 2000-07-10
-.\" Updated   : 2003-05-15
+.\" Updated   : 2003-06-29
 .\" Notes     : needs a some work
 .\"
-.TH tin 5 "May 15th, 2003" "1.5.18" "A Usenet newsreader"
+.TH tin 5 "June 29th, 2003" "1.6.0" "A Usenet newsreader"
 
 .SH NAME
 tin, rtin \- related files
@@ -211,7 +211,7 @@ needsterminal
 .sp
 .RS
 default NNTP-server to read news from if not reading from the local spool.
-\&'\fB-g\fP \fIserver\fR', \fB$NNTPSERVER\fP and a given default at compile
+\&'\fB-g\fP \fIserver\fR', $\fBNNTPSERVER\fP and a given default at compile
 time have higher priority (in that order) and override any server
 specified \fI/etc/nntpserver\fR.
 .RE
@@ -292,7 +292,7 @@ news.software.readers: 1-19567,19571-195
 .RE
 .PP
 
-.IR ${TIN_HOMEDIR-"$HOME"}/.oldnewsrc
+.IR ${TIN_HOMEDIR-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/.oldnewsrc
 .sp
 .RS
 backup of \fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR
@@ -387,7 +387,7 @@ active file of user's saved newsgroups, 
 .\" tin uses inns old (pre 2.x) Path convention.
 .\" as with inn >= 2.2.x getting more and more popular
 .\" we should think about checking for the new Paths (/news/etc/)
-.\" ${TIN_LIBDIR-"/news/etc"}/attributes
+.\" ${TIN_LIBDIR-/news/etc"}/attributes
 .IR /etc/tin/attributes
 .br
 .IR ${TIN_HOMEDIR-"$HOME"}/.tin/attributes
@@ -455,7 +455,7 @@ Identical to the tinrc variable of the s
 .B organization
 This can be used to set the article header field ''Organization:''. It
 overrides the setting (if any) of organization in
-\fI/etc/tin/tin.defaults\fR and \fB$ORGANIZATION\fP (or \fB$NEWSORG\fP on
+\fI/etc/tin/tin.defaults\fR and $\fBORGANIZATION\fP (or $\fBNEWSORG\fP on
 Apollo DomainOS). Note that some newsserver might still overwrite the
 \&''Organization:''-header.
 .TP
@@ -992,6 +992,24 @@ format.
 .RE
 .PP
 
+.IR ${TIN_HOMEDIR-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/serverrc
+.sp
+.RS
+File to store $\fBNNTPSERVER\fP and $\fBNNTPPORT\fP related
+data via a list of "\fIvariable\fR=\fIvalue\fR" pairs. Currently
+there are only two variables, both are not meant to be changed by the
+user.
+.TP
+.B version
+Internal version number.
+.TP
+.B last_newnews
+Internal timestamp used by
+.BR tin (1)
+to keep track of new newsgroups on the server.
+.RE
+.PP
+
 .\" tin uses inns old (pre 2.x) Path convention.
 .\" as with inn >= 2.2.x getting more and more popular
 .\" we should think about checking for the new Paths (/news/etc/)
@@ -1007,7 +1025,7 @@ reads in the configuration file. This co
 "\fIvariable\fR=\fIvalue\fR" pairs that can be used to configure the way
 .BR tin (1)
 works. If it exists, the global configuration file,
-\fI${TIN_LIBDIR}-"/news/etc"}/tinrc\fR is read first. After that, the
+\fI${TIN_LIBDIR}-NEWSLIBDIR}/tinrc\fR is read first. After that, the
 users own configuration file \fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR is read.
 The global file is useful for distributing system-wide defaults to new
 users who have no private tinrc yet (see also \fB/etc/tin/tin.defaults\fP).
@@ -1168,14 +1186,15 @@ Color of article subject
 Color of text-lines
 .TP
 .B col_title
-Color of title text on all the menu screens
+Color of help/main sign
 .TP
 .B confirm_choice
-Tin can ask for manual confirmation to protect the user. Available choices:
+.BR tin (1)
+can ask for manual confirmation to protect the user. Available choices:
 .in +.5i
 .B commands:
 Ask for confirmation before executing certain dangerous commands (e.g.,
-\fBSelectCatchupfP ('\fBc\fP')). Commands that this affects are marked in
+\fBSelectCatchup\fP ('\fBc\fP')). Commands that this affects are marked in
 this manual with '[after confirmation]'.
 .\" TODO: check if all affected commands are marked [after confirmation]
 .sp
@@ -1186,7 +1205,7 @@ when you use the \fBQuit\fP ('\fBq\fP') 
 .sp
 .B select:
 Ask for confirmation before marking all not selected (with
-\fBGroupMarkUnselArtRead\fB ('\fBX\fP') command) articles as read.
+\fBGroupMarkUnselArtRead\fP ('\fBX\fP') command) articles as read.
 .in -.5i
 Default is commands & quit.
 .TP
@@ -1195,51 +1214,73 @@ Default is commands & quit.
 .B default_author_search
 .TP
 .B default_config_search
-The last article/author/config option that was searched for
+The last article/author/config option that was searched for.
 .TP
 .B default_editor_format
 The format string used to create the editor start command with parameters.
-Default is '%E +%N %F' (i.e., /bin/vi +7 .article).
+Default is '%E +%N %F' (e.g., /bin/vi +7 .article).
 .\" TODO: document %E, %F, %N
 .TP
 .B default_filter_days
 Default is 28.
 .TP
 .B default_filter_kill_case
-Defaults for quick (1 key) kill filter case. ON = filter case sensitive, OFF
+Default for quick (1 key) kill filter case. ON = filter case sensitive, OFF
 = ignore case. Default is OFF.
 .TP
 .B default_filter_kill_expire
-Defaults for quick (1 key) kill filter expire. ON = limit
+Default for quick (1 key) kill filter expire. ON = limit
 to '\fBdefault_filter_days\fP', OFF = don't ever expire. Default is OFF.
 .TP
 .B default_filter_kill_global
-Defaults for quick (1 key) kill filter global. ON=apply to all groups
+Default for quick (1 key) kill filter global. ON=apply to all groups,
 OFF=apply to current group. Default is ON.
 .TP
 .B default_filter_kill_header
-Defaults for quick (1 key) kill filter header.
-0,1 = ''Subject:'', 2,3 = ''From:'', 4 = ''Message-ID:'' & full ''References:''
-5 = ''Message-ID:'' & last ''References:'' entry only,
-6 = ''Message-ID:'' entry only, 7 = ''Lines:''
+Default for quick (1 key) kill filter header.
+.RS +.5i
+.IP 0,1 4
+ ''Subject:''
+.IP 2,3
+ ''From:''
+.IP 4
+ ''Message-ID:'' & full ''References:'' line
+.IP 5
+ ''Message-ID:'' & last ''References:'' entry only
+.IP 6
+ ''Message-ID:'' entry only
+.IP 7
+ ''Lines:''
+.RE
 .TP
 .B default_filter_select_case
-Defaults for quick (1 key) auto-selection filter case. ON=filter case
-sensitive OFF=ignore case. Default is OFF.
+Default for quick (1 key) auto-selection filter case. ON=filter case
+sensitive, OFF=ignore case. Default is OFF.
 .TP
 .B default_filter_select_expire
-Defaults for quick (1 key) auto-selection filter expire. ON = limit
+Default for quick (1 key) auto-selection filter expire. ON = limit
 to '\fBdefault_filter_days\fP', OFF = don't ever expire. Default is OFF.
 .TP
 .B default_filter_select_global
-Defaults for quick (1 key) auto-selection filter global. ON=apply to all
-groups OFF=apply to current group. Default is ON.
+Default for quick (1 key) auto-selection filter global. ON=apply to all
+groups, OFF=apply to current group. Default is ON.
 .TP
 .B default_filter_select_header
-Defaults for quick (1 key) auto-selection filter header.
-0,1 = ''Subject:'', 2,3 = ''From:'', 4 = ''Message-ID:'' & full ''References:''
-5 = ''Message-ID:'' & last ''References:'' entry only,
-6 = ''Message-ID:'' entry only, 7 = ''Lines:''
+Default for quick (1 key) auto-selection filter header.
+.RS +.5i
+.IP 0,1 4
+ ''Subject:''
+.IP 2,3
+ ''From:''
+.IP 4
+ ''Message-ID:'' & full ''References:'' line
+.IP 5
+ ''Message-ID:'' & last ''References:'' entry only
+.IP 6
+ ''Message-ID:'' entry only
+.IP 7
+ ''Lines:''
+.RE
 .TP
 .B default_goto_group
 .TP
@@ -1310,9 +1351,10 @@ The path that specifies the signature fi
 up to or replying to an article. If the path is a directory then the
 signature will be randomly generated from files that are in the specified
 directory. If the path starts with a ! the program the path points to will
-be executed to generate a signature. Tin will pass the name of the
-current newsgroup as argument to the program. --none will suppress any
-signature.
+be executed to generate a signature.
+.BR tin (1)
+will pass the name of the current newsgroup as argument to the
+program. --none will suppress any signature.
 Default is \fI${TIN_HOMEDIR-"$HOME"}/.Sig\fR.
 .TP
 .B default_subject_search
@@ -1340,25 +1382,26 @@ Maximum length of the names of newsgroup
 the newsgroup description can be displayed. Default is 32.
 .TP
 .B hide_uue
-By default (OFF) raw uuencoded data is displayed.
-If ON, then sections of uuencoded data will be shown with a single tag line
+If set to 'No' then raw uuencoded data is displayed. If set to 'Yes'
+then sections of uuencoded data will be shown with a single tag line
 showing the size and filename (much the same as a MIME attachment).
-If set to ALL then any line that looks like uuencoded data will be folded
-into a tag line. This is useful when uuencoded data is split across
-more than one article but can also lead to false positives.
-This setting can also be toggled in the article viewer.
+If set to 'Hide all' then any line that looks like uuencoded data
+will be folded into a tag line. This is useful when uuencoded data is
+split across more than one article but can also lead to false
+positives. This setting can also be toggled in the article viewer.
+Default is 'No'.
 .TP
 .B inews_prog
 Path, name and options of external
-.BR inews (1)
-If you are reading via NNTP the default value is "--internal" (use built in
+.BR inews (1).
+If you are reading via NNTP the default value is "--internal" (use built-in
 NNTP inews), else it is "inews -h". The article is passed to
 \fBinews_prog\fP on STDIN via '< article'.
 .TP
 .B info_in_last_line
 If ON, show current group description or article subject in the last line
 (not in the pager and global menu) - \fBToggleInfoLastLine\fP ('\fBi\fP'
-toggles setting. This facility is useful as the full width of the screen is
+toggles setting). This facility is useful as the full width of the screen is
 available to display long subjects. Default is OFF.
 .TP
 .B inverse_okay
@@ -1372,18 +1415,26 @@ besides keeping the last failed posting 
 .TP
 .B kill_level
 This option controls the processing and display of articles that are
-killed. There are 3 options: 0 (default) is the 'traditional'
-behavior of
+killed. There are 3 options:
+.RS +.5i
+.IP 0 3
+\fBKill only unread arts\fP is the 'traditional' behavior of
 .BR tin (1).
 Only unread articles are killed once only by marking them read. As
 filtering only happens on unread articles with \fBkill_level\fP set
 to 0, \fBart_marked_killed\fP and \fBart_marked_read_selected\fP are
 only shown once. When you reenter the group the mark will be gone.
-Options 1 and 2 will process all articles in the group and therefore
-there is a processing overhead when using them. Option 1 will thread
-killed articles as normal but they will be marked with
-\fBart_marked_killed\fP. Option 2 simply does not display killed
-articles at all.
+.IP 1
+\fBKill all arts & show with K\fP will process all articles in the
+group and therefore there is a processing overhead when using this
+option. Killed articles are threaded as normal but they will be
+marked with \fBart_marked_killed\fP.
+.IP 2
+\fBKill all arts and never show\fP will process all articles in the
+group and therefore there is a processing overhead when using this
+option. Killed articles simply does not get displayed at all.
+.RE
+Default is 0 (\fBKill only unread arts\fP).
 .TP
 .B mail_8bit_header
 Allows 8bit characters unencoded in the header of mail message. Default is
@@ -1399,7 +1450,7 @@ signing.
 .TP
 .B mail_mime_encoding
 MIME encoding of the body in mail message, if necessary (8bit, base64,
-quoted-printable, 7bit) Default is 8bit and no encoding (or charset
+quoted-printable, 7bit). Default is 8bit and no encoding (or charset
 conversion) is performed (i.e., local charset is used as it is).
 .TP
 .B mail_quote_format
@@ -1433,11 +1484,11 @@ used to manually view any attachments. S
 .B mm_charset
 Charset supported locally, which is also used for MIME header
 (charset parameter and charset name in header encoding) in mail and
-news posting. If \fBMIME_STRICT_CHARSET\fP is defined at the compile
+news postings. If \fBMIME_STRICT_CHARSET\fP is defined at the compile
 time, text in charset other than the value of this parameter is
 considered not displayable and represented as '?'. Otherwise, all
 character sets are regarded as compatible with the display. If it's
-not set, the value of the environment variable \fB$MM_CHARSET\fP is
+not set, the value of the environment variable $\fBMM_CHARSET\fP is
 used. US-ASCII or compile-time default is used in case neither of
 them is defined. If your system supports
 .BR iconv (3),
@@ -1460,7 +1511,7 @@ EUC-{CN,JP,KR,TW}, ISO-2022-{CN,CN-EXT,J
 Not all values might work on your system, see
 .BR iconv_open (3)
 for more details. If it's not set, the value of the environment variable
-\fB$MM_CHARSET\fP is used. US-ASCII or compile-time default is used in
+$\fBMM_CHARSET\fP is used. US-ASCII or compile-time default is used in
 case neither of them is defined.
 .TP
 .B mono_markdash
@@ -1508,7 +1559,7 @@ Not defining anything turns off this opt
 .B news_quote_format
 Format of quote line when posting/following up an article (%A=Address,
 %D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname,
-%C=Firstname, %I=Initials). Default is "%F wrote:"
+%C=Firstname, %I=Initials). Default is "%F wrote:".
 .TP
 .B pgdn_goto_next
 If ON the Page Down keys will go to the next unread article when pressed at
@@ -1519,7 +1570,7 @@ If ON put cursor at first unread article
 Default is ON.
 .TP
 .B post_8bit_header
-Allows 8bit characters unencoded in the header of news article. Default is
+Allows 8bit characters unencoded in the header of a news article. Default is
 OFF. Only enacted if \fBpost_mime_encoding\fP is also set to 8bit. In a
 number of local hierarchies where 8bit characters are used, using unencoded
 (raw) 8bit characters in header is acceptable and sometimes even recommended
@@ -1586,7 +1637,7 @@ following up or replying to them. Any of
 combined by adding all relevant values. Default is 5, which means that quote
 characters are compressed and empty lines are quoted.
 .RS +.5i
-.IP 0 3
+.IP 1 3
 \fBCompress quotes\fP Compress quote characters together when quoting
 multiple times (for example, '> > >' will be turned into '>>>'). This
 option is on by default.
@@ -1604,21 +1655,21 @@ A regular expression that will be applie
 matching lines are shown in \fBcol_quote\fP. If \fBquote_regex\fP is blank,
 then
 .BR tin (1)
-uses a built in default.
+uses a built-in default.
 .TP
 .B quote_regex2
 A regular expression that will be applied when reading articles. All
 matching lines are shown in \fBcol_quote2\fP. If \fBquote_regex2\fP is
 blank, then
 .BR tin (1)
-uses a built in default.
+uses a built-in default.
 .TP
 .B quote_regex3
 A regular expression that will be applied when reading articles. All
 matching lines are shown in \fBcol_quote3\fP. If \fBquote_regex3\fP is blank,
 then
 .BR tin (1)
-uses a built in default.
+uses a built-in default.
 .TP
 .B recent_time
 If set to 0, this feature is deactivated, otherwise it means the number of
@@ -1654,19 +1705,21 @@ This setting supersedes show_last_line_p
 half-page scrolling. This setting supersedes full_page_scroll=OFF.
 .TP
 .B show_author
-.in +.5i
-.ti -\w'\(em'u
-\(emNone (0) only the ''Subject:'' line will be displayed.
-.ti -\w'\(em'u
-\(emAddr (1) ''Subject:'' line & the address part of the ''From:'' line are
+Which information about the author should be shown. Default is 2, authors
+full name.
+.RS +.5i
+.IP 0 3
+\fBNone\fP, only the ''Subject:'' line will be displayed.
+.IP 1
+\fBAddress\fP, ''Subject:'' line & the address part of the ''From:'' line
+are displayed.
+.IP 2
+\fBFull Name\fP, ''Subject:'' line & the authors full name part of the
+\&''From:'' line are displayed (default).
+.IP 3
+\fBAddress and Name\fP, ''Subject:'' line & all of the ''From:'' line are
 displayed.
-.ti -\w'\(em'u
-\(emName (2) ''Subject:'' line & the authors full name part of the ''From:''
-line are displayed.
-.ti -\w'\(em'u
-\(emBoth (3) ''Subject:'' line & all of the ''From:'' line are displayed.
-.in -.5i
-Default is 2, authors full name.
+.RE
 .TP
 .B show_description
 If ON show a short group description text after newsgroup name at the group
@@ -1700,7 +1753,7 @@ If ON show only new/unread articles othe
 ON.
 .TP
 .B show_only_unread_groups
-If ON show only subscribed to groups that contain unread articles. Default
+If ON show only subscribed groups that contain unread articles. Default
 is OFF.
 .TP
 .B show_signatures
@@ -1717,37 +1770,49 @@ A regular expression that will be applie
 matching words are shown in \fBcol_markslash\fP or \fBmono_markslash\fP. If
 \fBslashes_regex\fP is blank, then
 .BR tin (1)
-uses a built in default.
+uses a built-in default.
 .TP
 .B sort_article_type
-This specifies how articles should be sorted. The following sort
-types are allowed:
-.in +.5i
-.ti -\w'\(em'u
-\(emdon't sort articles (none=0).
-.ti -\w'\(em'u
-\(emsort articles by ''Subject:'' field (descending=1 & ascending=2).
-.ti -\w'\(em'u
-\(emsort articles by ''From:'' field (descending=3 & ascending=4).
-.ti -\w'\(em'u
-\(emsort articles by ''Date:'' field (descending=5 & ascending=6).
-.ti -\w'\(em'u
-\(emsort articles by filtering score (descending=7 & ascending=8).
-.ti -\w'\(em'u
-\(emsort articles by ''Lines:'' field (descending=9 & ascending=10).
-.in -.5i
-Sort by ascending Date (6) is the default.
+This specifies how articles should be sorted.Sort by ascending Date (6) is
+the default. The following sort types are allowed:
+.RS +.5i
+.IP 0 3
+\fBNothing\fP, don't sort articles.
+.IP 1
+\fBSubject: (descending)\fP, sort articles by ''Subject:'' field descending.
+.IP 2
+\fBSubject: (ascending)\fP, sort articles by ''Subject:'' field ascending.
+.IP 3
+\fBFrom: (descending)\fP, sort articles by ''From:'' field descending.
+.IP 4
+\fBFrom: (ascending)\fP, sort articles by ''From:'' field ascending.
+.IP 5
+\fBDate: (descending)\fP, sort articles by ''Date:'' field descending.
+.IP 6
+\fBDate: (ascending)\fP, sort articles by ''Date:'' field ascending
+(default).
+.IP 7
+\fBScore (descending)\fP, sort articles by filtering score descending.
+.IP 8
+\fBScore (ascending)\fP, sort articles by filtering score ascending.
+.IP 9
+\fBLines: (descending)\fP, sort articles by ''Lines:'' field descending.
+.IP 10
+\fBLines: (ascending)\fP, sort articles by ''Lines:'' field ascending.
+.RE
 .TP
 .B sort_threads_type
-This specifies how threads will be sorted. The following sort
-types are allowed:
-.in +.5i
-.ti -\w'\(em'u
-\(emdon't sort threads (none=0).
-.ti -\w'\(em'u
-\(emsort threads by filtering score (descending=1 & ascending=2).
-.in -.5i
-Sort by descending Score (1) is the default.
+This specifies how threads will be sorted. Sort by descending Score (1) is
+the default. The following sort types are allowed:
+.RS +.5i
+.IP 0 3
+\fBNothing\fP, don't sort threads.
+.IP 1
+\fBScore (descending)\fP, sort threads by filtering score descending
+(default).
+.IP 2
+\fBScore (ascending)\fP, sort threads by filtering score ascending.
+.RE
 .TP
 .B space_goto_next_unread
 SPACE normally acts as a Page Down key and has no effect at the end of an
@@ -1765,7 +1830,7 @@ A regular expression that will be applie
 matching words are shown in \fBcol_markstar\fP or \fBmono_markstar\fP. If
 \fBstars_regex\fP is blank, then
 .BR tin (1)
-uses a built in default.
+uses a built-in default.
 .TP
 .B start_editor_offset
 Set ON if the editor used for posting, follow-ups and bug reports has the
@@ -1793,7 +1858,7 @@ A regular expression that will be applie
 matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP.
 If \fBstrokes_regex\fP is blank, then
 .BR tin (1)
-uses a built in default.
+uses a built-in default.
 .TP
 .B tab_goto_next_unread
 If enabled pressing \fBPageNextUnread\fP ('\fB<TAB>\fP') at the article viewer
@@ -1843,7 +1908,7 @@ A regular expression that will be applie
 matching words are shown in \fBcol_markdash\fP or \fBmono_markdash\fP. If
 \fBundescores_regex\fP is blank, then
 .BR tin (1)
-uses a built in default.
+uses a built-in default.
 .TP
 .B unlink_article
 If ON remove \fI${TIN_HOMEDIR-"$HOME"}/.article\fR after posting. Default is
@@ -1865,7 +1930,7 @@ Use scroll keys on keypad. Default is OF
 .B use_mailreader_i
 Interactive mailreader: if ON mailreader will be invoked earlier for reply
 so you can use more of its features (e.g. MIME, pgp, ...) this option has to
-suit \fBdefault_mailer_format\fP
+suit \fBdefault_mailer_format\fP.
 .TP
 .B use_mouse
 Allows the mouse key support in a
@@ -1945,25 +2010,25 @@ set.
 .RS
 Yet another global configuration file with "\fIvariable\fR=\fIvalue\fR"
 pairs. This one is for the more general options which usually can't be
-controlled via \fI${TIN_LIBDIR-"/news/etc"}/tinrc\fR and/or
+controlled via \fI${TIN_LIBDIR-NEWSLIBDIR}/tinrc\fR and/or
 \fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR like resetting (to override the
-build in default) the \fInewslibdir\fR.
+built-in default) the \fInewslibdir\fR.
 .TP
 .B domainname
 Sets a global domain name used in From lines
 .TP
 .B organization
-Defines the name of your organization. \fB$ORGANIZATION\fP overrides any
+Defines the name of your organization. $\fBORGANIZATION\fP overrides any
 specified value.
 .TP
 .B newslibdir
 Defines the default place for some configuration files, common values are
 \fI/usr/lib/news\fR, \fI/var/lib/news\fR, \fI/usr/local/lib/news\fR or
-\fI/news/db\fR. \fB$TIN_LIBDIR\fP overrides any specified value.
+\fI/news/db\fR. $\fBTIN_LIBDIR\fP overrides any specified value.
 .TP
 .B bugaddress
 Defines the email address to which users can send bug reports using a
-built in function. The default points to a developers mailing list located
+built-in function. The default points to a developers mailing list located
 at tin.org. You might want to change this address to one of your local
 administration if you want to deal with your lusers problems on your own.
 .TP
@@ -1973,7 +2038,7 @@ Defines the directory containing of the
 executable
 .TP
 .B mm_charset
-Default charset to be used in MIME's Content-Type header. \fB$MM_CHARSET\fP
+Default charset to be used in MIME's Content-Type header. $\fBMM_CHARSET\fP
 overrides any specified value.
 .TP
 .B post_mime_encoding
@@ -1993,14 +2058,14 @@ Don't generate a ''Sender:''-header. Thi
 .B spooldir
 Base of your newsspool (Bnews, Cnews and INN traditional spool style), common
 values are \fI/var/spool/news\fR, \fI/usr/spool/news\fR, \fI/news/spool\fR.
-\fB$TIN_SPOOLDIR\fP overrides any specified value.
+$\fBTIN_SPOOLDIR\fP overrides any specified value.
 .TP
 .B overviewdir
 Base of your NOV database
 .BR newsoverview (5)
 (tradspool style; might be the same dir as
 \fIspooldir\fR), common values are \fI/var/spool/overview\fR,
-\fI/usr/spool/overview\fR, \fI/news/overview\fR. \fB$TIN_NOVROOTDIR\fP
+\fI/usr/spool/overview\fR, \fI/news/overview\fR. $\fBTIN_NOVROOTDIR\fP
 overrides any specified value.
 .TP
 .B overviewfile
@@ -2010,7 +2075,7 @@ Name of a single overview file, common v
 .B activefile
 Full pathname of your newssystem's active file; usually the active file
 resides in \fInewslibdir\fR and is named \fIactive\fR, so you only have
-to change this setting if your configuration differs. \fB$TIN_ACTIVEFILE\fP
+to change this setting if your configuration differs. $\fBTIN_ACTIVEFILE\fP
 overrides any specified value.
 .TP
 .B activetimesfile
@@ -2033,8 +2098,8 @@ setting if your configuration differs.
 .IR /usr/local/share/locale/${LC_MESSAGES}/LC_MESSAGES/tin.mo
 .sp
 .RS
-translation into language specified in \fB$LC_ALL\fP, \fB$LC_MESSAGES\fP or
-\fB$LANG\fP
+translation into language specified in $\fBLC_ALL\fP, $\fBLC_MESSAGES\fP or
+$\fBLANG\fP
 .RE
 .PP
 
@@ -2042,7 +2107,7 @@ translation into language specified in \
 .\" as with inn >= 2.2.x getting more and more popular
 .\" we should think about checking for the new Paths
 .\" (described shown below).
-.IR ${TIN_LIBDIR-"/news/db"}"/"${TIN_ACTIVEFILE-active}
+.IR ${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}
 .sp
 .RS
 This file lists the newsgroups that the local site receives. Each newsgroup
@@ -2102,7 +2167,7 @@ uses the LIST (\fBRFC977\fP) command ins
 .RE
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/active.times
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/active.times
 .sp
 .RS
 This file provides a chronological record of when newsgroups are created. It
@@ -2129,7 +2194,7 @@ uses the NEWGROUPS (\fBRFC977\fP) comman
 .RE
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/newsgroups
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/newsgroups
 .sp
 .RS
 This file provides short descriptions of each newsgroup. It is normally
@@ -2152,7 +2217,7 @@ uses the LIST NEWSGROUPS (\fBRFC2980\fP)
 .RE
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/organization
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/organization
 .sp
 .RS
 This file specifies might hold a default organization to be used
@@ -2161,7 +2226,7 @@ if set.
 .RE
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/overview.fmt
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/overview.fmt
 .\" is the Path correct? or is it /news/etc/overview.fmt
 .sp
 .RS
@@ -2181,7 +2246,7 @@ uses the LIST OVERVIEW.FMT (\fBRFC2980\f
 .RE
 .PP
 
-.IR ${TIN_LIBDIR-"/news/db"}/subscriptions
+.IR ${TIN_LIBDIR-NEWSLIBDIR}/subscriptions
 .\" is the Path correct? or is it /news/etc/subscriptions
 .sp
 .RS
diff -Nurp tin-1.5.18/doc/tinews.1 tin-1.6.0/doc/tinews.1
--- tin-1.5.18/doc/tinews.1	Thu Jan  1 01:00:00 1970
+++ tin-1.6.0/doc/tinews.1	Sat Jul 12 15:49:45 2003
@@ -0,0 +1,302 @@
+.rn '' }`
+''' $RCSfile$$Revision$$Date$
+'''
+''' $Log$
+'''
+.de Sh
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp
+.if t .sp .5v
+.if n .sp
+..
+.de Ip
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.de Vb
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve
+.ft R
+
+.fi
+..
+'''
+'''
+'''     Set up \*(-- to give an unbreakable dash;
+'''     string Tr holds user defined translation string.
+'''     Bell System Logo is used as a dummy character.
+'''
+.tr \(*W-|\(bv\*(Tr
+.ie n \{\
+.ds -- \(*W-
+.ds PI pi
+.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+.ds L" ""
+.ds R" ""
+'''   \*(M", \*(S", \*(N" and \*(T" are the equivalent of
+'''   \*(L" and \*(R", except that they are used on ".xx" lines,
+'''   such as .IP and .SH, which do another additional levels of
+'''   double-quote interpretation
+.ds M" """
+.ds S" """
+.ds N" """""
+.ds T" """""
+.ds L' '
+.ds R' '
+.ds M' '
+.ds S' '
+.ds N' '
+.ds T' '
+'br\}
+.el\{\
+.ds -- \(em\|
+.tr \*(Tr
+.ds L" ``
+.ds R" ''
+.ds M" ``
+.ds S" ''
+.ds N" ``
+.ds T" ''
+.ds L' `
+.ds R' '
+.ds M' `
+.ds S' '
+.ds N' `
+.ds T' '
+.ds PI \(*p
+'br\}
+.\"	If the F register is turned on, we'll generate
+.\"	index entries out stderr for the following things:
+.\"		TH	Title 
+.\"		SH	Header
+.\"		Sh	Subsection 
+.\"		Ip	Item
+.\"		X<>	Xref  (embedded
+.\"	Of course, you have to process the output yourself
+.\"	in some meaninful fashion.
+.if \nF \{
+.de IX
+.tm Index:\\$1\t\\n%\t"\\$2"
+..
+.nr % 0
+.rr F
+.\}
+.TH TINEWS 1 "1.1.0" "June 26th, 2003" "Post and sign an article via NNTP"
+.UC
+.if n .hy 0
+.if n .na
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.de CQ          \" put $1 in typewriter font
+.ft CW
+'if n "\c
+'if t \\&\\$1\c
+'if n \\&\\$1\c
+'if n \&"
+\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7
+'.ft R
+..
+.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+.	\" AM - accent mark definitions
+.bd B 3
+.	\" fudge factors for nroff and troff
+.if n \{\
+.	ds #H 0
+.	ds #V .8m
+.	ds #F .3m
+.	ds #[ \f1
+.	ds #] \fP
+.\}
+.if t \{\
+.	ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.	ds #V .6m
+.	ds #F 0
+.	ds #[ \&
+.	ds #] \&
+.\}
+.	\" simple accents for nroff and troff
+.if n \{\
+.	ds ' \&
+.	ds ` \&
+.	ds ^ \&
+.	ds , \&
+.	ds ~ ~
+.	ds ? ?
+.	ds ! !
+.	ds /
+.	ds q
+.\}
+.if t \{\
+.	ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.	ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.	ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.	ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.	ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.	ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10'
+.	ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m'
+.	ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.	ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10'
+.\}
+.	\" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#]
+.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u'
+.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u'
+.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#]
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.ds oe o\h'-(\w'o'u*4/10)'e
+.ds Oe O\h'-(\w'O'u*4/10)'E
+.	\" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.	\" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.	ds : e
+.	ds 8 ss
+.	ds v \h'-1'\o'\(aa\(ga'
+.	ds _ \h'-1'^
+.	ds . \h'-1'.
+.	ds 3 3
+.	ds o a
+.	ds d- d\h'-1'\(ga
+.	ds D- D\h'-1'\(hy
+.	ds th \o'bp'
+.	ds Th \o'LP'
+.	ds ae ae
+.	ds Ae AE
+.	ds oe oe
+.	ds Oe OE
+.\}
+.rm #[ #] #H #V #F C
+.SH "NAME"
+tinews.pl \- Post and sign an article via NNTP
+.SH "SYNOPSIS"
+\fBtinews.pl\fR < \fIinput\fR
+.SH "DESCRIPTION"
+\fBtinews.pl\fR reads an article on STDIN, signs it via \fBpgp\fR(1) or
+\fBgpg\fR(1) and posts it to a newsserver.
+.PP
+If the article contains To:, Cc: or Bcc: headers and mail-actions are
+configured it will automatically add a \*(L"Posted-And-Mailed: yes\*(R" header
+to the article and send out the mail-copies.
+.SH "OPTIONS"
+None.
+.SH "EXIT STATUS"
+The following exit values are returned:
+.Ip "\ 0 " 4
+Successful completion.
+.Ip "!=0" 4
+An error occurred.
+.SH "ENVIRONMENT"
+.Ip "\fB$\s-1NNTPSERVER\s0\fR" 4
+Set to override the \s-1NNTP\s0 server configured in the source.
+.Ip "\fB$\s-1PGPPASS\s0\fR" 4
+Set to override the passphrase configured in the source (used for
+\fBpgp\fR(1)\-2.6.3).
+.Ip "\fB$\s-1PGPPASSFILE\s0\fR" 4
+Passphrase file used for \fBpgp\fR(1) or \fBgpg\fR(1).
+.Ip "\fB$\s-1SIGNER\s0\fR" 4
+Set to override the user-id for signing configured in the source. If you
+neither set \fB$\s-1SIGNER\s0\fR nor configure it in the source the contents of the
+From:\-field will be used.
+.Ip "\fB$\s-1REPLYTO\s0\fR" 4
+Set the article header field Reply-To: to the return address specified by
+the variable if there isn't allready a Reply-To: header in the article.
+.Ip "\fB$\s-1ORGANIZATION\s0\fR" 4
+Set the article header field Organization: to the contents of the variable
+if there isn't allready a Organization: header in the article.
+.SH "FILES"
+.Ip "\fIpgptmp.txt\fR" 4
+Temporary file used to store the reformated article
+.Ip "\fIpgptmp.txt.asc\fR" 4
+Temporary file used to store the reformated and signed article
+.Ip "\fI$\s-1PGPPASSFILE\s0\fR" 4
+The passphrase file to be used for \fBpgp\fR(1) or \fBgpg\fR(1).
+.SH "SECURITY"
+If interactive usage is configured and \fBtinews.pl\fR prompts for the
+NNTP\-password the input is echoed to the terminal.
+.PP
+If you've configured or entered a password, even if the variable that
+contained that password has been erased, it may be possible for someone to
+find that password, in plaintext, in a core dump. In short, if serious
+security is an issue, don't use this script.
+.SH "NOTES"
+\fBtinews.pl\fR is designed to be used with \fBpgp\fR(1)\-2.6.3,
+\fBpgp\fR(1)\-5 and \fBgpg\fR(1).
+.PP
+\fBtinews.pl\fR requires the following standard modules to be installed:
+\fBNet::NNTP\fR(3pm), \fBTime::Local\fR(3pm) and \fBTerm::Readline\fR(3pm).
+.SH "AUTHOR"
+Urs Janssen <urs@tin.org>,
+Marc Brockschmidt <marc@marcbrockschmidt.de>
+.SH "SEE ALSO"
+\fBpgp\fR(1), \fBgpg\fR(1), \fBpgps\fR(1), \fBNet::NNTP\fR(3pm), \fBTime::Local\fR(3pm),
+\fBTerm::Readline\fR(3pm)
+
+.rn }` ''
+.IX Title "TINEWS 1"
+.IX Name "tinews.pl - Post and sign an article via NNTP"
+
+.IX Header "NAME"
+
+.IX Header "SYNOPSIS"
+
+.IX Header "DESCRIPTION"
+
+.IX Header "OPTIONS"
+
+.IX Header "EXIT STATUS"
+
+.IX Item "\ 0 "
+
+.IX Item "!=0"
+
+.IX Header "ENVIRONMENT"
+
+.IX Item "\fB$\s-1NNTPSERVER\s0\fR"
+
+.IX Item "\fB$\s-1PGPPASS\s0\fR"
+
+.IX Item "\fB$\s-1PGPPASSFILE\s0\fR"
+
+.IX Item "\fB$\s-1SIGNER\s0\fR"
+
+.IX Item "\fB$\s-1REPLYTO\s0\fR"
+
+.IX Item "\fB$\s-1ORGANIZATION\s0\fR"
+
+.IX Header "FILES"
+
+.IX Item "\fIpgptmp.txt\fR"
+
+.IX Item "\fIpgptmp.txt.asc\fR"
+
+.IX Item "\fI$\s-1PGPPASSFILE\s0\fR"
+
+.IX Header "SECURITY"
+
+.IX Header "NOTES"
+
+.IX Header "AUTHOR"
+
+.IX Header "SEE ALSO"
+
diff -Nurp tin-1.5.18/doc/w2r.1 tin-1.6.0/doc/w2r.1
--- tin-1.5.18/doc/w2r.1	Thu May  8 23:09:36 2003
+++ tin-1.6.0/doc/w2r.1	Sat Jul 12 15:49:45 2003
@@ -93,7 +93,7 @@
 .nr % 0
 .rr F
 .\}
-.TH W2R 1 "0.2.5" "31/Aug/2001" "Convert tin wildmat filters to tin regexp filters"
+.TH W2R 1 "0.2.6" "June 26th, 2003" "Convert tin wildmat filters to tin regexp filters"
 .UC
 .if n .hy 0
 .if n .na
diff -Nurp tin-1.5.18/include/autoconf.hin tin-1.6.0/include/autoconf.hin
--- tin-1.5.18/include/autoconf.hin	Thu May 15 15:49:53 2003
+++ tin-1.6.0/include/autoconf.hin	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : autoconf.hin
  *  Author    : Thomas Dickey
  *  Created   : 1995-08-24
- *  Updated   : 2003-05-16
+ *  Updated   : 2003-06-18
  *  Notes     : #include files, #defines & struct's
  *
  * Copyright (c) 1995-2003 Thomas Dickey <dickey@invisible-island.net>
@@ -71,6 +71,11 @@
  * Mac OS X need some extras
  */
 #	undef MAC_OS_X
+
+/*
+ * SEIUX has strange struct utsname values
+ */
+#	undef SEIUX
 
 /*
  * These are set as configure options, some must be guarded by ifdefs because
diff -Nurp tin-1.5.18/include/extern.h tin-1.6.0/include/extern.h
--- tin-1.5.18/include/extern.h	Fri May 16 15:50:49 2003
+++ tin-1.6.0/include/extern.h	Sat Jul 12 15:49:45 2003
@@ -3,7 +3,7 @@
  *  Module    : extern.h
  *  Author    : I. Lea
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-06-29
  *  Notes     :
  *
  * Copyright (c) 1997-2003 Iain Lea <iain@bricbrac.de>
@@ -330,6 +330,7 @@ extern char *OPT_CHAR_list[];
 extern char *OPT_STRING_list[];
 extern char *ch_post_process;
 extern char *nntp_server;
+extern char *xover_cmd;
 extern char active_times_file[PATH_LEN];
 extern char bug_addr[LEN];
 extern char bug_nntpserver1[PATH_LEN];
@@ -467,6 +468,8 @@ extern constext txt_base_article[];
 extern constext txt_base_article_range[];
 extern constext txt_batch_update_unavail[];
 extern constext txt_begin_of_art[];
+extern constext txt_caching_off[];
+extern constext txt_caching_on[];
 extern constext txt_cancel_article[];
 extern constext txt_cancelling_art[];
 extern constext txt_cannot_create[];
@@ -481,7 +484,6 @@ extern constext txt_cannot_open_for_savi
 extern constext txt_cannot_post[];
 extern constext txt_cannot_post_group[];
 extern constext txt_cannot_retrieve[];
-extern constext txt_cannot_write_index[];
 extern constext txt_cannot_write_to_directory[];
 extern constext txt_catchup[];
 extern constext txt_catchup_group[];
@@ -500,9 +502,13 @@ extern constext txt_color_off[];
 extern constext txt_color_on[];
 extern constext txt_command_failed[];
 extern constext txt_confirm_select_on_exit[];
-extern constext txt_connecting[];
-extern constext txt_connecting_port[];
-extern constext txt_connection_to[];
+#ifdef NNTP_ABLE
+	extern constext txt_connecting[];
+	extern constext txt_connecting_port[];
+#endif /* NNTP_ABLE */
+#if defined(NNTP_ABLE) && !defined(INET6)
+	extern constext txt_connection_to[];
+#endif /* NNTP_ABLE && !INET6 */
 extern constext txt_copyright_notice[];
 extern constext txt_cr[];
 extern constext txt_creating_active[];
@@ -510,7 +516,9 @@ extern constext txt_creating_newsrc[];
 extern constext txt_default[];
 extern constext txt_delete_processed_files[];
 extern constext txt_deleting[];
-extern constext txt_disconnecting[];
+#ifdef NNTP_ABLE
+	extern constext txt_disconnecting[];
+#endif /* NNTP_ABLE */
 extern constext txt_end_of_art[];
 extern constext txt_end_of_arts[];
 extern constext txt_end_of_groups[];
@@ -592,13 +600,19 @@ extern constext txt_error_singular[];
 	extern constext txt_error_topen[];
 #endif /* NNTP_ABLE && TLI && !INET6 */
 extern constext txt_error_unknown_dlevel[];
-extern constext txt_error_unknown_service[];
-extern constext txt_error_wrong_newsgroupname_in_group_response[];
+#if defined(NNTP_ABLE) && defined(HAVE_GETSERVBYNAME)
+	extern constext txt_error_unknown_service[];
+#endif /* NNTP_ABLE && HAVE_GETSERVBYNAME */
+#ifdef NNTP_ABLE
+	extern constext txt_error_wrong_newsgroupname_in_group_response[];
+#endif /* NNTP_ABLE */
 extern constext txt_esc[];
 extern constext txt_exiting[];
 extern constext txt_external_mail_done[];
 extern constext txt_extracting_shar[];
-extern constext txt_failed_to_connect_to_server[];
+#ifdef NNTP_ABLE
+	extern constext txt_failed_to_connect_to_server[];
+#endif /* NNTP_ABLE */
 extern constext txt_feed_pattern[];
 extern constext txt_filesystem_full[];
 extern constext txt_filesystem_full_backup[];
@@ -615,7 +629,9 @@ extern constext txt_from_line_only[];
 extern constext txt_from_line_only_case[];
 extern constext txt_full[];
 extern constext txt_gethostbyname[];
-extern constext txt_giving_up[];
+#if defined(NNTP_ABLE) && !defined(INET6)
+	extern constext txt_giving_up[];
+#endif /* NNTP_ABLE && !INET6 */
 extern constext txt_global[];
 extern constext txt_group[];
 extern constext txt_group_aliased[];
@@ -960,7 +976,9 @@ extern constext txt_reading_news_active_
 extern constext txt_reading_news_newsrc_file[];
 extern constext txt_reading_newsgroups_file[];
 extern constext txt_reading_newsrc[];
-extern constext txt_reconnect_to_news_server[];
+#ifdef NNTP_ABLE
+	extern constext txt_reconnect_to_news_server[];
+#endif /* NNTP_ABLE */
 extern constext txt_remove_bogus[];
 extern constext txt_rename_error[];
 extern constext txt_reply_to_author[];
@@ -1006,7 +1024,10 @@ extern constext txt_select_text[];
 extern constext txt_select_thread[];
 extern constext txt_select_time[];
 extern constext txt_send_bugreport[];
-extern constext txt_server_name_in_file_env_var[];
+#ifdef NNTP_ABLE
+	extern constext txt_server_name_in_file_env_var[];
+#endif /* NNTP_ABLE */
+extern constext txt_serverconfig_header[];
 extern constext txt_servers_active[];
 extern constext txt_skipping_newgroups[];
 extern constext txt_space[];
@@ -1044,7 +1065,9 @@ extern constext txt_toggled_high[];
 extern constext txt_toggled_rot13[];
 extern constext txt_toggled_tex2iso[];
 extern constext txt_toggled_tabwidth[];
-extern constext txt_trying[];
+#if defined(NNTP_ABLE) && defined(HAVE_INET_NTOA)
+	extern constext txt_trying[];
+#endif /* NNTP_ABLE && HAVE_INET_NTOA */
 extern constext txt_trying_dotlock[];
 extern constext txt_trying_lock[];
 extern constext txt_type_h_for_help[];
@@ -1271,7 +1294,6 @@ extern t_bool show_description;
 extern t_bool show_subject;
 extern t_bool batch_mode;
 extern t_bool verbose;
-extern t_bool xover_supported;
 extern t_bool xref_supported;
 
 extern t_menu selmenu;
diff -Nurp tin-1.5.18/include/proto.h tin-1.6.0/include/proto.h
--- tin-1.5.18/include/proto.h	Wed May 21 19:14:31 2003
+++ tin-1.6.0/include/proto.h	Sat Jul 12 15:49:45 2003
@@ -3,7 +3,7 @@
  *  Module    : proto.h
  *  Author    : Urs Janssen <urs@tin.org>
  *  Created   :
- *  Updated   : 2003-05-16
+ *  Updated   : 2003-06-29
  *  Notes     :
  *
  * Copyright (c) 1997-2003 Urs Janssen <urs@tin.org>
@@ -46,6 +46,7 @@
 
 /* active.c */
 extern char group_flag(char ch);
+extern int find_newnews_index(const char *cur_newnews_host);
 extern int get_active_num(void);
 extern t_bool match_group_list(const char *group, const char *group_list);
 extern t_bool parse_active_line(char *line, long *max, long *min, char *moderated);
@@ -57,7 +58,6 @@ extern void load_newnews_info(char *info
 extern void read_news_active_file(void);
 
 /* art.c */
-extern char *find_nov_file(struct t_group *group, int mode);
 extern int global_get_multipart_info(int aindex, MultiPartInfo *setme);
 extern t_bool index_group(struct t_group *group);
 extern void do_update(t_bool catchup);
@@ -108,6 +108,7 @@ extern t_bool match_long(char *line, con
 extern t_bool match_string(char *line, const char *pat, char *dst, size_t dstlen);
 extern t_bool read_config_file(char *file, t_bool global_file);
 extern void quote_dash_to_space(char *str);
+extern void read_server_config(void);
 extern void refresh_config_page(int act_option);
 extern void show_menu_help(const char *help_message);
 extern void write_config_file(char *file);
@@ -357,7 +358,6 @@ extern void process_charsets(char **line
 extern void read_input_history_file(void);
 extern void rename_file(const char *old_filename, const char *new_filename);
 extern void show_inverse_video_status(void);
-extern void strip_double_ngs(char *ngs_list);
 extern void strip_name(const char *from, char *address);
 extern void tin_done(int ret);
 extern void toggle_inverse_video(void);
@@ -426,7 +426,6 @@ extern FILE *open_news_active_fp(void);
 extern FILE *open_newsgroups_fp(void);
 extern FILE *open_overview_fmt_fp(void);
 extern FILE *open_subscription_fp(void);
-extern FILE *open_xover_fp(struct t_group *group, const char *mode, long min, long max);
 extern FILE *open_art_header(long art);
 extern int get_respcode(char *, size_t);
 extern int get_only_respcode(char *, size_t);
diff -Nurp tin-1.5.18/include/tcurses.h tin-1.6.0/include/tcurses.h
--- tin-1.5.18/include/tcurses.h	Thu May  8 23:09:36 2003
+++ tin-1.6.0/include/tcurses.h	Sat Jul 12 15:49:45 2003
@@ -3,7 +3,7 @@
  *  Module    : tcurses.h
  *  Author    : Thomas Dickey
  *  Created   : 1997-03-02
- *  Updated   : 2003-02-01
+ *  Updated   : 2003-06-27
  *  Notes     : curses #include files, #defines & struct's
  *
  * Copyright (c) 1997-2003 Thomas Dickey <dickey@invisible-island.net>
@@ -96,7 +96,6 @@
 
 extern int cmdReadCh(void);
 extern char *screen_contents(int row, int col, char *buffer);
-extern int my_innstr(char *str, int n);
 extern void MoveCursor(int row, int col);
 extern void my_erase(void);
 extern void my_fflush(FILE *stream);
diff -Nurp tin-1.5.18/include/tin.h tin-1.6.0/include/tin.h
--- tin-1.5.18/include/tin.h	Wed May 21 19:14:31 2003
+++ tin-1.6.0/include/tin.h	Sat Jul 12 15:49:45 2003
@@ -3,7 +3,7 @@
  *  Module    : tin.h
  *  Author    : I. Lea & R. Skrenta
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-06-29
  *  Notes     : #include files, #defines & struct's
  *
  * Copyright (c) 1997-2003 Iain Lea <iain@bricbrac.de>, Rich Skrenta <skrenta@pbm.com>
@@ -444,6 +444,13 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_
 #	ifndef NNTP_INEWS
 #		define NNTP_INEWS	1
 #	endif /* !NNTP_INEWS */
+#else
+#	ifdef XHDR_XREF
+#		undef XHDR_XREF
+#	endif /* XHDR_XREF */
+#	ifdef BROKEN_LISTGROUP
+#		undef BROKEN_LISTGROUP
+#	endif /* BROKEN_LISTGROUP */
 #endif /* NNTP_ABLE || NNTP_ONLY */
 
 #define FAKE_NNTP_FP		(FILE *) 9999
@@ -682,6 +689,7 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_
 #define ACTIVE_TIMES_FILE	"active.times"
 #define ATTRIBUTES_FILE	"attributes"
 #define CONFIG_FILE	"tinrc"
+#define SERVERCONFIG_FILE	"serverrc"
 #define DEFAULT_MAILDIR	"Mail"
 #define DEFAULT_SAVEDIR	"News"
 #define DEFAULT_URL_HANDLER "url_handler.sh"
@@ -908,7 +916,7 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_
 #			endif /* _POSIX_NAME_MAX */
 #		endif /* NAME_MAX */
 #	else
-#  	define NAME_LEN	14
+#		define NAME_LEN	14
 #	endif /* HAVE_LONG_FILE_NAMES */
 #	define LEN	1024
 #endif /* M_UNIX */
@@ -1871,6 +1879,9 @@ typedef struct {
 		typedef char *t_comptype;
 #	endif /* HAVE_COMPTYPE_CHAR */
 #endif /* HAVE_COMPTYPE_VOID */
+
+/* Define a matching function pointer type */
+typedef int (*t_compfunc)(t_comptype, t_comptype);
 
 #define _CDECL
 
diff -Nurp tin-1.5.18/include/version.h tin-1.6.0/include/version.h
--- tin-1.5.18/include/version.h	Mon Jun  2 14:58:13 2003
+++ tin-1.6.0/include/version.h	Mon Jul 14 19:17:31 2003
@@ -3,7 +3,7 @@
  *  Module    : version.h
  *  Author    : I. Lea
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-09
+ *  Updated   : 2003-06-29
  *  Notes     :
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>
@@ -40,14 +40,15 @@
 
 #	define PRODUCT		"tin"
 #	ifndef TIN_AUTOCONF_H
-#		define VERSION		"1.5.18"
+#		define VERSION		"1.6.0"
 #	endif /* !TIN_AUTOCONF_H */
-#	define RELEASEDATE	"20030602"
-#	define RELEASENAME	"Darts"
+#	define RELEASEDATE	"20030714"
+#	define RELEASENAME	"Vatersay"
 /* config-file versions - must by dotted triples */
 #	define TINRC_VERSION	"1.3.6"
 #	define ATTRIBUTES_VERSION	"1.0.0"
 #	define FILTER_VERSION	"1.0.0"
+#	define SERVERCONFIG_VERSION	"1.0.0"
 
 #	ifdef M_AMIGA
 #		define OSNAME	"AMIGA"
diff -Nurp tin-1.5.18/po/Makefile.inn tin-1.6.0/po/Makefile.inn
--- tin-1.5.18/po/Makefile.inn	Thu May  8 23:09:58 2003
+++ tin-1.6.0/po/Makefile.inn	Sat Jul 12 15:49:51 2003
@@ -16,6 +16,8 @@ top_builddir = ..
 SHELL = /bin/sh
 @SET_MAKE@
 
+DESTDIR	= @DESTDIR@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
Binary files tin-1.5.18/po/de.gmo and tin-1.6.0/po/de.gmo differ
diff -Nurp tin-1.5.18/po/de.po tin-1.6.0/po/de.po
--- tin-1.5.18/po/de.po	Mon Jun  2 14:54:26 2003
+++ tin-1.6.0/po/de.po	Mon Jul 14 17:48:15 2003
@@ -1,13 +1,13 @@
 # German translations for tin
 # Sven Hartge <oweh@ds9.argh.org>, 2000-2002
 # Kai Bojens <kbojens@on-luebeck.de>, 2000-2002
-# Andreas Metzler <tin-dev@downhill.at.eu.org>, 2001-2002
+# Andreas Metzler <tin-dev@downhill.at.eu.org>, 2001-2003
 # Christian Garbs <tin-dev@cgarbs.de>, 2003
 #
 msgid	""
 msgstr	"Project-Id-Version: tin 1.5.17\n"
-	"POT-Creation-Date: 2003-06-02 14:53+0200\n"
-	"PO-Revision-Date: 2003-03-09 01:33+0200\n"
+	"POT-Creation-Date: 2003-07-14 17:23+0200\n"
+	"PO-Revision-Date: 2003-03-13 04:15+0200\n"
 	"Last-Translator: Sven Hartge <oweh@ds9.argh.org>, Kai Bojens "
 	"<kbojens@on-luebeck.de>\n"
 	"Language-Team: German <german-tin@ds9.argh.org>\n"
@@ -270,38 +270,46 @@ msgstr	"(unbekannt)"
 #.
 #: src/filter.c:604 src/filter.c:612
 msgid	"Removed from the previous rule: "
-msgstr	""
+msgstr	"Aus der vorigen Regel gelöscht: "
 
 #: src/lang.c:42
 #, c-format
 msgid	"1 Response%s"
 msgstr	"1 Antwort%s"
 
-#: src/lang.c:45
+#: src/lang.c:46
 #, c-format
 msgid	"\n"
 	"%s contains no newsgroups. Exiting."
 msgstr	"\n"
 	"%s enthält keine Newsgruppen. tin beendet sich."
 
-#: src/lang.c:46
-#, c-format
-msgid	"File %s exists. %s=append, %s=overwrite, %s=quit: "
-msgstr	"Datei %s existiert. %s=anfügen, %s=überschreiben, %s=beenden: "
-
 #: src/lang.c:47
 msgid	"all "
 msgstr	"alle "
 
 #: src/lang.c:48
+msgid	"All groups"
+msgstr	"Alle Gruppen"
+
+#: src/lang.c:49
+#, c-format
+msgid	"File %s exists. %s=append, %s=overwrite, %s=quit: "
+msgstr	"Datei %s existiert. %s=anfügen, %s=überschreiben, %s=beenden: "
+
+#: src/lang.c:50
 msgid	"Article cancelled (deleted)."
 msgstr	"Artikel gecancelt (gelöscht)."
 
-#: src/lang.c:49
+#: src/lang.c:51
 msgid	"Article cannot be cancelled (deleted)."
 msgstr	"Artikel kann nicht gecancelt (gelöscht) werden."
 
-#: src/lang.c:50
+#: src/lang.c:52
+msgid	"Article deleted."
+msgstr	"Artikel gelöscht"
+
+#: src/lang.c:53
 #, c-format
 msgid	"\n"
 	"Your article:\n"
@@ -312,577 +320,538 @@ msgstr	"\n"
 	"  \"%s\"\n"
 	"wird in folgende %s gepostet:\n"
 
-#: src/lang.c:51
+#: src/lang.c:54
 msgid	"Article not posted!"
 msgstr	"Artikel nicht gepostet!"
 
-#: src/lang.c:52
+#: src/lang.c:55
 msgid	"Article not saved"
 msgstr	"Artikel nicht gespeichert"
 
-#: src/lang.c:53
+#: src/lang.c:56
 msgid	"Article Level Commands"
 msgstr	"Artikelbereich Befehle"
 
-#: src/lang.c:54
+#: src/lang.c:57
+msgid	"Article has no parent"
+msgstr	"Artikel hat keinen Bezugsartikel"
+
+#: src/lang.c:58
+msgid	"Parent article has been killed"
+msgstr	"Der Bezugsartikel wurde gekillt"
+
+#: src/lang.c:59
+msgid	"Parent article is unavailable"
+msgstr	"Bezugsartikel nicht verfügbar"
+
+#: src/lang.c:60
 #, c-format
 msgid	"Article posted: %s"
 msgstr	"Artikel gepostet: %s"
 
-#: src/lang.c:55
+#: src/lang.c:61
 #, c-format
 msgid	"Article rejected (saved to %s)"
 msgstr	"Artikel abgelehnt (abgespeichert als %s)"
 
-#: src/lang.c:56
+#: src/lang.c:62
 #, c-format
 msgid	"%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: "
 msgstr	"%s=Artikel %s=Thread %s=hervorgehoben %s=muster %s=markierte %s=beenden: "
 
-#: src/lang.c:57
+#: src/lang.c:63
 msgid	"Article unavailable"
 msgstr	"Artikel nicht verfügbar"
 
-#: src/lang.c:58
-msgid	"Article has no parent"
-msgstr	"Artikel hat keinen Bezugsartikel"
-
-#: src/lang.c:59
-msgid	"Parent article has been killed"
-msgstr	"Der Bezugsartikel wurde gekillt"
-
-#: src/lang.c:60
-msgid	"Parent article is unavailable"
-msgstr	"Bezugsartikel nicht verfügbar"
+#: src/lang.c:64
+msgid	"Article undeleted."
+msgstr	"Artikellöschen rückgängig gemacht"
 
-#: src/lang.c:62
+#: src/lang.c:66
 msgid	"articles"
 msgstr	"Artikel"
 
-#: src/lang.c:63
+#: src/lang.c:67
 msgid	"This is a repost of the following article:"
 msgstr	"Dies ist ein Repost des folgenden Artikels:"
 
-#: src/lang.c:64
+#: src/lang.c:68
 msgid	"article"
 msgstr	"Artikel"
 
-#: src/lang.c:65
+#: src/lang.c:69
 msgid	"Article"
 msgstr	"Artikel"
 
-#: src/lang.c:66
+#: src/lang.c:70
 #, c-format
 msgid	"-- %d %s mailed --"
 msgstr	"-- %d %s gemailt --"
 
-#: src/lang.c:68
+#: src/lang.c:71
 #, c-format
-msgid	"%d %s printed"
-msgstr	"%d %s gedruckt"
+msgid	" at %s"
+msgstr	" bei %s"
 
-#: src/lang.c:70
+#: src/lang.c:72
 #, c-format
 msgid	"%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n"
 msgstr	"%*s[-- %s/%s, Encoding %s%s%s, %d Zeilen%s%s --]\n"
 
-#: src/lang.c:71
+#: src/lang.c:73
 msgid	", charset: "
 msgstr	", Zeichensatz: "
 
-#: src/lang.c:72
+#: src/lang.c:74
 #, c-format
 msgid	"%*s[-- Description: %s --]\n"
 msgstr	"%*s[-- Beschreibung: %s --]\n"
 
-#: src/lang.c:73
-#, c-format
-msgid	"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
-	"\n"
-msgstr	"%*s[-- %s/%s, %suukodierte Datei, %d Zeilen, Name: %s --]\n"
-	"\n"
-
-#: src/lang.c:74
+#: src/lang.c:75
 #, c-format
 msgid	"%d Authentication failed"
 msgstr	"%d Anmeldung fehlgeschlagen"
 
-#: src/lang.c:75
+#: src/lang.c:76
 msgid	"Server expects authentication.\n"
 msgstr	"Der Server verlangt Anmeldung (Passwort).\n"
 
-#: src/lang.c:76
+#: src/lang.c:77
 msgid	"    Please enter password: "
 msgstr	"    Bitte das Passwort eingeben: "
 
-#: src/lang.c:77
+#: src/lang.c:78
 msgid	"    Please enter username: "
 msgstr	"    Bitte den Usernamen eingeben: "
 
-#: src/lang.c:78
+#: src/lang.c:79
 #, c-format
 msgid	"Author search backwards [%s]> "
 msgstr	"Autorsuche rückwärts [%s]> "
 
-#: src/lang.c:79
+#: src/lang.c:80
 #, c-format
 msgid	"Author search forwards [%s]> "
 msgstr	"Autorsuche vorwärts [%s]> "
 
-#: src/lang.c:80
+#: src/lang.c:81
 #, c-format
 msgid	"Authorized for user: %s\n"
 msgstr	"Angemeldet als Benutzer: %s\n"
 
-#: src/lang.c:81
+#: src/lang.c:82
 #, c-format
 msgid	"Authorization failed for user: %s\n"
 msgstr	"Anmeldung für den Benutzer \"%s\" fehlgeschlagen\n"
 
-#: src/lang.c:82
+#: src/lang.c:83
 #, c-format
 msgid	"\n"
 	"Autosubscribed to %s"
 msgstr	"\n"
 	"Automatisch abonniert: %s"
 
-#: src/lang.c:83
+#: src/lang.c:84
 msgid	"Autosubscribing groups...\n"
 msgstr	"Automatisches Abonnieren der Gruppen...\n"
 
-#: src/lang.c:84
+#: src/lang.c:85
 #, c-format
 msgid	"Autoselecting articles (use '%s' to see all unread) ..."
 msgstr	"Automatische Artikelauswahl ('%s' um alle ungelesenen zu sehen) ..."
 
-#: src/lang.c:85
+#: src/lang.c:87
 #, c-format
 msgid	"Active file corrupt - %s"
 msgstr	"Die Datei 'active' ist beschädigt - %s"
 
-#: src/lang.c:86
+#: src/lang.c:88
 #, c-format
 msgid	"Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: "
 msgstr	"Artikel verursachte Fehler/Warnungen. %s=beenden, %s=Menü, %s=editieren: "
 
-#: src/lang.c:87
+#: src/lang.c:89
 #, c-format
 msgid	"Unrecognized attribute: %s"
 msgstr	"Unbekannte Attribute: %s"
 
-#: src/lang.c:88
+#: src/lang.c:90
 #, c-format
 msgid	"Bad command. Type '%s' for help."
 msgstr	"Ungültiger Befehl. Drücken Sie '%s' für Hilfe."
 
-#: src/lang.c:90
+#: src/lang.c:92
 msgid	"Base article"
 msgstr	"Ursprungsartikel"
 
-#: src/lang.c:91
+#: src/lang.c:93
 msgid	"Base article range"
 msgstr	"Bereich für Ursprungsartikel"
 
-#: src/lang.c:92
+#: src/lang.c:94
 #, c-format
 msgid	"%s: Updating of index files not supported\n"
 msgstr	"%s: Aktualisieren der Index-Dateien nicht unterstützt\n"
 
-#: src/lang.c:93
+#: src/lang.c:95
 msgid	"*** Beginning of article ***"
 msgstr	"*** Anfang des Artikels ***"
 
-#: src/lang.c:94
+#: src/lang.c:97
 msgid	"Cancel (delete) or supersede (overwrite) article [%%.*s]? (%s/%s/%s): "
 msgstr	"[%%.*s] canceln (löschen) oder superseden (überschreiben)? (%s/%s/%s): "
 
-#: src/lang.c:95
+#: src/lang.c:98
 msgid	"Cancelling article..."
 msgstr	"Lösche Artikel..."
 
-#: src/lang.c:97
+#: src/lang.c:100
 #, c-format
 msgid	"Cannot create %s"
 msgstr	"Kann %s nicht erstellen"
 
-#: src/lang.c:98
+#: src/lang.c:101
 #, c-format
 msgid	"Can't find base article %d"
 msgstr	"Kann den Basisartikel %d nicht finden"
 
-#: src/lang.c:99
-msgid	"Cannot find NNTP server name"
-msgstr	"Kann den Namen des NNTP Servers nicht finden"
-
-#: src/lang.c:101
-#, c-format
-msgid	"%s: Can't get entry for TERM\n"
-msgstr	"%s: Kann den Wert für TERM nicht finden\n"
-
-#: src/lang.c:103
+#: src/lang.c:102
 #, c-format
 msgid	"Can't open %s"
 msgstr	"Kann %s nicht öffnen"
 
-#: src/lang.c:105
-#, c-format
-msgid	"Can't open %s. Try %s -r to read news via NNTP.\n"
-msgstr	"Kann %s nicht öffnen. Probieren Sie %s -r um via NNTP zu lesen.\n"
-
-#: src/lang.c:107
+#: src/lang.c:103
 #, c-format
 msgid	"Couldn't open %s for saving"
 msgstr	"Kann %s nicht speichern"
 
-#: src/lang.c:108
+#: src/lang.c:104
 msgid	"*** Posting not allowed ***"
 msgstr	"*** Posten nicht erlaubt ***"
 
-#: src/lang.c:109
+#: src/lang.c:105
 #, c-format
 msgid	"Posting is not allowed to %s"
 msgstr	"Posten nach %s ist nicht erlaubt"
 
-#: src/lang.c:110
+#: src/lang.c:106
 #, c-format
 msgid	"Can't retrieve %s"
 msgstr	"Kann %s nicht empfangen"
 
-#: src/lang.c:111
-#, c-format
-msgid	"Can't write index %s"
-msgstr	"Kann Index %s nicht schreiben"
-
-#: src/lang.c:112
+#: src/lang.c:107
 #, c-format
 msgid	"%s is a directory"
 msgstr	"%s ist ein Verzeichnis"
 
-#: src/lang.c:113
+#: src/lang.c:108
 msgid	"Catchup"
 msgstr	"Aufholen"
 
-#: src/lang.c:114
+#: src/lang.c:109
 #, c-format
 msgid	"Catchup %s..."
 msgstr	"Aufholen von %s..."
 
-#: src/lang.c:115
+#: src/lang.c:110
 msgid	"Catchup all groups entered during this session?"
 msgstr	"Alle betretenen Gruppen als gelesen markieren?"
 
-#: src/lang.c:116
+#: src/lang.c:111
 msgid	"You have tagged articles in this group - catchup anyway?"
 msgstr	"Markierte Artikel in der Gruppe - trotzdem aufholen (als gelesen markieren)?"
 
-#: src/lang.c:117
+#: src/lang.c:112
 #, c-format
 msgid	"%s %d %s in %lu seconds\n"
 msgstr	"%s %d %s in %lu Sekunden\n"
 
-#: src/lang.c:118
+#: src/lang.c:113
 msgid	"Caughtup"
 msgstr	"Aufgeholt"
 
-#: src/lang.c:119
+#: src/lang.c:114
 msgid	"Check Prepared Article"
 msgstr	"Überprüfe vorbereiteten Artikel"
 
-#: src/lang.c:120
+#: src/lang.c:115
 msgid	"Checking for new groups... "
 msgstr	"Prüfe, ob neue Gruppen vorhanden sind... "
 
-#: src/lang.c:121
+#: src/lang.c:116
 msgid	"Checking for news..."
 msgstr	"Prüfe, ob neue Artikel vorhanden sind..."
 
-#: src/lang.c:123
-#, c-format
-msgid	"\tChecksum of %s (%ld %s)"
-msgstr	"\tPrüfsumme für %s (%ld %s)"
-
-#: src/lang.c:125
+#: src/lang.c:117
 #, c-format
 msgid	"Post-process %s=no, %s=yes, %s=shar, %s=quit: "
 msgstr	"Nachbearbeiten %s=nein, %s=ja, %s=shar, %s=Ende: "
 
-#: src/lang.c:126
+#: src/lang.c:118
 msgid	"ANSI color disabled"
 msgstr	"ANSI Farben ausgeschaltet"
 
-#: src/lang.c:127
+#: src/lang.c:119
 msgid	"ANSI color enabled"
 msgstr	"ANSI Farben eingeschaltet"
 
-#: src/lang.c:128
+#: src/lang.c:120
 #, c-format
 msgid	"Command failed: %s"
 msgstr	"Befehl fehlgeschlagen: %s"
 
-#: src/lang.c:129
+#: src/lang.c:121
 msgid	"Mark not selected articles read?"
 msgstr	"Nicht ausgewählte (hot) Artikel auf gelesen setzen?"
 
-#: src/lang.c:130
+#: src/lang.c:122
 #, c-format
 msgid	"Connecting to %s..."
 msgstr	"Verbinde mit %s..."
 
-#: src/lang.c:131
-#, c-format
-msgid	"Connecting to %s:%d..."
-msgstr	"Verbinde mit %s:%d..."
-
-#: src/lang.c:132
-#, c-format
-msgid	"\n"
-	"Connection to %s: "
-msgstr	"\n"
-	"Verbindung mit %s: "
-
-#: src/lang.c:146
+#: src/lang.c:123
 msgid	"<CR>"
 msgstr	"<CR>"
 
-#: src/lang.c:147
+#: src/lang.c:124
 msgid	"Creating active file for saved groups...\n"
 msgstr	"Erzeuge die Datei 'active' für gespeicherte Gruppen...\n"
 
-#: src/lang.c:148
+#: src/lang.c:125
 msgid	"Creating newsrc file...\n"
 msgstr	"Erzeuge newsrc Datei...\n"
 
-#: src/lang.c:149
+#: src/lang.c:127 src/lang.c:1129
+msgid	"Default"
+msgstr	"Voreinstellung"
+
+#: src/lang.c:128
 msgid	"Delete saved files that have been post processed?"
 msgstr	"Löschen der gespeicherten Dateien, die nachbearbeitet wurden?"
 
-#: src/lang.c:150
+#: src/lang.c:129
 msgid	"Deleting temporary files..."
 msgstr	"Lösche temporäre Dateien..."
 
-#: src/lang.c:151
-msgid	"Disconnecting from server...\n"
-msgstr	"Trenne Verbindung zum Server...\n"
-
-#: src/lang.c:152
+#: src/lang.c:131
 msgid	"*** End of article ***"
 msgstr	"*** Ende des Artikels ***"
 
-#: src/lang.c:153
+#: src/lang.c:132
 msgid	"*** End of articles ***"
 msgstr	"*** Ende der Artikel ***"
 
-#: src/lang.c:154
+#: src/lang.c:133
 msgid	"*** End of groups ***"
 msgstr	"*** Ende der Gruppen ***"
 
-#: src/lang.c:155
+#: src/lang.c:134
 msgid	"*** End of thread ***"
 msgstr	"*** Ende des Threads ***"
 
-#: src/lang.c:156
+#: src/lang.c:135
 msgid	"Enter limit of articles to get> "
 msgstr	"Anzahl zu holender Artikel> "
 
-#: src/lang.c:157
+#: src/lang.c:136
 msgid	"Enter Message-ID to go to> "
 msgstr	"Message-ID, die Sie suchen> "
 
-#: src/lang.c:158
+#: src/lang.c:137
 msgid	" and enter next unread thread"
 msgstr	" und nächsten ungel. Thread betreten"
 
-#: src/lang.c:159
+#: src/lang.c:138
 msgid	" and enter next unread group"
 msgstr	" und betritt nächste Gruppe"
 
-#: src/lang.c:160
+#: src/lang.c:139
 msgid	"Enter option number> "
 msgstr	"Optionsnummer eingeben> "
 
-#: src/lang.c:161
+#: src/lang.c:140
 #, c-format
 msgid	"Enter range [%s]> "
 msgstr	"Bereich eingeben [%s]> "
 
-#: src/lang.c:162
+#: src/lang.c:141
 msgid	"\n"
 	"Warning: Approved: header used.\n"
 msgstr	"\n"
 	"Warnung: Approved:-Header benutzt.\n"
 
-#: src/lang.c:164
+#: src/lang.c:143
 msgid	"\n"
 	"Error: Bad address in Approved: header.\n"
 msgstr	"\n"
 	"Fehler: Ungültige Adresse im Approved:-Header.\n"
 
-#: src/lang.c:165
+#: src/lang.c:144
 msgid	"\n"
 	"Error: Bad address in From: header.\n"
 msgstr	"\n"
 	"Fehler: Ungültige Adresse im From:-Header.\n"
 
-#: src/lang.c:166
+#: src/lang.c:145
 msgid	"\n"
 	"Error: Bad address in Reply-To: header.\n"
 msgstr	"\n"
 	"Fehler: Ungültige Adresse im Reply-To:-Header.\n"
 
-#: src/lang.c:167
+#: src/lang.c:146
 msgid	"\n"
 	"Error: Bad FQDN in Message-ID: header.\n"
 msgstr	"\n"
 	"Error: Ungültiger FQDN im Message-ID:-Header.\n"
 
-#: src/lang.c:168
+#: src/lang.c:147
 #, c-format
 msgid	"Can't unlock %s"
 msgstr	"Kann Lock auf %s nicht entfernen"
 
-#: src/lang.c:170
+#: src/lang.c:149
 #, c-format
 msgid	"Corrupted file %s"
 msgstr	"Datei %s ist beschädigt"
 
-#: src/lang.c:171
+#: src/lang.c:150
 #, c-format
 msgid	"Couldn't dotlock %s - article not appended!"
 msgstr	"Konnte %s nicht dotlocken - Artikel nicht angehängt!"
 
-#: src/lang.c:172
+#: src/lang.c:151
 #, c-format
 msgid	"Couldn't lock %s - article not appended!"
 msgstr	"Konnte %s nicht locken - Artikel nicht angehängt!"
 
-#: src/lang.c:174
+#: src/lang.c:153
 msgid	"Internal error in GNKSA routine - send bug report.\n"
 msgstr	"Interner Fehler in der GNKSA Routine - Senden Sie einen Fehlerbericht.\n"
 
-#: src/lang.c:175
+#: src/lang.c:154
 msgid	"Left angle bracket missing in route address.\n"
 msgstr	"Linkes Größerzeichen '<' fehlt in Route-Adresse.\n"
 
-#: src/lang.c:176
+#: src/lang.c:155
 msgid	"Left parenthesis missing in old-style address.\n"
 msgstr	"Linke Klammer '(' fehlt in EMail-Adresse (alter Stil).\n"
 
-#: src/lang.c:177
+#: src/lang.c:156
 msgid	"Right parenthesis missing in old-style address.\n"
 msgstr	"Rechte Klammer ')' fehlt in EMail-Adresse (alter Stil).\n"
 
-#: src/lang.c:178
+#: src/lang.c:157
 msgid	"At-sign missing in mail address.\n"
 msgstr	"In der Mailadresse fehlt das '@'.\n"
 
-#: src/lang.c:179
+#: src/lang.c:158
 msgid	"Single component FQDN is not allowed. Add your domain.\n"
 msgstr	"Ein einteiliger FQDN ist nicht erlaubt. Fügen Sie ihre Domain hinzu.\n"
 
-#: src/lang.c:180
+#: src/lang.c:159
 msgid	"Invalid domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Unzulässige Domain. Senden Sie einen Fehlerbericht, wenn es ihre TL-Domain\n"
 	"wirklich gibt. Benutzen sie .invalid für bewusst falsche Adressen.\n"
 
-#: src/lang.c:181
+#: src/lang.c:160
 msgid	"Illegal domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Regelwidrige Domain. Senden Sie einen Fehlerbericht, wenn es ihre TL-Domain\n"
 	"wirklich gibt. Benutzen sie .invalid für bewusst falsche Adressen.\n"
 
-#: src/lang.c:182
+#: src/lang.c:161
 msgid	"Unknown domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Unbekannte Domain. Senden Sie einen Fehlerbericht, wenn es ihre TL-Domain\n"
 	"wirklich gibt. Benutzen sie .invalid für bewusst falsche Adressen.\n"
 
-#: src/lang.c:183
+#: src/lang.c:162
 msgid	"Illegal character in FQDN.\n"
 msgstr	"Ungültiges Zeichen im FQDN.\n"
 
-#: src/lang.c:184
+#: src/lang.c:163
 msgid	"Zero length FQDN component not allowed.\n"
 msgstr	"Der FQDN darf keine leere Komponente enthalten.\n"
 
-#: src/lang.c:185
+#: src/lang.c:164
 msgid	"FQDN component exceeds maximum allowed length (63 chars).\n"
 msgstr	"Eine Komponente des FQDN überschreitet die maximale Länge (63 Zeichen).\n"
 
-#: src/lang.c:186
+#: src/lang.c:165
 msgid	"FQDN component may not start or end with hyphen.\n"
 msgstr	"Komponenten des FQDN dürfen nicht mit einem Bindestrich beginnen.\n"
 
-#: src/lang.c:187
+#: src/lang.c:166
 msgid	"FQDN component may not start with digit.\n"
 msgstr	"Komponenten des FQDN dürfen nicht mit einer Zahl beginnen.\n"
 
-#: src/lang.c:188
+#: src/lang.c:167
 msgid	"Domain literal has impossible numeric value.\n"
 msgstr	"Die IP-Adresse ist nicht gültig.\n"
 
-#: src/lang.c:189
+#: src/lang.c:168
 msgid	"Domain literal is for private use only and not allowed for global use.\n"
 msgstr	"Die IP-Adresse ist ausschließlich für den privaten Gebrauch gedacht.\n"
 
-#: src/lang.c:190
+#: src/lang.c:169
 msgid	"Right bracket missing in domain literal.\n"
 msgstr	"Die rechte Klammer nach der IP-Adresse fehlt.\n"
 
-#: src/lang.c:191
+#: src/lang.c:170
 msgid	"Missing localpart of mail address.\n"
 msgstr	"Fehlender Lokalteil in der Mailadresse.\n"
 
-#: src/lang.c:192
+#: src/lang.c:171
 msgid	"Illegal character in localpart of mail address.\n"
 msgstr	"Ungültiges Zeichen im Lokalteil der Mailadresse.\n"
 
-#: src/lang.c:193
+#: src/lang.c:172
 msgid	"Zero length localpart component not allowed.\n"
 msgstr	"Eine leere Lokalteilkomponente ist nicht erlaubt.\n"
 
-#: src/lang.c:194
+#: src/lang.c:173
 msgid	"Illegal character in realname.\n"
 	"Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n"
 msgstr	"Ungültiges Zeichen im Realname.\n"
 	"Ungeschützte Wörter dürfen kein '!()<>@,;:\\.[]' in der Adresse enthalten.\n"
 
-#: src/lang.c:195
+#: src/lang.c:174
 msgid	"Illegal character in realname.\n"
 	"Quoted words may not contain '()<>\\'.\n"
 msgstr	"Ungültiges Zeichen im Realname.\n"
 	"Geschützte Wörter dürfen kein '()<>\\' enthalten.\n"
 
-#: src/lang.c:196
+#: src/lang.c:175
 msgid	"Illegal character in realname.\n"
 	"Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n"
 msgstr	"Ungültiges Zeichen im Realname.\n"
 	"Kodierte Wörter dürfen '!()<>@,;:\"\\.[]/=' nicht enthalten.\n"
 
-#: src/lang.c:197
+#: src/lang.c:176
 msgid	"Bad syntax in encoded word used in realname.\n"
 msgstr	"Falsche Syntax im kodierten Wort, das im Realname enthalten ist.\n"
 
-#: src/lang.c:198
+#: src/lang.c:177
 msgid	"Illegal character in realname.\n"
 	"Unquoted words may not contain '()<>\\' in old-style addresses.\n"
 msgstr	"Ungültiges Zeichen im Realname.\n"
 	"Ungeschützte Wörter dürfen kein '()<>\\' in Adressen enthalten (alter Stil).\n"
 
-#: src/lang.c:199
+#: src/lang.c:178
 msgid	"Illegal character in realname.\n"
 	"Control characters and unencoded 8bit characters > 127 are not allowed.\n"
 msgstr	"Ungültiges Zeichen im Realname.\n"
 	"Kontrollzeichen und unkodierte 8bit Zeichen > 127 sind verboten.\n"
 
-#: src/lang.c:200
+#: src/lang.c:179
 msgid	"\n"
 	"Error: No blank line found after header.\n"
 msgstr	"\n"
 	"Fehler: Keine Leerzeile nach dem Header gefunden.\n"
 
 #. TODO: fixme, US-ASCII is not the only 7bit charset we know about
-#: src/lang.c:202
+#: src/lang.c:181
 msgid	"\n"
 	"Error: Posting contains non-ASCII characters but MM_CHARSET is set to\n"
 	"       US-ASCII  - please change this setting to a suitable value for\n"
@@ -894,7 +863,7 @@ msgstr	"\n"
 	"        passenden  Wert für ihre  Sprache,  indem Sie  M)enü benutzen,\n"
 	"        oder direkt die tinrc ändern.\n"
 
-#: src/lang.c:207
+#: src/lang.c:186
 msgid	"\n"
 	"Error: Posting contains  non-ASCII characters  but the  MIME encoding\n"
 	"       for news  messages  is set  to \"7bit\"  -  please change this\n"
@@ -907,13 +876,13 @@ msgstr	"\n"
 	"        \"8bit\" oder \"quoted-printable\" - Zeichensatzabhängig -  via\n"
 	"         M)enü oder durch editieren der tinrc.\n"
 
-#: src/lang.c:213
+#: src/lang.c:192
 msgid	"\n"
 	"Error: Article starts with blank line instead of header\n"
 msgstr	"\n"
 	"Fehler: Der Artikel beginnt mit einer Leerzeile anstatt des Headers\n"
 
-#: src/lang.c:214
+#: src/lang.c:193
 #, c-format
 msgid	"\n"
 	"Error: Header on line %d does not have a colon after the header name:\n"
@@ -922,45 +891,21 @@ msgstr	"\n"
 	"Fehler: Der Header in Zeile %d enthält kein ':' nach seinem Bezeichner:\n"
 	"%s\n"
 
-#: src/lang.c:215
+#: src/lang.c:194
 #, c-format
 msgid	"\n"
 	"Error: The \"%s:\" line is empty.\n"
 msgstr	"\n"
 	"Fehler: Die \"%s:\" Zeile ist leer.\n"
 
-#: src/lang.c:217
-#, c-format
-msgid	"\n"
-	"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
-	"       The only allowable  space is the one  separating the colon (:)\n"
-	"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
-	"       newsgroup names.\n"
-msgstr	"\n"
-	"Fehler: Die \"%s:\" Zeile hat Leerzeichen, die entfernt werden MÜSSEN.\n"
-	"        Der einzig erlaubte Leerraum ist derjenige, der das ':'\n"
-	"        vom Inhalt trennt. Benutzen sie ein ',' um mehrere Newsgruppen\n"
-	"        anzugeben\n"
-
-#: src/lang.c:222
-#, c-format
-msgid	"\n"
-	"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
-	"       the line  may not  contain  whitespace,  this is  not allowed.\n"
-	"       Please write all newsgroups into a single line.\n"
-msgstr	"\n"
-	"Fehler: Die \"%s:\" Zeile ist in der nächsten Zeile fortgesetzt.\n"
-	"        Da diese Zeile keinen leeren Raum enthalten darf, ist dies nicht\n"
-	"        erlaubt. Bitte schreiben Sie alle Newsgruppen in eine Zeile\n"
-
-#: src/lang.c:227
+#: src/lang.c:195
 #, c-format
 msgid	"\n"
 	"Error: The \"%s:\" line is missing from the article header.\n"
 msgstr	"\n"
 	"Fehler: Die \"%s:\" Zeile fehlt im Artikel Header.\n"
 
-#: src/lang.c:228
+#: src/lang.c:196
 #, c-format
 msgid	"\n"
 	"Error: Header on line %d does not have a space after the colon:\n"
@@ -969,859 +914,934 @@ msgstr	"\n"
 	"Fehler: Der Header in der Zeile %d hat kein Leerzeichen nach dem ':' :\n"
 	"%s\n"
 
-#: src/lang.c:229
+#: src/lang.c:197
 #, c-format
 msgid	"\n"
 	"Error: There are multiple (%d) \"%s:\" lines in the header.\n"
 msgstr	"\n"
 	"Fehler: Es sind mehrere (%d) \"%s:\" Zeilen im Header.\n"
 
-#: src/lang.c:230
+#: src/lang.c:198
 #, c-format
 msgid	"Insecure permissions of %s (%o)"
 msgstr	"Unsichere Zugriffsbeschränkungen auf %s (%o)"
 
-#: src/lang.c:231 src/open.c:1080
+#: src/lang.c:199 src/open.c:1017
 #, c-format
 msgid	"Invalid response to GROUP command, %s"
 msgstr	"Ungültige Antwort auf GROUP-Befehl, %s"
 
-#: src/lang.c:233
+#: src/lang.c:201
 #, c-format
 msgid	"MIME parse error: Unexpected end of %s/%s article"
 msgstr	"Fehlerhafter %s/%s-Artikel: Unerwartetes Ende"
 
 # TRANSLATION MISSING
-#: src/lang.c:234
+#: src/lang.c:202
 msgid	"MIME parse error: Start boundary whilst reading headers"
 msgstr	""
 
-#: src/lang.c:235
+#: src/lang.c:203
 msgid	"Can't get a (fully-qualified) domain-name!\n"
 msgstr	"Kann keinen (vollqualifizierten) Domainnamen finden!\n"
 
-#: src/lang.c:236
+#: src/lang.c:204
 #, c-format
 msgid	"No permissions to go into %s\n"
 msgstr	"Keine Berechtigung um %s zu betreten\n"
 
-#: src/lang.c:237
+#: src/lang.c:205
 msgid	"\n"
 	"Error: From: line missing.\n"
 msgstr	"\n"
 	"Fehler: Die From: Zeile fehlt.\n"
 
-#: src/lang.c:238
+#: src/lang.c:206
 #, c-format
 msgid	"No read permissions for %s\n"
 msgstr	"Keine Leseberechtigung für %s\n"
 
-#: src/lang.c:239
+#: src/lang.c:207
 #, c-format
 msgid	"File %s does not exist\n"
 msgstr	"Datei %s existiert nicht\n"
 
-#: src/lang.c:240
+#: src/lang.c:208
 #, c-format
 msgid	"No write permissions for %s\n"
 msgstr	"Keine Schreibberechtigung für %s\n"
 
-#: src/lang.c:241
+#: src/lang.c:209
 msgid	"Can't get user information (/etc/passwd missing?)"
 msgstr	"Kann Benutzer-Infos nicht finden (/etc/passwd fehlt?)"
 
-#: src/lang.c:242
+#: src/lang.c:210
 msgid	"errors"
 msgstr	"Fehler"
 
-#: src/lang.c:243
+#: src/lang.c:211
 #, c-format
 msgid	"\n"
 	"Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n"
 msgstr	"\n"
 	"Fehler in Zeile %d: \"Sender:\" Header ist nicht erlaubt (wird hinzugefügt)\n"
 
-#: src/lang.c:244
+#: src/lang.c:212
 #, c-format
 msgid	"Server has non of the groups listed in %s"
 msgstr	"Server führt keine der Gruppen aus %s"
 
-#: src/lang.c:245
+#: src/lang.c:213
 msgid	"error"
 msgstr	"Fehler"
 
-#: src/lang.c:247
-msgid	"\n"
-	"socket or connect problem\n"
-msgstr	"\n"
-	"Socket oder Verbindungsproblem\n"
-
-#: src/lang.c:250
-msgid	"Server unavailable\n"
-msgstr	"Server nicht erreichbar\n"
-
-#: src/lang.c:253
+#: src/lang.c:214
 msgid	"Unknown display level"
 msgstr	"Unbekannter Level"
 
-#: src/lang.c:254
-#, c-format
-msgid	"%s/tcp: Unknown service.\n"
-msgstr	"%s/tcp: Unbekannter Service.\n"
-
-#: src/lang.c:255
-#, c-format
-msgid	"Wrong newsgroup name in response of GROUP command, %s for %s"
-msgstr	"Falsche Newsgruppe in Antwort auf GROUP-Befehl, %s statt %s"
-
-#: src/lang.c:256
+#: src/lang.c:215
 msgid	"<ESC>"
 msgstr	"<ESC>"
 
-#: src/lang.c:257
+#: src/lang.c:216
 msgid	"Exiting..."
 msgstr	"Beenden..."
 
-#: src/lang.c:258
+#: src/lang.c:217
 msgid	"leaving external mail-reader"
 msgstr	"Verlasse externen Mailreader"
 
-#: src/lang.c:259
+#: src/lang.c:218
 #, c-format
 msgid	"Extracting %s..."
 msgstr	"Entpacke %s..."
 
-#: src/lang.c:260
-#, c-format
-msgid	"Failed to connect to NNTP server %s. Exiting..."
-msgstr	"Konnte nicht zum NNTP Server %s verbinden. Beende..."
-
-#: src/lang.c:261
+#: src/lang.c:220
 #, c-format
 msgid	"Error writing %s file. Filesystem full? File reset to previous state."
 msgstr	"Fehler beim Schreiben von %s. Dateisystem voll? Datei zurückgesetzt."
 
-#: src/lang.c:262
+#: src/lang.c:221
 #, c-format
 msgid	"Error making backup of %s file. Filesystem full?"
 msgstr	"Fehler beim Erzeugen der Sicherung von %s. Dateisystem voll?"
 
-#: src/lang.c:263
+#: src/lang.c:222
 #, c-format
 msgid	"Filtering global rules (%d/%d)..."
 msgstr	"Filtern nach den globalen Regeln (%d/%d)..."
 
-#: src/lang.c:264
+#: src/lang.c:223
 msgid	"Rule created by: "
 msgstr	"Regel erstellt von: "
 
-#: src/lang.c:265
+#: src/lang.c:224
 #, c-format
 msgid	"Enter pattern [%s]> "
 msgstr	"Muster eingeben [%s]> "
 
-#: src/lang.c:266
+#: src/lang.c:225
 #, c-format
 msgid	"\n"
 	"You requested followups to your article to go to the following %s:\n"
 msgstr	"\n"
 	"Antworten auf ihre Artikel sollen in folgenden %s erscheinen:\n"
 
-#: src/lang.c:267
+#: src/lang.c:226
 #, c-format
 msgid	"  %s\t Answers will be directed to you by mail.\n"
 msgstr	"  %s\t Antworten erhalten Sie direkt per Mail.\n"
 
-#: src/lang.c:268
+#: src/lang.c:227
+msgid	"# Format:\n"
+	"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
+	"placed\n"
+	"#                     at the beginning of a rule, or they will be moved to "
+	"the\n"
+	"#                     next rule. '#' is not a valid keyword for a comment!\n"
+	"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
+	"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
+	"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
+	"#     score=NUM         A number (e.g. 70). Or:\n"
+	"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
+	"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
+	"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
+	"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n"
+	"#                     full references.\n"
+	"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
+	"#   msgid_only=STRING Optional. Like above, but without references.\n"
+	"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
+	"without\n"
+	"#                     Message-ID:\n"
+	"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
+	"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
+	"opt.\n"
+	"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
+	"#   time=NUM          Optional. time_t value when rule expires\n"
+	"#\n"
+msgstr	"# Format:\n"
+	"#   comment=STRING    Optionaler Kommentar. Es sind mehrere "
+	"Kommentareinträge\n"
+	"#                     Regel erlaubt. Kommentare müssen ganz am Anfang "
+	"stehen,\n"
+	"#                     sonst werden sie zur nächsten Regel verschoben. '#' "
+	"darf\n"
+	"#                     nicht im Kommentar vorkommen!\n"
+	"#   group=STRING      Liste der Newsgroups (z.B. comp.*,!*sources*) "
+	"[obligatorisch]\n"
+	"#   case=ZAHL         Groß/Kleinschreibung beim Filtern beachten=0,\n"
+	"#                     ignorieren=1        [obligatorisch]\n"
+	"#   score=ZAHL|STRING Score/Bewertung für diese Regel, entweder eine\n"
+	"#                     Zahl (z.B. 70) oder eines der beiden Schlüsselwörter\n"
+	"#                     'hot' oder 'kill'\n"
+	"#   subj=STRING       Subject(Betreff). (z.B. How to be a wizard)\n"
+	"#   from=STRING       From(Absender). (z.B. *Craig Shergold*)\n"
+	"#   msgid=STRING      Message-ID (z.B.<123@@ether.net>) kommt in Message-ID-\n"
+	"#                     oder References-Zeile vor. - Regel wirkt auf den "
+	"Artikel\n"
+	"#                     mit der M-ID und alle Antworten darauf.\n"
+	"#   msgid_last=STRING Message-ID-Header selbst und letzte Element von "
+	"References\n"
+	"#                     Regel wirkt auf Posting selbst oder _direkte_ "
+	"Antworten.\n"
+	"#   msgid_only=STRING Message-ID lautet (z.B.<123@@ether.net>).\n"
+	"#   refs_only=STRING  References-Header (z.B.<123@@ether.net>), kein\n"
+	"#                     Vergleich mit Message-ID-Header.\n"
+	"#   lines=[<>]?ZAHL   Zeilenanzahl (Lines-Header)\n"
+	"#   gnksa=[<>]?ZAHL   Rückgabewert der Funktion GNKSA parse_from()\n"
+	"#\n"
+	"#   xref=MUSTER       Muster passt auf Xref-Header (z.B. alt.flame*)\n"
+	"#\n"
+	"#   time=ZAHL         Ablaufdatum der Regel als time_t Wert\n"
+	"#                     (Anzahl der Sekunden seit 1970-01-01 00:00:00 UTC)\n"
+	"#\n"
+
+#: src/lang.c:248
 #, c-format
-msgid	"%s%s: Unknown host.\n"
-msgstr	"%s%s: Unbekannter Host.\n"
+msgid	"Enter score for rule (default=%d): "
+msgstr	"Bewertung für Regel (Standard=%d): "
 
-#: src/lang.c:269
-msgid	"Giving up...\n"
-msgstr	"Gebe auf...\n"
+#: src/lang.c:249
+#, c-format
+msgid	"Enter the score weight (range 0 < score <= %d)"
+msgstr	"Geben Sie die Höhe der Bewertung an (Bereich 0 < Bewertung <= %d)"
 
-#: src/lang.c:270
-msgid	"global "
-msgstr	"Global "
+#. SCORE_MAX
+#: src/lang.c:250
+msgid	"Full"
+msgstr	"Voll"
 
-#: src/lang.c:273
-#, c-format
-msgid	"Group %.*s ('q' to quit)..."
-msgstr	"Gruppe %.*s ('q' zum beenden...)"
+#: src/lang.c:251
+msgid	"Comment (optional)  : "
+msgstr	"Kommentar (optional): "
 
-#: src/lang.c:275
+#: src/lang.c:252
+msgid	"Apply pattern to    : "
+msgstr	"Wende Muster an auf : "
+
+#: src/lang.c:253
+msgid	"From: line (ignore case)      "
+msgstr	"From: Zeile (ignoriere Groß- Kleinschreibung)"
+
+#: src/lang.c:254
+msgid	"From: line (case sensitive)   "
+msgstr	"From: Zeile (Groß- Kleinschreibung beachten) "
+
+#: src/lang.c:256
 #, c-format
-msgid	"Group %.*s..."
-msgstr	"Gruppe %.*s..."
+msgid	"%s%s: Unknown host.\n"
+msgstr	"%s%s: Unbekannter Host.\n"
 
-#: src/lang.c:278
+#: src/lang.c:257
+msgid	"global "
+msgstr	"Global "
+
+#: src/lang.c:258
 #, c-format
 msgid	"Please use %.100s instead"
 msgstr	"Bitte %.100s statt dessen benutzen"
 
-#: src/lang.c:279
+#: src/lang.c:259
 #, c-format
 msgid	"Group %s is moderated. Continue?"
 msgstr	"Gruppe %s ist moderiert. Fortfahren?"
 
-#: src/lang.c:280
+#: src/lang.c:260
 msgid	"groups"
 msgstr	"Gruppen"
 
-#: src/lang.c:281
+#: src/lang.c:261
 msgid	"Top Level Commands"
 msgstr	"Top Level Befehle"
 
-#: src/lang.c:282
+#: src/lang.c:262
 msgid	"Group Selection"
 msgstr	"Gruppen-Auswahl"
 
-#: src/lang.c:283
+#: src/lang.c:263
 msgid	"group"
 msgstr	"Gruppe"
 
-#: src/lang.c:285
-msgid	"kill an article via a menu"
-msgstr	"killt einen Artikel mittels eines Menüs"
+#: src/lang.c:265
+msgid	"One or more lines of comment. <CR> to add a line or proceed if line is empty."
+msgstr	"Kommentarzeile(n). <CR> für nächsten Menüpunkt bzw. Ende der eingeg. Zeile."
 
-#: src/lang.c:286
-msgid	"auto-select (hot) an article via a menu"
-msgstr	"Filterregel (hochscoren) für Artikel via Menü erstellen"
+#: src/lang.c:266
+msgid	"From: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	"From: zum Filter hinzufügen. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:287
-msgid	"Browse URLs in article"
-msgstr	"URLs im Artikel mit Browser öffnen"
+#: src/lang.c:267
+msgid	"Linecount of articles to be filtered. < for less, > for more, = for equal."
+msgstr	"Zeilenzahl der Artikel, die gefiltert werden. < weniger, > mehr, = gleich."
 
-#: src/lang.c:288
-msgid	"0 - 9\t  display article by number in current thread"
-msgstr	"0 - 9\t  zeigt Artikel nach Nummern sortiert im aktuellen Thread"
+#: src/lang.c:268
+msgid	"Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	"Message-ID: zum Filter hinzufügen. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:289
-msgid	"cancel (delete) current article; must have been posted by you"
-msgstr	"cancelt (löscht) den aktuellen Artikel; dieser muß von Ihnen sein"
+#: src/lang.c:269
+msgid	"Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	"Subject: zum Filter hinzufügen. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:290
-msgid	"edit article (mail-groups only)"
-msgstr	"editiere Artikel (nur bei Mail-Gruppen)"
+#: src/lang.c:270
+msgid	"Enter text pattern to filter if Subject: & From: lines are not what you want."
+msgstr	"Textmuster zum Filtern, wenn Subject: & From: nicht ihren Wünschen entspricht."
+
+#: src/lang.c:271
+msgid	"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
+msgstr	"Wähle worauf das Textmuster angewendet wird. <SPACE> wechselt & <CR> setzt."
+
+#: src/lang.c:272
+msgid	"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
+msgstr	"Gültigkeitsdauer in Tagen für den Filter. <SPACE> wechselt & <CR> setzt."
+
+#: src/lang.c:273
+msgid	"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr	"Filterregel gilt für aktuelle/alle Gruppe(n). <SPACE> wechselt & <CR> setzt."
+
+#: src/lang.c:274
+msgid	"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr	"Filterregel gilt für aktuelle/allen Gruppe(n).<SPACE> wechselt & <CR> setzt."
+
+#: src/lang.c:275
+msgid	"kill an article via a menu"
+msgstr	"killt einen Artikel mittels eines Menüs"
+
+#: src/lang.c:276
+msgid	"auto-select (hot) an article via a menu"
+msgstr	"Filterregel (hochscoren) für Artikel via Menü erstellen"
+
+#: src/lang.c:277
+msgid	"Browse URLs in article"
+msgstr	"URLs im Artikel mit Browser öffnen"
+
+#: src/lang.c:278
+msgid	"0 - 9\t  display article by number in current thread"
+msgstr	"0 - 9\t  zeigt Artikel nach Nummern sortiert im aktuellen Thread"
+
+#: src/lang.c:279
+msgid	"cancel (delete) current article; must have been posted by you"
+msgstr	"cancelt (löscht) den aktuellen Artikel; dieser muß von Ihnen sein"
+
+#: src/lang.c:280
+msgid	"edit article (mail-groups only)"
+msgstr	"editiere Artikel (nur bei Mail-Gruppen)"
 
-#: src/lang.c:291
+#: src/lang.c:281
 msgid	"display first article in current thread"
 msgstr	"ersten Artikel im aktuellen Thread anzeigen"
 
-#: src/lang.c:292
+#: src/lang.c:282
 msgid	"display first page of article"
 msgstr	"zeigt erste Seite des Artikels an"
 
-#: src/lang.c:293
+#: src/lang.c:283
 msgid	"post followup to current article"
 msgstr	"aktuellen Artikel beantworten (followup)"
 
-#: src/lang.c:294
+#: src/lang.c:284
 msgid	"post followup (don't copy text) to current article"
 msgstr	"aktuellen Artikel beantworten, ohne Zitieren des Textes"
 
-#: src/lang.c:295
+#: src/lang.c:285
 msgid	"post followup to current article quoting complete headers"
 msgstr	"aktuellen Artikel beantworten, mit Komplettzitat der Header"
 
-#: src/lang.c:296
+#: src/lang.c:286
 msgid	"display last article in current thread"
 msgstr	"letzten Artikel im aktuellen Thread anzeigen"
 
-#: src/lang.c:297
+#: src/lang.c:287
 msgid	"display last page of article"
 msgstr	"letzte Seite des Artikels anzeigen"
 
-#: src/lang.c:298
+#: src/lang.c:288
 msgid	"mark rest of thread as read and advance to next unread"
 msgstr	"markiere Rest des Thread als gelesen, springe zu nächstem ungelesenen"
 
-#: src/lang.c:299
+#: src/lang.c:289
 msgid	"display next article"
 msgstr	"nächsten Artikel anzeigen"
 
-#: src/lang.c:300
+#: src/lang.c:290
 msgid	"display first article in next thread"
 msgstr	"zeigt den ersten Artikel im nächsten Thread an"
 
-#: src/lang.c:301 src/lang.c:311 src/lang.c:382 src/lang.c:383
+#: src/lang.c:291 src/lang.c:298 src/lang.c:357 src/lang.c:358
 msgid	"display next unread article"
 msgstr	"nächsten ungelesenen Artikel anzeigen"
 
-#: src/lang.c:302
+#: src/lang.c:292
 msgid	"go to the article that this one followed up"
 msgstr	"(Bezugs)Artikel anzeigen, den der aktuelle Artikel beantwortet hat"
 
-#: src/lang.c:304
-msgid	"perform PGP operations on article"
-msgstr	"wendet PGP auf den Artikel an"
-
-#: src/lang.c:306
+#: src/lang.c:293
 msgid	"display previous article"
 msgstr	"vorhergehenden Artikel anzeigen"
 
-#: src/lang.c:307 src/lang.c:385
+#: src/lang.c:294 src/lang.c:360
 msgid	"display previous unread article"
 msgstr	"vorhergehenden ungelesenen Artikel anzeigen"
 
-#: src/lang.c:308
+#: src/lang.c:295
 msgid	"quickly kill an article using defaults"
 msgstr	"killt einen Artikel schnell und benutzt dabei die Voreinstellungen"
 
-#: src/lang.c:309
+#: src/lang.c:296
 msgid	"quickly auto-select (hot) an article using defaults"
 msgstr	"markiert (hervorheben) Artikel und benutzt die Voreinstellungen"
 
-#: src/lang.c:310
+#: src/lang.c:297
 msgid	"return to group selection level"
 msgstr	"kehrt zum Gruppenauswahlmenü zurück"
 
-#: src/lang.c:312
+#: src/lang.c:299
 msgid	"reply through mail to author"
 msgstr	"Antwort per Mail an den Autor"
 
-#: src/lang.c:313
+#: src/lang.c:300
 msgid	"reply through mail (don't copy text) to author"
 msgstr	"Antwort per Mail an den Autor (ohne Zitieren des Textes)"
 
-#: src/lang.c:314
+#: src/lang.c:301
 msgid	"reply through mail to author quoting complete headers"
 msgstr	"Antwort per Mail an den Autor, wobei der komplette Header zitiert wird"
 
-#: src/lang.c:315 src/lang.c:387
+#: src/lang.c:302 src/lang.c:362
 msgid	"repost chosen article to another group"
 msgstr	"gewählten Artikel in eine andere Gruppe reposten"
 
-#: src/lang.c:316
+#: src/lang.c:303
 msgid	"search backwards within this article"
 msgstr	"sucht rückwärts innerhalb des Artikels"
 
-#: src/lang.c:317
+#: src/lang.c:304
 msgid	"search forwards within this article"
 msgstr	"sucht vorwärts innerhalb des Artikels"
 
-#: src/lang.c:318
+#: src/lang.c:305
 msgid	"show article in raw-mode (including all headers)"
 msgstr	"Artikel im Rohformat (inklusive aller Header) anzeigen"
 
-#: src/lang.c:319
+#: src/lang.c:306
 msgid	"skip next block of included text"
 msgstr	"überspringt den nächsten Zitatblock"
 
-#: src/lang.c:320
+#: src/lang.c:307
 msgid	"toggle display of sections hidden by a form-feed (^L) on/off"
 msgstr	"schalte Anzeige von durch Form-Feed (^L) versteckten Teilen ein/aus"
 
-#: src/lang.c:321
+#: src/lang.c:308
 msgid	"toggle word highlighting on/off"
 msgstr	"schaltet das Wort-Hervorheben ein/aus"
 
-#: src/lang.c:322
+#: src/lang.c:309
 msgid	"toggle ROT-13 (basic decode) for current article"
 msgstr	"(de)aktiviert ROT-13 Dekodierung für den aktuellen Artikel"
 
-#: src/lang.c:323
+#: src/lang.c:310
 msgid	"toggle tabwidth 4 <-> 8"
 msgstr	"wechsle Tabulatorweite 4 <-> 8"
 
-#: src/lang.c:324
+#: src/lang.c:311
 msgid	"toggle german TeX style decoding for current article"
 msgstr	"(de)aktiviere deutsche TeX-style Dekodierung für aktuellen Artikel"
 
-#: src/lang.c:325
+#: src/lang.c:312
 msgid	"toggle display of uuencoded sections"
 msgstr	"Anzeige von UU-kodierten Teilen umschalten"
 
-#: src/lang.c:326
+#: src/lang.c:313
 msgid	"View/save multimedia attachments"
 msgstr	"Multimedia-Anhänge anzeigen/speichern"
 
-#: src/lang.c:327
+#: src/lang.c:314
 #, c-format
 msgid	"report bug or comment via mail to %s"
 msgstr	"sendet Fehlerbericht oder Kommentar via Mail an %s"
 
-#: src/lang.c:328
+#: src/lang.c:315
 msgid	"choose range of articles to be affected by next command"
 msgstr	"Bereich der Artikel, die vom nächsten Kommando betroffen sind"
 
-#: src/lang.c:329
+#: src/lang.c:316
 msgid	"escape from command prompt"
 msgstr	"Verlassen der Kommandozeile"
 
-#: src/lang.c:330
+#: src/lang.c:317
 msgid	"get help"
 msgstr	"zeigt die Hilfe"
 
-#: src/lang.c:331
+#: src/lang.c:318
 msgid	"display last article viewed"
 msgstr	"zeigt den zuletzt angezeigten Artikel an"
 
-#: src/lang.c:332
+#: src/lang.c:319
 msgid	"down one line"
 msgstr	"eine Zeile runter"
 
-#: src/lang.c:333
+#: src/lang.c:320
 msgid	"up one line"
 msgstr	"eine Zeile hoch"
 
-#: src/lang.c:334
+#: src/lang.c:321
 msgid	"go to article chosen by Message-ID"
 msgstr	"Artikel mit dieser Message-ID anzeigen"
 
-#: src/lang.c:335
+#: src/lang.c:322
 msgid	"mail article/thread/hot/pattern/tagged articles to someone"
 msgstr	"Artikel/Thread/hervorgeh./markierten Artikel per Mail weiterleiten"
 
-#: src/lang.c:336
+#: src/lang.c:323
 msgid	"menu of configurable options"
 msgstr	"Menü der konfigurierbaren Optionen"
 
-#: src/lang.c:337
+#: src/lang.c:324
 msgid	"down one page"
 msgstr	"eine Seite runter"
 
-#: src/lang.c:338
+#: src/lang.c:325
 msgid	"up one page"
 msgstr	"eine Seite hoch"
 
-#: src/lang.c:340
-msgid	"pipe article/thread/hot/pattern/tagged articles into command"
-msgstr	"pipet Artikel/thread hervorgehoben/muster/markierten Artikel"
-
-#: src/lang.c:342
+#: src/lang.c:326
 msgid	"post (write) article to current group"
 msgstr	"poste (schreibe) Artikel in die aktuelle Gruppe"
 
-#: src/lang.c:343
+#: src/lang.c:327
 msgid	"post postponed articles"
 msgstr	"poste zurückgestellte Artikel"
 
-#: src/lang.c:344
+#: src/lang.c:328
 msgid	"list articles posted by you (from posted file)"
 msgstr	"listet ihre geposteten Artikel auf (aus der 'posted' Datei)"
 
-#: src/lang.c:345
+#: src/lang.c:329
 msgid	"return to previous menu"
 msgstr	"kehrt zum vorherigen Menü zurück"
 
-#: src/lang.c:347
-msgid	"output article/thread/hot/pattern/tagged articles to printer"
-msgstr	"druckt Artikel/Thread/hervorgehobene/Muster/markierten"
-
-#: src/lang.c:349
+#: src/lang.c:330
 msgid	"quit tin immediately"
 msgstr	"beendet tin sofort"
 
-#: src/lang.c:350
+#: src/lang.c:331
 msgid	"redraw page"
 msgstr	"Bildschirmdarstellung neu zeichnen"
 
-#: src/lang.c:351
+#: src/lang.c:332
 msgid	"save article/thread/hot/pattern/tagged articles to file"
 msgstr	"speichert Artikel/Thread hervorgehoben/muster/markierten Artikel"
 
-#: src/lang.c:352
+#: src/lang.c:333
 msgid	"save marked articles automatically without user prompts"
 msgstr	"speichert markierte Artikel automatisch ohne Nachfrage"
 
-#: src/lang.c:353
+#: src/lang.c:334
 msgid	"search for articles by author backwards"
 msgstr	"sucht rückwärts nach Artikeln von Autor"
 
-#: src/lang.c:354
+#: src/lang.c:335
 msgid	"search for articles by author forwards"
 msgstr	"sucht vorwärts nach Artikeln von Autor"
 
-#: src/lang.c:355
+#: src/lang.c:336
 msgid	"search all articles for a given string (this may take some time)"
 msgstr	"sucht in allen Artikel nach vorgegebener Zeichenkette (kann dauern)"
 
 # TODO: formating
-#: src/lang.c:356
+#: src/lang.c:337
 msgid	" \t  (searches are case-insensitive and wrap around to all articles)"
 msgstr	" \t  (Suchen beachten Gross/Kleinschreibung nicht und laufen über den\n"
 	"          letzten Artikel hinaus zum ersten Artikel der Gruppe und von dort\n"
 	"          aus weiter.)"
 
-#: src/lang.c:357
+#: src/lang.c:338
 msgid	"search for articles by Subject line backwards"
 msgstr	"durchsucht Artikel rückwärts nach Subject Zeile"
 
-#: src/lang.c:358
+#: src/lang.c:339
 msgid	"search for articles by Subject line forwards"
 msgstr	"durchsucht Artikel vorwärts nach Subject Zeile"
 
-#: src/lang.c:359
+#: src/lang.c:340
 msgid	"repeat last search"
 msgstr	"letzte Suche wiederholen"
 
-#: src/lang.c:361
-msgid	"shell escape"
-msgstr	"Ausgang zur Shell"
-
-#: src/lang.c:363
+#: src/lang.c:341
 msgid	"tag current article for reposting/mailing/piping/printing/saving"
 msgstr	"markiere Artikel für nochmaliges posten/pipen/drucken/abspeichern"
 
-#: src/lang.c:365
-msgid	"toggle color"
-msgstr	"Farben ein/aus"
-
-#: src/lang.c:367
+#: src/lang.c:342
 msgid	"toggle info message in last line (subject/description)"
 msgstr	"Anzeige von Subject/Beschreibung in d. letzten Zeile (de)aktivieren"
 
-#: src/lang.c:368
+#: src/lang.c:343
 msgid	"toggle inverse video"
 msgstr	"(de)aktiviert inverse Darstellung"
 
-#: src/lang.c:369
+#: src/lang.c:344
 msgid	"toggle mini help menu display"
 msgstr	"schaltet das Minihilfemenü ein/aus"
 
-#: src/lang.c:370
+#: src/lang.c:345
 msgid	"show version information"
 msgstr	"zeige Versionsinformationen"
 
-#: src/lang.c:371
+#: src/lang.c:346
 msgid	"mark all articles as read and return to group selection menu"
 msgstr	"markiert alle Artikel als gelesen und kehrt zum Gruppenmenü zurück"
 
-#: src/lang.c:372
+#: src/lang.c:347
 msgid	"mark all articles as read and enter next group with unread articles"
 msgstr	"markiere Artikel gelesen; öffne nä. Gruppe mit ungelesenen Artikeln"
 
-#: src/lang.c:373
+#: src/lang.c:348
 msgid	"choose first thread in list"
 msgstr	"Wähle ersten Thread in der Liste"
 
-#: src/lang.c:374 src/lang.c:405
+#: src/lang.c:349 src/lang.c:380
 msgid	"choose group by name"
 msgstr	"Gruppe anhand des Namens auswählen"
 
-#: src/lang.c:375
+#: src/lang.c:350
 msgid	"choose last thread in list"
 msgstr	"Wähle letzten Thread in der Liste"
 
-#: src/lang.c:376
+#: src/lang.c:351
 msgid	"list articles within current thread (bring up Thread sub-menu)"
 msgstr	"listet Artikel im aktuellen Thread (öffnet das Thread Untermenü)"
 
-#: src/lang.c:377
+#: src/lang.c:352
 msgid	"mark article as unread"
 msgstr	"markiert Artikel als ungelesen"
 
-#: src/lang.c:378
+#: src/lang.c:353
 msgid	"mark current thread as read"
 msgstr	"markiert den aktuellen Thread als gelesen"
 
-#: src/lang.c:379
+#: src/lang.c:354
 msgid	"mark thread as unread"
 msgstr	"markiert den aktuellen Thread als ungelesen"
 
-#: src/lang.c:380
+#: src/lang.c:355
 msgid	"toggle display of all/selected articles"
 msgstr	"wechselt zwischen der Anzeige aller/markierter (hot) Artikel"
 
-#: src/lang.c:381
+#: src/lang.c:356
 msgid	"display next group"
 msgstr	"zeige nächste Gruppe"
 
-#: src/lang.c:384
+#: src/lang.c:359
 msgid	"display previous group"
 msgstr	"zeige vorhergehende Gruppe"
 
-#: src/lang.c:386 src/lang.c:434
+#: src/lang.c:361 src/lang.c:409
 msgid	"read chosen article"
 msgstr	"zeige gewählten Artikel"
 
-#: src/lang.c:388
+#: src/lang.c:363
 msgid	"toggle all selections (all articles)"
 msgstr	"Markierung 'hot'/wichtig für alle Artikel umschalten"
 
-#: src/lang.c:389
+#: src/lang.c:364
 msgid	"select group (make \"hot\")"
 msgstr	"Markierung 'hot'/wichtig für Gruppe setzen"
 
-#: src/lang.c:390
+#: src/lang.c:365
 msgid	"select thread"
 msgstr	"Markierung 'hot'/wichtig für Thread setzen"
 
 # TODO: formating
-#: src/lang.c:391
+#: src/lang.c:366
 msgid	"select threads if at least one unread article is selected"
 msgstr	"Markierung 'hot'/wichtig für alle Threads setzen, die schon einen\n"
 	"          ungelesenen Artikel mit Markierung 'hot'/wichtig enthalten."
 
 # TODO: formating
-#: src/lang.c:392
+#: src/lang.c:367
 msgid	"select threads that match user specified pattern"
 msgstr	"Markierung 'hot'/wichtig für alle Threads setzen, die einem\n"
 	"          gewählten Muster entsprechen"
 
-#: src/lang.c:393
+#: src/lang.c:368
 msgid	"tag all parts of current multipart-message in order"
 msgstr	"markiert alle Teile der multipart-Nachrichten in der Reihenfolge"
 
-#: src/lang.c:394
+#: src/lang.c:369
 msgid	"0 - 9\t  choose thread by number"
 msgstr	"0 - 9\t  wählt Thread anhand der Nummer"
 
-#: src/lang.c:395
+#: src/lang.c:370
 msgid	"toggle limit number of articles to get, and reload"
 msgstr	"Anzahl der zu holenden oder wieder zu ladenden Artikel ändern"
 
-#: src/lang.c:396
+#: src/lang.c:371
 msgid	"toggle display of all/unread articles"
 msgstr	"wechselt zwischen der Anzeige aller/ungelesener Artikel"
 
-#: src/lang.c:397 src/lang.c:435
+#: src/lang.c:372 src/lang.c:410
 msgid	"cycle the display of authors email address, real name, both or neither"
 msgstr	"Zeigt des Autors EMail Adresse, Realname, beides oder keins an"
 
-#: src/lang.c:398
+#: src/lang.c:373
 msgid	"toggle selection of thread"
 msgstr	"Markierung 'hot'/wichtig für Thread setzen/entfernen"
 
-#: src/lang.c:399
+#: src/lang.c:374
 msgid	"cycle through threading options available"
 msgstr	"wechsle durch die verschiedenen Threading-Optionen"
 
-#: src/lang.c:400
+#: src/lang.c:375
 msgid	"undo all selections (all articles)"
 msgstr	"Markierung 'hot'/wichtig für alle Artikel entfernen"
 
-#: src/lang.c:401
+#: src/lang.c:376
 msgid	"untag all tagged threads"
 msgstr	"hebt die Markierung der markierten Artikel auf"
 
-#: src/lang.c:402
+#: src/lang.c:377
 msgid	"mark all articles in group as read"
 msgstr	"markiert alle Artikel der Gruppe als gelesen"
 
-# TRANSLATION MISSING
-#: src/lang.c:403
+#: src/lang.c:378
 msgid	"mark all articles in group as read and move to next unread group"
-msgstr	""
+msgstr	"markiert Gruppe als gelesen, springt zur nächsten mit ungel. Artikeln"
 
-#: src/lang.c:404
+#: src/lang.c:379
 msgid	"choose first group in list"
 msgstr	"Wähle erste Gruppe in der Liste"
 
-#: src/lang.c:406
+#: src/lang.c:381
 msgid	"0 - 9\t  choose group by number"
 msgstr	"0 - 9\t  wählt die Gruppe anhand der Nummer"
 
-#: src/lang.c:407
+#: src/lang.c:382
 msgid	"choose range of groups to be affected by next command"
 msgstr	"Bereich der Gruppen, die vom nächsten Kommando betroffen sind"
 
-#: src/lang.c:408
+#: src/lang.c:383
 msgid	"choose last group in list"
 msgstr	"Wähle letzte Gruppe in der Liste"
 
-#: src/lang.c:409
+#: src/lang.c:384
 msgid	"mark all articles in chosen group unread"
 msgstr	"markiert alle Artikel in der gewählten Gruppe als ungelesen"
 
-#: src/lang.c:410
+#: src/lang.c:385
 msgid	"move chosen group within list"
 msgstr	"bewegt die gewählte Gruppe innerhalb der Liste"
 
-#: src/lang.c:411
+#: src/lang.c:386
 msgid	"choose next group with unread news"
 msgstr	"wählt die nächste Gruppe mit ungelesenen Artikeln"
 
-#: src/lang.c:412 src/lang.c:913
+#: src/lang.c:387 src/lang.c:1176
 msgid	"quit"
 msgstr	"Beenden"
 
-#: src/lang.c:413
+#: src/lang.c:388
 msgid	"quit without saving configuration changes"
 msgstr	"beenden ohne die Konfigurationsänderungen zu sichern"
 
-#: src/lang.c:414
+#: src/lang.c:389
 msgid	"read chosen group"
 msgstr	"liest ausgewählte Gruppe"
 
-#: src/lang.c:415
+#: src/lang.c:390
 msgid	"reset .newsrc (all available articles in groups marked unread)"
 msgstr	"setzt die .newsrc zurück (alle Artikel als gelesen markiert)"
 
-#: src/lang.c:416
+#: src/lang.c:391
 msgid	"search backwards for a group name"
 msgstr	"sucht rückwärts nach einem Gruppennamen"
 
-#: src/lang.c:417
+#: src/lang.c:392
 msgid	" \t  (all searches are case-insensitive and wrap around)"
 msgstr	" \t  (alle Suchen sind case-insensitive und beginnen am Ende von vorn)"
 
-#: src/lang.c:418
+#: src/lang.c:393
 msgid	"search forwards for a group name"
 msgstr	"suche vorwärts nach einer Gruppe"
 
-#: src/lang.c:419
+#: src/lang.c:394
 msgid	"subscribe to chosen group"
 msgstr	"abonniert ausgewählte Gruppe"
 
-#: src/lang.c:420
+#: src/lang.c:395
 msgid	"subscribe to groups that match pattern"
 msgstr	"abonniere Gruppen, die auf das Muster passen"
 
-#: src/lang.c:421
+#: src/lang.c:396
 msgid	"reread active file to check for any new news"
 msgstr	"lies die Datei 'active' neu ein, um nach neuen Artikeln zu suchen"
 
-#: src/lang.c:422
+#: src/lang.c:397
 msgid	"toggle display of group name only or group name plus description"
 msgstr	"Anzeige der Kurzbeschreibung der Gruppe (de)aktivieren."
 
-#: src/lang.c:423
+#: src/lang.c:398
 msgid	"toggle display to show all/unread subscribed groups"
 msgstr	"wechselt die Anzeige zwischen allen/ungelesenen abonnierten Gruppen"
 
-#: src/lang.c:424
+#: src/lang.c:399
 msgid	"unsubscribe from chosen group"
 msgstr	"bestellt ausgewählte Gruppe ab"
 
-#: src/lang.c:425
+#: src/lang.c:400
 msgid	"unsubscribe from groups that match pattern"
 msgstr	"bestelle Gruppen ab, die auf das Muster passen"
 
-#: src/lang.c:426
+#: src/lang.c:401
 msgid	"sort the list of groups"
 msgstr	"Liste der Gruppen sortieren"
 
-#: src/lang.c:427
+#: src/lang.c:402
 msgid	"toggle display to show all/subscribed groups"
 msgstr	"schaltet um zwischen der Anzeige aller/abonnierten Gruppen"
 
-#: src/lang.c:428
+#: src/lang.c:403
 msgid	"0 - 9\t  choose article by number"
 msgstr	"0 - 9\t  Wähle Artikel anhand der Nummer"
 
-#: src/lang.c:429
+#: src/lang.c:404
 msgid	"mark thread as read and return to group index page"
 msgstr	"markiert den Thread als gelesen und kehrt zum Gruppenindex zurück"
 
-#: src/lang.c:430
+#: src/lang.c:405
 msgid	"mark thread as read and enter next unread thread or group"
 msgstr	"markiert Thread als gelesen; nächster ungelesener Thread/Gruppe"
 
-#: src/lang.c:431
+#: src/lang.c:406
 msgid	"choose first article in list"
 msgstr	"wähle ersten Artikel in der Liste"
 
-#: src/lang.c:432
+#: src/lang.c:407
 msgid	"choose last article in list"
 msgstr	"wähle letzten Artikel in der Liste"
 
-#: src/lang.c:433
+#: src/lang.c:408
 msgid	"mark article as read and move cursor to next unread article"
 msgstr	"markiert Artikel als gelesen geht zum nächsten ungelesenen Artikel"
 
-#: src/lang.c:436
+#: src/lang.c:411
 msgid	"Display properties\n"
 	"------------------"
 msgstr	"Darstellungsoptionen\n"
 	"--------------------"
 
-#: src/lang.c:437
+#: src/lang.c:412
 msgid	"Miscellaneous\n"
 	"-------------"
 msgstr	"Verschiedenes\n"
 	"-------------"
 
-#: src/lang.c:438
+#: src/lang.c:413
 msgid	"Moving around\n"
 	"-------------"
 msgstr	"Position ändern\n"
 	"---------------"
 
-#: src/lang.c:439
+#: src/lang.c:414
 msgid	"Group/thread/article operations\n"
 	"-------------------------------"
 msgstr	"Gruppe/Thread/Artikel Kommandos\n"
 	"-------------------------------"
 
-#: src/lang.c:440
+#: src/lang.c:416
 msgid	"Group Level Commands"
 msgstr	"Gruppenlevel Befehle"
 
-#: src/lang.c:441
+#: src/lang.c:417
 msgid	"Kill filter added"
 msgstr	"Killfilter hinzugefügt"
 
-#: src/lang.c:442
+#: src/lang.c:418
 msgid	"Auto-selection filter added"
 msgstr	"Automatischer Auswahlfilter hinzugefügt"
 
-#: src/lang.c:443
+#: src/lang.c:419
 msgid	"All parts tagged"
 msgstr	"Alle Teile markiert"
 
-#: src/lang.c:444
+#: src/lang.c:420
 msgid	"Storing article for later posting"
 msgstr	"Speichert Artikel, um ihn später zu posten"
 
-#: src/lang.c:445
+#: src/lang.c:421
 msgid	"Please enter a valid character"
 msgstr	"Bitte ein gültiges Zeichen eingeben"
 
-#: src/lang.c:446
+#: src/lang.c:422
 #, c-format
 msgid	"Missing part #%d"
 msgstr	"Teil Nummer %d fehlt."
 
-#: src/lang.c:447
+#: src/lang.c:423
 msgid	"*** No postponed articles ***"
 msgstr	"*** Keine zurückgelegten Artikel ***"
 
-#: src/lang.c:448
+#: src/lang.c:424
 msgid	"Not a multi-part message"
 msgstr	"Kein mehrteiliger Artikel"
 
-#: src/lang.c:449
+#: src/lang.c:425
 msgid	"You are not subscribed to this group"
 msgstr	"Sie haben diese Gruppe nicht abonniert"
 
-#: src/lang.c:450
+#: src/lang.c:426
 msgid	"No previous expression"
 msgstr	"Kein vorhergehender Ausdruck"
 
-#: src/lang.c:451
+#: src/lang.c:427
 msgid	"Operation disabled in no-overwrite mode"
 msgstr	"Ausführung nicht möglich im nicht-überschreiben Modus"
 
 #. TODO: replace hardcoded key-name in txt_info_postponed
-#: src/lang.c:453
+#: src/lang.c:429
 #, c-format
 msgid	"%d postponed %s, reuse with ^O...\n"
 msgstr	"%d zurückgelegte %s, hervorholen mit ^O...\n"
 
-#: src/lang.c:454
+#: src/lang.c:430
 msgid	"X-Conversion-Note: multipart/alternative contents have been removed.\n"
 	"  To get the whole article, turn alternative handling OFF in the Option Menu\n"
 msgstr	"X-Conversion-Note: multipart/alternative Inhalt wurde entfernt.\n"
 	"  Um das zu ändern, setzen Sie in der tinrc das alternative_handling auf OFF\n"
 
-#: src/lang.c:456
+#: src/lang.c:432
 #, c-format
 msgid	"Save filename for %s/%s is a mailbox. Attachment not saved"
 msgstr	"Dateiname für %s/%s ist eine Mailbox. Anhang nicht gespeichert"
 
-#: src/lang.c:457
+#: src/lang.c:433
 msgid	"TeX2Iso encoded article"
 msgstr	"TeX2Iso kodierter Artikel"
 
-#: src/lang.c:458
+#: src/lang.c:434
 msgid	"incomplete "
 msgstr	"unvollständige "
 
 #. TODO: replace hardcoded key-names
-#: src/lang.c:460
+#: src/lang.c:436
 #, c-format
 msgid	"\n"
 	"Welcome to %s, a full screen threaded Netnews reader. It can read news "
@@ -1879,130 +1899,129 @@ msgstr	"\n"
 	"Bitte senden Sie Fehlerberichte und Kommentare mittels des 'R' Kommandos an\n"
 	"%s.\n"
 
-#: src/lang.c:476
+#: src/lang.c:452
 #, c-format
 msgid	"Invalid  From: %s  line. Read the INSTALL file again."
 msgstr	"Ungültige From: %s Zeile. Lesen sie  INSTALL nochmal."
 
-#: src/lang.c:477
+#: src/lang.c:453
 #, c-format
 msgid	"Invalid  Sender:-header %s"
 msgstr	"Ungültiger Sender:-Header %s"
 
-#: src/lang.c:478
+#: src/lang.c:454
 msgid	"Inverse video disabled"
 msgstr	"Inverse Bilddarstellung abgestellt"
 
-#: src/lang.c:479
+#: src/lang.c:455
 msgid	"Inverse video enabled"
 msgstr	"Inverse Bilddarstellung eingeschaltet"
 
-#: src/lang.c:480
+#: src/lang.c:457
 #, c-format
 msgid	"Missing definition for %s\n"
 msgstr	"Fehlende Definition für %s\n"
 
-#: src/lang.c:481
+#: src/lang.c:458
 #, c-format
 msgid	"Invalid key definition '%s'\n"
 msgstr	"Ungültige Tastenbelegung '%s'\n"
 
-#: src/lang.c:482
+#: src/lang.c:459
 #, c-format
 msgid	"Invalid keyname '%s'\n"
 msgstr	"Ungültiger Tastenname '%s'\n"
 
-#: src/lang.c:484
-#, c-format
-msgid	"Redefined key %s '%s' -> '%s'\n"
-msgstr	"Neubelegung %s '%s' -> '%s'\n"
-
-#: src/lang.c:485
-msgid	"  -D       debug mode 1=NNTP 2=ALL"
-msgstr	"  -D       Debug-Modus 1=NNTP 2=ALLES"
-
-#: src/lang.c:487
+#: src/lang.c:460
 #, c-format
 msgid	"Key '%s' is defined for both %s%s and %s%s\n"
 msgstr	"Taste '%s' ist für %s%s und %s%s definiert\n"
 
-#: src/lang.c:488
-msgid	"-- Last response --"
-msgstr	"-- Letzte Antwort --"
-
-#: src/lang.c:491
+#: src/lang.c:461
 #, c-format
-msgid	"%d files successfully written from %d articles. %d %s occurred."
-msgstr	"%d Dateien aus %d Artikeln erfolgreich geschrieben. %d %s traten auf"
+msgid	"Kill From:     [%-*.*s] (y/n): "
+msgstr	"Filter From:   [%-*.*s] (j/n): "
 
-#: src/lang.c:492
-msgid	"Missing parts."
-msgstr	"Teile fehlen."
+#: src/lang.c:462
+msgid	"Kill Lines: (</>num): "
+msgstr	"Filter Z.:  (</>num): "
 
-#: src/lang.c:493
-msgid	"No beginning."
-msgstr	"Kein Anfang."
+#: src/lang.c:463
+msgid	"Kill Article Menu"
+msgstr	"Filter Menü (Kill, Bewertung/Score verringern)"
 
-#: src/lang.c:494
-msgid	"No data."
-msgstr	"Keine Daten."
+#: src/lang.c:464
+#, c-format
+msgid	"Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
+msgstr	"Filter Msg-Id: [%-*.*s] (v/l/n/n): "
 
-#: src/lang.c:495
-msgid	"Unknown error."
-msgstr	"Unbekannter Fehler."
+#: src/lang.c:465
+msgid	"Kill pattern scope  : "
+msgstr	"Filter nach Muster  : "
 
-#: src/lang.c:497
+#: src/lang.c:466
 #, c-format
-msgid	"Error decoding %s : %s"
-msgstr	"Fehler beim Dekodieren von %s : %s"
+msgid	"Kill Subject:  [%-*.*s] (y/n): "
+msgstr	"Filter Subject:[%-*.*s] (j/n): "
 
-#: src/lang.c:498
-msgid	"No end."
-msgstr	"Kein Ende."
+#: src/lang.c:467
+msgid	"Kill text pattern   : "
+msgstr	"Filter Textmuster   : "
 
-#: src/lang.c:499
-#, c-format
-msgid	"%s successfully decoded."
-msgstr	"%s erfolgreich dekodiert"
+#: src/lang.c:468
+msgid	"Kill time in days   : "
+msgstr	"Filterzeit in Tagen : "
 
-#: src/lang.c:501
+#: src/lang.c:470
+msgid	"Last"
+msgstr	"Letzte"
+
+#: src/lang.c:471
+msgid	"-- Last response --"
+msgstr	"-- Letzte Antwort --"
+
+#: src/lang.c:472
 #, c-format
 msgid	"Lines %s  "
 msgstr	"Zeilen %s "
 
-#: src/lang.c:503
+#: src/lang.c:474
+msgid	"Message-ID: line              "
+msgstr	"Message-ID: Zeile             "
+
+#: src/lang.c:476
 msgid	"mailbox "
 msgstr	"Mailbox "
 
-#: src/lang.c:504
+#: src/lang.c:477
 #, c-format
 msgid	"Mail article(s) to [%.*s]> "
 msgstr	"Mailt Artikel an [%.*s]> "
 
-#: src/lang.c:505
+#: src/lang.c:478
 #, c-format
 msgid	"Mailing log to %s\n"
 msgstr	"Maile Log-Datei an %s\n"
 
-#: src/lang.c:506
+#: src/lang.c:479
 msgid	"Mail bug report..."
 msgstr	"Maile einen Fehlerbericht..."
 
-#: src/lang.c:507
+#: src/lang.c:480
 #, c-format
 msgid	"Mail BUG REPORT to %s?"
 msgstr	"Fehlerbericht an %s senden?"
 
-#: src/lang.c:508
+#: src/lang.c:481
 msgid	"Mailed"
 msgstr	"Gemailt"
 
-#: src/lang.c:509
+#: src/lang.c:482
 #, c-format
 msgid	"Mailing to %s..."
 msgstr	"Senden der Mail an %s..."
 
-#: src/lang.c:510
+#: src/lang.c:483
 msgid	"# [Mail/Save] active file. Format is like news active file:\n"
 	"#   groupname  max.artnum  min.artnum  /dir\n"
 	"# The 4th field is the basedir (ie. ~/Mail or ~/News)\n"
@@ -2012,389 +2031,288 @@ msgstr	"# [Mail/Speicher] active-Datei. 
 	"# Das 4. Feld ist das Basisverzeichnis (z.B. ~/Mail oder ~/News)\n"
 	"#\n"
 
-#: src/lang.c:513
+#: src/lang.c:486
 #, c-format
 msgid	"%s marked as unread"
 msgstr	"%s als ungelesen markiert"
 
-#: src/lang.c:514
+#: src/lang.c:487
 #, c-format
 msgid	"Marked %d of %d tagged %s as read"
 msgstr	"%d von %d %s als gelesen markiert"
 
-#: src/lang.c:515
+#: src/lang.c:488
 #, c-format
 msgid	"Mark all articles as read%s?"
 msgstr	"Alle Artikel als gelesen markieren%s?"
 
-# TRANSLATION MISSING
-#: src/lang.c:516
+#: src/lang.c:489
 #, c-format
 msgid	"Mark %s=tagged articles, %s=current article, %s=quit: "
-msgstr	""
+msgstr	"%s=markierte oder %s=aktuellen Artikel auf gelesen setzen. %s=Abbrechen: "
 
-#: src/lang.c:517
+#: src/lang.c:490
 #, c-format
 msgid	"Mark group %.*s as read?"
 msgstr	"Die Gruppe %.*s als gelesen markieren?"
 
-#: src/lang.c:518
+#: src/lang.c:491
 #, c-format
 msgid	"Mark thread as read%s?"
 msgstr	"Den Thread als gelesen markieren%s?"
 
-# TRANSLATION MISSING
-#: src/lang.c:519
+#: src/lang.c:492
 #, c-format
 msgid	"Mark %s=tagged articles/threads, %s=current thread, %s=quit: "
-msgstr	""
+msgstr	"%s=markierte oder %s=aktuellen Artikel/Thread auf gelesen setzen. "
+	"%s=Abbrechen: "
 
-#: src/lang.c:520
+#: src/lang.c:493
 #, c-format
 msgid	"Matching %s groups..."
 msgstr	"Übereinstimmende %s Gruppen..."
 
-#: src/lang.c:521 src/lang.c:525
+#: src/lang.c:494 src/lang.c:498
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s=search pattern; %s=kill/select"
 msgstr	"<n>=Wähle n; %s=n. ungel.; %s=Suche; %s=Filter"
 
-#: src/lang.c:522
+#: src/lang.c:495
 #, c-format
 msgid	"%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list "
 	"thread"
 msgstr	"%s=Autorsuche; %s=Catchup; %s=n. unten; %s=n. oben; %s=gelesen; %s=Thread anz."
 
-#: src/lang.c:523
+#: src/lang.c:496
 #, c-format
 msgid	"%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom"
 msgstr	"%s=n. oben; %s=n. unten; %s=BildAuf; %s=BildAb; %s=Anfang; %s=letzte Zeile"
 
-#: src/lang.c:524
+#: src/lang.c:497
 #, c-format
 msgid	"%s=search forwards; %s=search backwards; %s=quit"
 msgstr	"%s=Suche vorwärts; %s=Suche rückwärts; %s=Beenden"
 
-#: src/lang.c:526
+#: src/lang.c:499
 #, c-format
 msgid	"%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read"
 msgstr	"%s=Autorsuche; %s=Su. Inhalt; %s=Catchup; %s=Antw in NG; %s=gelesen"
 
-#: src/lang.c:530
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
-	"%s=post"
-msgstr	"%s=Pipe; %s=Mail; %s=Drucken; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; "
-	"%s=tag; %s=Posten"
-
-#: src/lang.c:531
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=Pipe; %s=Mail; %s=Drucken; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; "
-	"%s=Posten"
-
-#: src/lang.c:533
-#, c-format
-msgid	"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=Mail; %s=Drucken; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; "
-	"%s=Posten"
-
-#: src/lang.c:534
-#, c-format
-msgid	"%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=Mail; %s=Drucken; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten"
-
-#: src/lang.c:538
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=Pipe; %s=Mail; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; %s=Posten"
-
-#: src/lang.c:539
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=Pipe; %s=Mail; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten"
-
-#: src/lang.c:541
-#, c-format
-msgid	"%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=Mail; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; %s=Posten"
-
-#: src/lang.c:542
-#, c-format
-msgid	"%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=Mail; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten"
-
-#: src/lang.c:546
+#: src/lang.c:500
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup"
 msgstr	"<n>=Wähle n; %s=n. ungel.; %s,%s=Suche; %s=Catchup"
 
-#: src/lang.c:547
+#: src/lang.c:501
 #, c-format
 msgid	"%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread"
 msgstr	"%s=n. unten; %s=n. oben; %s=Hilfe; %s=verschieben; %s=Ende; %s=Alle/Nur ungel."
 
-#: src/lang.c:548
+#: src/lang.c:502
 #, c-format
 msgid	"%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out"
 msgstr	"%s=Abo; %s=Abo n. Muster; %s=Abbestellen; %s=Abbest. n. Muster; %s=Alle/Nur "
 	"abon."
 
-#: src/lang.c:549
+#: src/lang.c:503
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s=catchup; %s=display toggle"
 msgstr	"<n>=Wähle n; %s=n. ungel.; %s=Catchup; %s=Infozeile"
 
-#: src/lang.c:550
+#: src/lang.c:504
 #, c-format
 msgid	"%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread"
 msgstr	"%s=Hilfe; %s=n. unten; %s=n. oben; %s=Ende; %s=tag; %s=ungelesen"
 
-#: src/lang.c:551
+#: src/lang.c:505
 msgid	"--More--"
 msgstr	"--Mehr--"
 
-#: src/lang.c:552
+#: src/lang.c:506
 #, c-format
 msgid	"Moving %s..."
 msgstr	"Verschiebe %s..."
 
-#: src/lang.c:553
+#: src/lang.c:508
 msgid	", name: "
 msgstr	", Name: "
 
-#: src/lang.c:554
+#: src/lang.c:509
 #, c-format
 msgid	"Goto newsgroup [%s]> "
 msgstr	"Gehe zu Gruppe [%s]> "
 
-#: src/lang.c:555
+#: src/lang.c:510
 msgid	"newsgroups"
 msgstr	"Gruppen"
 
-#: src/lang.c:556
+#: src/lang.c:511
 #, c-format
 msgid	"Position %s in group list (1,2,..,$) [%d]> "
 msgstr	"Position %s in der Gruppenliste (1,2,..,$) [%d]> "
 
-#: src/lang.c:557
+#: src/lang.c:512
 msgid	"newsgroup"
 msgstr	"Gruppe"
 
-#: src/lang.c:558
+#: src/lang.c:513
 msgid	"Try and save newsrc file again?"
 msgstr	"Erneut versuchen, die newsrc-Datei zu schreiben?"
 
-#: src/lang.c:559
+#: src/lang.c:514
 msgid	"Warning: No newsgroups were written to your newsrc file. Save aborted."
 msgstr	"Warnung: Keine Newsgruppen in die newsrc geschrieben. Speicherabbruch"
 
-#: src/lang.c:560
+#: src/lang.c:515
 msgid	"newsrc file saved successfully.\n"
 msgstr	"newsrc-Datei erfolgreich geschrieben.\n"
 
-#: src/lang.c:561
+#: src/lang.c:516
 msgid	"-- Next response --"
 msgstr	"- Nächste Antwort -"
 
-#: src/lang.c:562
+#: src/lang.c:517
 #, c-format
 msgid	"NNTP authorization password not found for %s"
 msgstr	"NNTP Anmeldepasswort für %s nicht gefunden"
 
-#: src/lang.c:565 src/nntplib.c:966
-msgid	"205  Closing connection"
-msgstr	"205  Schließe Verbindung"
-
-#: src/lang.c:566
-msgid	"  -A       force authentication on connect"
-msgstr	"  -A       Erzwinge Anmeldung bei Verbindung"
-
-#: src/lang.c:567
-#, c-format
-msgid	"  -g serv  read news from NNTP server serv [default=%s]"
-msgstr	"  -g serv  Lese Artikel vom NNTP-Server 'serv' [Standard=%s]"
-
-#: src/lang.c:568
-#, c-format
-msgid	"  -p port  use port as NNTP port [default=%d]"
-msgstr	"  -p port  Benutze 'port' als NNTP-Port [Standard=%d]"
-
-#: src/lang.c:569
-msgid	"  -Q       quick start. Same as -nqd"
-msgstr	"  -Q       Schnellstart. Das Selbe wie -nqd"
-
-#: src/lang.c:570
-msgid	"  -l       use only LIST instead of GROUP (-n) command"
-msgstr	"  -l       Benutze nur das LIST anstelle vom GROUP-Kommando (-n)"
-
-#: src/lang.c:571
-msgid	"  -n       only read subscribed .newsrc groups from NNTP server"
-msgstr	"  -n       Lese nur Gruppen aus der .newsrc-Datei vom NNTP-Server"
-
-#: src/lang.c:573
-msgid	"  -Q       quick start. Same as -qd"
-msgstr	"  -Q       Schnellstart. Das Selbe wie -qd"
-
-#: src/lang.c:574
-msgid	"  -l       read only active file instead of scanning spool (-n) command"
-msgstr	"  -l       Nur active File lesen ohne den Spool zu durchsuchen (-n) Kommando"
-
-#: src/lang.c:575
-msgid	"  -n       only read subscribed .newsrc groups from spool"
-msgstr	"  -n       Lese nur Gruppen aus der .newsrc-Datei aus dem lokalen Spool"
-
-#: src/lang.c:578
+#: src/lang.c:518
 msgid	"No  "
 msgstr	"Nein"
 
-#: src/lang.c:579
+#: src/lang.c:519
 msgid	"*** No articles ***"
 msgstr	"*** Keine Artikel ***"
 
-#: src/lang.c:580
+#: src/lang.c:520
 msgid	"No articles have been posted"
 msgstr	"Es wurden keine Artikel gepostet"
 
-#: src/lang.c:583
-msgid	"No command"
-msgstr	"Kein Kommando"
-
-#: src/lang.c:588
-msgid	"Terminal does not support color"
-msgstr	"Terminal unterstützt keine Farben"
-
-#: src/lang.c:592
+#: src/lang.c:521
 msgid	"*** No description ***"
 msgstr	"*** Keine Kurzbeschreibung ***"
 
-#: src/lang.c:593
+#: src/lang.c:522
 msgid	"No filename"
 msgstr	"Kein Dateiname"
 
-#: src/lang.c:594
+#: src/lang.c:523
 msgid	"No group"
 msgstr	"Keine Gruppe"
 
-#: src/lang.c:595
+#: src/lang.c:524
 msgid	"*** No groups ***"
 msgstr	"*** Keine Newsgruppen ***"
 
-#: src/lang.c:596
+#: src/lang.c:525
 msgid	"No more groups to read"
 msgstr	"Keine Gruppen zum Lesen übrig"
 
-#: src/lang.c:597
+#: src/lang.c:526
 msgid	"No last message"
 msgstr	"Keine letzte Nachricht"
 
-#: src/lang.c:598
+#: src/lang.c:527
 msgid	"No mail address"
 msgstr	"Keine EMail-Adresse"
 
-#: src/lang.c:599
+#: src/lang.c:528
 msgid	"No articles marked for saving"
 msgstr	"Keine Artikel zum Speichern markiert"
 
-#: src/lang.c:600
+#: src/lang.c:529
 msgid	"No match"
 msgstr	"Kein Treffer"
 
-#: src/lang.c:601
+#: src/lang.c:530
 msgid	"No more groups"
 msgstr	"Keine Gruppen mehr"
 
-#: src/lang.c:602
+#: src/lang.c:531
 msgid	"No newsgroups"
 msgstr	"Keine Newsgruppen"
 
-#: src/lang.c:603
+#: src/lang.c:532
 msgid	"No next unread article"
 msgstr	"Kein nächster ungelesener Artikel"
 
-#: src/lang.c:604
+#: src/lang.c:533
 msgid	"No previous group"
 msgstr	"Keine vorherige Gruppe"
 
-#: src/lang.c:605
+#: src/lang.c:534
 msgid	"No previous unread article"
 msgstr	"Kein vorheriger ungelesener Artikel"
 
-#: src/lang.c:606
+#: src/lang.c:535
 #, c-format
 msgid	"No responses%s"
 msgstr	"Keine Antworten%s"
 
-#: src/lang.c:607
+#: src/lang.c:536
 msgid	"No responses"
 msgstr	"Keine Antworten"
 
-#: src/lang.c:608
+#: src/lang.c:537
 msgid	"No responses to list in current thread"
 msgstr	"Keine Antworten vorhanden im aktuellen Thread"
 
-#: src/lang.c:609
+#: src/lang.c:538
 msgid	"No search string"
 msgstr	"Kein Suchmuster"
 
-#: src/lang.c:610
+#: src/lang.c:539
 msgid	"No subject"
 msgstr	"Kein Subject"
 
-#: src/lang.c:611
+#: src/lang.c:540
 #, c-format
 msgid	"%s: Terminal must have clear to end-of-line (ce)\n"
 msgstr	"%s: Terminal muss Löschen bis zum Ende der Zeile (ce) unterstützen\n"
 
-#: src/lang.c:612
+#: src/lang.c:541
 #, c-format
 msgid	"%s: Terminal must have clear to end-of-screen (cd)\n"
 msgstr	"%s: Terminal muss Löschen bis zum Ende des Schirmes unterstützen (cd)\n"
 
-#: src/lang.c:613
+#: src/lang.c:542
 #, c-format
 msgid	"%s: Terminal must have clearscreen (cl) capability\n"
 msgstr	"%s: Terminal muss Schirmlöschen (cl) unterstützen\n"
 
-#: src/lang.c:614
+#: src/lang.c:543
 #, c-format
 msgid	"%s: Terminal must have cursor motion (cm)\n"
 msgstr	"%s: Terminal muss Cursor-Bewegungen unterstützen (cm)\n"
 
-#: src/lang.c:615
+#: src/lang.c:544
 #, c-format
 msgid	"%s: TERM variable must be set to use screen capabilities\n"
 msgstr	"%s: TERM-Variable muss gesetzt sein, um das Terminal richtig anzusteuern\n"
 
-#: src/lang.c:616
+#: src/lang.c:545
 #, c-format
 msgid	"No viewer found for %s/%s\n"
 msgstr	"Kein Programm für %s/%s gefunden\n"
 
-#: src/lang.c:617
-msgid	"Your server does not support the NNTP XOVER or OVER command.\n"
-	"Tin will use local index files instead.\n"
-msgstr	"Ihr Server unterstützt kein NNTP XOVER oder OVER Kommando.\n"
-	"Tin wird stattdessen lokale Indizierungsdateien benutzen.\n"
-
-#: src/lang.c:618
+#: src/lang.c:546
 msgid	"Newsgroup does not exist on this server"
 msgstr	"Newsgruppe existiert nicht auf diesem Server"
 
-#: src/lang.c:619
+#: src/lang.c:547
 #, c-format
 msgid	"Group %s not found in active file"
 msgstr	"Gruppe %s nicht in der Active-Datei gefunden"
 
-#: src/lang.c:620
+#: src/lang.c:548
 msgid	"c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr	"c=erzeuge, a=alternativer Name, d=voreingestellte .newsrc, q=beende tin: "
 
-#: src/lang.c:621
+#: src/lang.c:549
 msgid	"use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr	"a=alternativer Name, d=voreingestellte .newsrc, q=beende tin: "
 
-#: src/lang.c:623
+#: src/lang.c:550
 #, c-format
 msgid	"# NNTP-server -> newsrc translation table and NNTP-server\n"
 	"# shortname list for %s %s\n"
@@ -2421,76 +2339,40 @@ msgstr	"# NNTP-Server -> newsrc Übersetz
 	"#   news.ka.nu    /tmp/nrc-nu      kanu    nu\n"
 	"#\n"
 
-#: src/lang.c:630
+#: src/lang.c:557
+msgid	"Only"
+msgstr	"Nur"
+
+#: src/lang.c:558
 #, c-format
 msgid	"Option not enabled. Recompile with %s."
 msgstr	"Option nicht vorhanden. Neukompilieren mit %s."
 
-#: src/lang.c:631
+#: src/lang.c:559
 msgid	"Options Menu"
 msgstr	"Optionsmenü"
 
-#: src/lang.c:634
+#: src/lang.c:562
 #, c-format
 msgid	"Error in regex: %s at pos. %d '%s'"
 msgstr	"Fehler im regulären Ausdruck: %s an Pos. %d '%s'"
 
-#: src/lang.c:635
+#: src/lang.c:563
 #, c-format
 msgid	"Error in regex: pcre internal error %d"
 msgstr	"Fehler im regulären Ausdruck: Interner Fehler %d des pcre"
 
-#: src/lang.c:636
+#: src/lang.c:564
 #, c-format
 msgid	"Error in regex: study - pcre internal error %s"
 msgstr	"Fehler im regulären Ausdruck: pcre interner Fehler %s"
 
-#: src/lang.c:639
-msgid	"Add key(s) to public keyring?"
-msgstr	"Schlüssel dem Öffentlichen Schlüsselring hinzufügen?"
-
-#: src/lang.c:640
-#, c-format
-msgid	"%s=encrypt, %s=sign, %s=both, %s=quit: "
-msgstr	"%s=verschlüsseln, %s=signieren, %s=beides, %s=Ende: "
-
-#: src/lang.c:641
-#, c-format
-msgid	"%s=sign, %s=sign & include public key, %s=quit: "
-msgstr	"%s=signiere, %s=signiere & füge öffentl. Schlüssel hinzu, %s=Ende: "
-
-#: src/lang.c:642
-#, c-format
-msgid	"PGP has not been set up (can't open %s)"
-msgstr	"PGP Wurde nicht konfiguriert (kann %s nicht öffnen)"
-
-#: src/lang.c:643
-msgid	"Article not signed and no public keys found"
-msgstr	"Artikel ist nicht signiert; keine öffentlichen Schlüssel gefunden"
-
-#: src/lang.c:647
-msgid	"Pipe"
-msgstr	"Pipe"
-
-#: src/lang.c:648
-#, c-format
-msgid	"Pipe to command [%.*s]> "
-msgstr	"Pipen in Kommando [%.*s]> "
-
-#: src/lang.c:649
-msgid	"Piping..."
-msgstr	"Pipen..."
-
-#: src/lang.c:651
-msgid	"Piping not enabled."
-msgstr	"Pipen nicht aktiviert."
-
-#: src/lang.c:654
+#: src/lang.c:565
 msgid	"Post a followup..."
 msgstr	"Schreibe eine Antwort..."
 
 #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone
-#: src/lang.c:656
+#: src/lang.c:567
 msgid	"An error has occurred while posting the article. If you think that this\n"
 	"error is temporary or otherwise correctable, you can postpone the article\n"
 	"and pick it up again with ^O later.\n"
@@ -2498,479 +2380,503 @@ msgstr	"Ein Fehler trat beim Posten des 
 	"ein temporäres Problem ist, das später nicht mehr vorhanden ist, können Sie\n"
 	"den Artikel zurückstellen und später mit ^O wieder hervorholen.\n"
 
-#: src/lang.c:659
+#: src/lang.c:570
 msgid	"Posted articles history"
 msgstr	"Übersicht der geposteten Artikel"
 
-#: src/lang.c:660
+#: src/lang.c:571
 #, c-format
 msgid	"Post to newsgroup(s) [%s]> "
 msgstr	"In Newsgruppe(n) [%s] posten> "
 
-#: src/lang.c:661
+#: src/lang.c:572
 msgid	"-- post processing started --"
 msgstr	"-- Nachbearbeitung gestartet --"
 
-#: src/lang.c:662
+#: src/lang.c:573
 msgid	"-- post processing completed --"
 msgstr	"-- Nachbearbeitung beendet --"
 
-#: src/lang.c:663
+#: src/lang.c:574
 #, c-format
 msgid	"Post subject [%s]> "
 msgstr	"Wähle Subject [%s]> "
 
-#: src/lang.c:665
-msgid	"Posting using external inews failed. Use built in inews instead?"
-msgstr	"Fehler beim Posten mit externem inews, verwende eingebautes?"
-
-#: src/lang.c:666
-msgid	"It worked! Should I always use my built in inews from now on?"
-msgstr	"Das hat funktioniert. In Zukunft immer eingebautes inews verwenden?"
-
-#: src/lang.c:668
+#: src/lang.c:575
 msgid	"# Summary of mailed/posted messages viewable by 'W' command from within tin.\n"
 msgstr	"# Zusammenfassung der gemailten/geposteten Artikel mit 'W' in tin.\n"
 
-#: src/lang.c:669
+#: src/lang.c:576
 msgid	"Posting article..."
 msgstr	"Poste Artikel..."
 
-#: src/lang.c:670
+#: src/lang.c:577
 msgid	"Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): "
 msgstr	"Zurückgelegten Artikel [%%.*s]posten? (%s/%s/%s/%s/%s): "
 
-#: src/lang.c:671
+#: src/lang.c:578
 #, c-format
 msgid	"Hot %s"
 msgstr	"Wichtig/Hot %s"
 
-#: src/lang.c:672
+#: src/lang.c:579
 #, c-format
 msgid	"Tagged %s"
 msgstr	"%s markiert"
 
-#: src/lang.c:673
+#: src/lang.c:580
+msgid	"Processing mail messages marked for deletion."
+msgstr	"Bearbeite zum Löschen markierte EMails"
+
+#: src/lang.c:581
+msgid	"Processing saved articles marked for deletion."
+msgstr	"Bearbeite zum Löschen markierte gespeicherte Artikel."
+
+#: src/lang.c:582
 #, c-format
 msgid	"Accept Followup-To? %s=post, %s=ignore, %s=quit: "
 msgstr	"Followup-To akzeptieren? %s=posten, %s=ignorieren, %s=Ende: "
 
-#: src/lang.c:674
+#: src/lang.c:583
 msgid	"Article unchanged, abort mailing?"
 msgstr	"Mail unverändert, Absenden abbrechen?"
 
-#: src/lang.c:675
+#: src/lang.c:584
 #, c-format
 msgid	"Do you want to see postponed articles (%d)?"
 msgstr	"Wollen Sie die zurückgestellten Artikel sehen (%d)?"
 
-#: src/lang.c:676
+#: src/lang.c:586
 msgid	"Add quick kill filter?"
 msgstr	"Artikel schnell (laut Voreinstellungen) killen?"
 
-#: src/lang.c:677
+#: src/lang.c:587
 msgid	"Add quick selection filter?"
 msgstr	"Filterregel (hochscoren) (laut Voreinstellungen) hinzufügen?"
 
-#: src/lang.c:678
+#: src/lang.c:588
 msgid	"Do you really want to quit?"
 msgstr	"Möchten Sie das Programm wirklich beenden?"
 
-#: src/lang.c:679
+#: src/lang.c:589
 msgid	"%s=edit cancel message, %s=quit, %s=delete (cancel) [%%.*s]: "
 msgstr	"%s=cancel-Nachricht editieren, %s=Ende, %s=löschen [%%.*s]: "
 
-#: src/lang.c:680
+#: src/lang.c:590
 msgid	"You have tagged articles in this group - quit anyway?"
 msgstr	"Es befinden sich markierte Artikel in der Gruppe, trotzdem beenden?"
 
-#: src/lang.c:681
+#: src/lang.c:591
 #, c-format
 msgid	"%s=quit, %s=edit, %s=postpone: "
 msgstr	"%s=Ende, %s=bearbeiten, %s=zurücklegen: "
 
-#: src/lang.c:682
+#: src/lang.c:592
 #, c-format
 msgid	"%s=quit %s=edit %s=save kill description: "
 msgstr	"%s=Abbrechen %s=Editieren %s=Kill-Filter speichern: "
 
-#: src/lang.c:683
+#: src/lang.c:593
 #, c-format
 msgid	"%s=quit %s=edit %s=save select description: "
 msgstr	" %s=Abbrechen %s=Editieren %s=Filter (hot) speichern: "
 
-#: src/lang.c:684
+#: src/lang.c:594
 msgid	"Do you really want to quit without saving your configuration?"
 msgstr	"Wirklich ohne Speichern der Konfiguration beenden?"
 
-#: src/lang.c:686
+#: src/lang.c:597
 msgid	"Invalid range - valid are '0-9.$' eg. 1-$"
 msgstr	"Ungültige Bereichsangabe - Gültig wäre '0-9.$' z.B. 1-$"
 
-#: src/lang.c:687
+#: src/lang.c:598
 msgid	"Do you want to abort this operation?"
 msgstr	"Wollen Sie diese Operation abbrechen?"
 
-#: src/lang.c:688
+#: src/lang.c:599
 msgid	"Do you want to exit tin immediately?"
 msgstr	"Wollen Sie tin augenblicklich verlassen?"
 
-#: src/lang.c:689
+#: src/lang.c:600
 msgid	"Read response> "
 msgstr	"Lese Antwort> "
 
-#: src/lang.c:690
+#: src/lang.c:601
 msgid	"Reading ('q' to quit)..."
 msgstr	"Lesen ('q' zum Beenden)..."
 
-#: src/lang.c:691
+#: src/lang.c:602
 #, c-format
 msgid	"Reading %sarticles..."
 msgstr	"Lese %sArtikel..."
 
-#: src/lang.c:692
+#: src/lang.c:603
 #, c-format
 msgid	"Reading %sattributes file...\n"
 msgstr	"Lese %sAttribute-Datei...\n"
 
-#: src/lang.c:693
+#: src/lang.c:604
 #, c-format
 msgid	"Reading %sconfig file...\n"
 msgstr	"Lese %sKonfigurations-Datei...\n"
 
-#: src/lang.c:694
+#: src/lang.c:605
 msgid	"Reading filter file...\n"
 msgstr	"Lese Filter-Datei...\n"
 
-#: src/lang.c:695
+#: src/lang.c:606
 #, c-format
 msgid	"Reading %s groups..."
 msgstr	"Lese %s Gruppen..."
 
-#: src/lang.c:696
+#: src/lang.c:607
 msgid	"Reading input history file...\n"
 msgstr	"Lese Eingabe-History...\n"
 
-#: src/lang.c:697
+#: src/lang.c:608
 msgid	"Reading keymap file...\n"
 msgstr	"Lese Tastaturbelegungen...\n"
 
-#: src/lang.c:699
-msgid	"Reading mail active file... "
-msgstr	"Lese EMail-Active-Datei... "
-
-#: src/lang.c:700
-msgid	"Reading mailgroups file... "
-msgstr	"Lese Mailgruppen-Datei... "
-
-#: src/lang.c:702
+#: src/lang.c:609
 msgid	"Reading groups from active file... "
 msgstr	"Lese Gruppen aus dem Active... "
 
-#: src/lang.c:703
+#: src/lang.c:610
 msgid	"Reading groups from newsrc file... "
 msgstr	"Lese Gruppen aus der newsrc-Datei... "
 
-#: src/lang.c:704
+#: src/lang.c:611
 msgid	"Reading newsgroups file... "
 msgstr	"Lese Newsgroups-Datei... "
 
-#: src/lang.c:705
+#: src/lang.c:612
 msgid	"Reading newsrc file..."
 msgstr	"Lese newsrc-Datei..."
 
-#: src/lang.c:706
-msgid	"Connection to news server has timed out. Reconnect?"
-msgstr	"Die Verbindung zum Newsserver wurde unterbrochen. Wieder verbinden?"
-
-#: src/lang.c:707
+#: src/lang.c:613
 #, c-format
 msgid	"Bogus group %s removed."
 msgstr	"Nicht vorhandene Gruppe %s entfernt."
 
-#: src/lang.c:708
+#: src/lang.c:614
 #, c-format
 msgid	"Error: rename %s to %s"
 msgstr	"Fehler: Benenne %s in %s"
 
-#: src/lang.c:709
+#: src/lang.c:615
 msgid	"Reply to author..."
 msgstr	"Mailantwort an Autor..."
 
-#: src/lang.c:710
+#: src/lang.c:616
 msgid	"Repost"
 msgstr	"Reposte"
 
-#: src/lang.c:711
+#: src/lang.c:617
 msgid	"Reposting article..."
 msgstr	"Wiederholtes posten des Artikels..."
 
-#: src/lang.c:712
+#: src/lang.c:618
 #, c-format
 msgid	"Repost article(s) to group(s) [%s]> "
 msgstr	"Wiederholtes posten de(s|r) Artikel(s) in [%s]> "
 
-#: src/lang.c:713
+#: src/lang.c:619
 msgid	"Reset newsrc?"
 msgstr	"newsrc zurücksetzen?"
 
-#: src/lang.c:714
+#: src/lang.c:620
 msgid	"Responses have been directed to the following newsgroups"
 msgstr	"Antworten werden in folgende Gruppen gepostet"
 
-#: src/lang.c:715
+#: src/lang.c:621
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	"Antwort per Mail wurde angefordert. %s=Mail, %s=post, %s=beenden: "
 
-#: src/lang.c:716
+#: src/lang.c:622
 #, c-format
-msgid	"RespNo %3d of %3d%s"
-msgstr	"Antw. %3d von %3d%s"
+msgid	"RespNo %4d of %4d%s"
+msgstr	"Antw. %4d von %4d%s"
 
-#: src/lang.c:717
+#: src/lang.c:623
 msgid	"Press <RETURN> to continue..."
 msgstr	"Drücken sie <RETURN> um fortzufahren..."
 
-#: src/lang.c:718
+#: src/lang.c:625
+#, c-format
+msgid	"Select From    [%-*.*s] (y/n): "
+msgstr	"Wähle From     [%-*.*s] (j/n): "
+
+#: src/lang.c:626
+msgid	"Select Lines: (</>num): "
+msgstr	"Wähle Zeilen: (</>num): "
+
+#: src/lang.c:627
+msgid	"Auto-select Article Menu"
+msgstr	"Filter Menü (Bewertung/Score erhöhen)"
+
+#: src/lang.c:628
+#, c-format
+msgid	"Select Msg-Id  [%-*.*s] (f/l/o/n): "
+msgstr	"Wähle Msg-Id   [%-*.*s] (v/l/n/n): "
+
+#: src/lang.c:629
+msgid	"Select pattern scope: "
+msgstr	"Wähle Muster        : "
+
+#: src/lang.c:630
+#, c-format
+msgid	"Select Subject [%-*.*s] (y/n): "
+msgstr	"Wähle Subject  [%-*.*s] (j/n): "
+
+#: src/lang.c:631
+msgid	"Select text pattern : "
+msgstr	"Wähle Textmuster    : "
+
+#: src/lang.c:632
+msgid	"Select time in days   : "
+msgstr	"Wähle Zeit in Tagen   : "
+
+#: src/lang.c:633
+#, c-format
+msgid	"# %s server configuration file\n"
+	"# This file was automatically saved by %s %s %s (\"%s\")\n"
+	"#\n"
+	"# Do not edit while %s is running, since all your changes to this file\n"
+	"# will be overwritten when you leave %s.\n"
+	"# Do not edit at all if you don't know what you do.\n"
+	"############################################################################\n"
+	"\n"
+msgstr	"# %s Server Konfigurationsdatei\n"
+	"# Diese Datei wurde automatisch von %s %s %s (\"%s\") erzeugt.\n"
+	"#\n"
+	"# Nicht verändern während %s läuft, da alle Änderungen automatisch\n"
+	"# überschrieben werden wenn Sie %s verlassen.\n"
+	"# Wenn Sie nicht genau wissen was Sie tun, dann lassen sie einfach die\n"
+	"# Finger von dieser Datei.\n"
+	"############################################################################\n"
+	"\n"
+
+#: src/lang.c:639
+msgid	"Showing unread groups only"
+msgstr	"Zeige nur Gruppen mit ungelesenen Artikeln"
+
+#: src/lang.c:640
+msgid	"Subject: line (ignore case)   "
+msgstr	"Subject: Z. (Groß-Kl. ign.)                  "
+
+#: src/lang.c:641
+msgid	"Subject: line (case sensitive)"
+msgstr	"Subject: Z. (Groß-Kl. beachten)              "
+
+#: src/lang.c:642
 msgid	"Save"
 msgstr	"Speichern"
 
-#: src/lang.c:719
+#: src/lang.c:643
 #, c-format
 msgid	"Save '%s' (%s/%s)?"
 msgstr	"'%s' (%s/%s) speichern?"
 
-#: src/lang.c:720
+#: src/lang.c:644
 msgid	"Save configuration before continuing?"
 msgstr	"Zuerst Konfiguration speichern und danach fortfahren?"
 
-#: src/lang.c:721
+#: src/lang.c:645
 msgid	"Save filename> "
 msgstr	"Name der zu speichernden Datei> "
 
-#: src/lang.c:722
+#: src/lang.c:646
 msgid	"Saved"
 msgstr	"Gespeichert"
 
-#: src/lang.c:723
+#: src/lang.c:647
 #, c-format
 msgid	"%4d unread (%4d hot) %s in %s\n"
 msgstr	"%4d ungelesene (%4d 'hot') %s in %s\n"
 
-#: src/lang.c:724
+#: src/lang.c:648
 #, c-format
 msgid	"Saved %s...\n"
 msgstr	"%s gespeichert...\n"
 
-#: src/lang.c:725
+#: src/lang.c:649
 msgid	"Nothing was saved"
 msgstr	"Nichts gespeichert"
 
-#: src/lang.c:726
+#: src/lang.c:650
 #, c-format
 msgid	"\n"
 	"%s %d %s from %d %s\n"
 msgstr	"\n"
 	"%s %d %s aus %d %s\n"
 
-#: src/lang.c:727
+#: src/lang.c:651
 #, c-format
 msgid	"-- %s saved to %s%s --"
 msgstr	"-- %s nach %s%s gespeichert --"
 
-#: src/lang.c:728
+#: src/lang.c:652
 #, c-format
 msgid	"-- %s saved to %s - %s --"
 msgstr	"-- %s gespeichert als %s - %s --"
 
-#: src/lang.c:729
+#: src/lang.c:653
 msgid	"Saving..."
 msgstr	"Speichere..."
 
-#: src/lang.c:730
+#: src/lang.c:654
 #, c-format
 msgid	"%s: Screen initialization failed"
 msgstr	"%s: Initialisierung des Bildschirms fehlgeschlagen"
 
-#: src/lang.c:731
+#: src/lang.c:655
 #, c-format
 msgid	"%s: screen is too small\n"
 msgstr	"%s: Anzeige ist zu klein\n"
 
-#: src/lang.c:732
+#: src/lang.c:656
 #, c-format
 msgid	"screen is too small, %s is exiting\n"
 msgstr	"Anzeige zu klein, %s beendet sich\n"
 
-#: src/lang.c:733
+#: src/lang.c:657
 #, c-format
 msgid	"Search backwards [%s]> "
 msgstr	"Suche rückwärts [%s]> "
 
-#: src/lang.c:734
+#: src/lang.c:658
 #, c-format
 msgid	"Search body [%s]> "
 msgstr	"Durchsuche Artikelinhalt [%s]> "
 
-#: src/lang.c:735
+#: src/lang.c:659
 #, c-format
 msgid	"Search forwards [%s]> "
 msgstr	"Suche vorwärts [%s]> "
 
-#: src/lang.c:736
+#: src/lang.c:660
 msgid	"Searching..."
 msgstr	"Suche..."
 
-#: src/lang.c:737
+#: src/lang.c:661
 #, c-format
 msgid	"Searching article %d of %d ('q' to abort)..."
 msgstr	"Suche Artikel %d von %d ('q' zum abbrechen)..."
 
-#: src/lang.c:738
+#: src/lang.c:662
 msgid	"Select article> "
 msgstr	"Wähle Artikel> "
 
-#: src/lang.c:739
+#: src/lang.c:663
 msgid	"Select option number before text or use arrow keys and <CR>. 'q' to quit."
 msgstr	"Wähle Optionsnummer, oder benutze die Cursor Tasten und <CR>. 'q' zum beenden."
 
-#: src/lang.c:740
+#: src/lang.c:664
 msgid	"Select group> "
 msgstr	"Wähle Gruppe> "
 
-#: src/lang.c:741
+#: src/lang.c:665
 #, c-format
 msgid	"Enter selection pattern [%s]> "
 msgstr	"Nenne das Auswahlmuster [%s]> "
 
-#: src/lang.c:742
+#: src/lang.c:666
 msgid	"Select thread > "
 msgstr	"Wähle thread > "
 
-#: src/lang.c:743
+#: src/lang.c:667
 #, c-format
 msgid	"%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n"
 msgstr	"%s %s %s (\"%s\") [%s]: schicken sie einen DETAILIERTEN Fehlerbericht an %s\n"
 
-#: src/lang.c:744
-#, c-format
-msgid	"Put the server name in the file %s,\n"
-	"or set the environment variable NNTPSERVER"
-msgstr	"Schreiben Sie den Servernamen in die Datei %s,\n"
-	"oder setzen Sie die Umgebungsvariable NNTPSERVER"
-
-#: src/lang.c:745
+#: src/lang.c:668
 msgid	"servers active-file"
 msgstr	"Die 'active' Datei des Servers"
 
-#: src/lang.c:747
-#, c-format
-msgid	"Shell Command (%s)"
-msgstr	"Shellkommando (%s)"
-
-#: src/lang.c:748
-#, c-format
-msgid	"Enter shell command [%s]> "
-msgstr	"Geben Sie ein Shellkommando ein [%s]> "
-
-#: src/lang.c:750
+#: src/lang.c:669
 msgid	"Cannot move into new newsgroups. Subscribe first..."
 msgstr	"Kann die Newsgruppe nicht öffnen. Sie muss erst abonniert werden..."
 
-#: src/lang.c:751
+#: src/lang.c:670
 msgid	"<SPACE>"
 msgstr	"<LEERT>"
 
-#: src/lang.c:752
+#: src/lang.c:671
 #, c-format
 msgid	"Starting: (%s)"
 msgstr	"Starte: (%s)"
 
-#: src/lang.c:753
+#: src/lang.c:672
 #, c-format
 msgid	"List Thread (%d of %d)"
 msgstr	"Zeige Thread (%d von %d)"
 
-#: src/lang.c:754
+#: src/lang.c:673
 #, c-format
 msgid	"Thread (%.*s)"
 msgstr	"Thread (%.*s)"
 
-#: src/lang.c:755
+#: src/lang.c:674
 msgid	"Enter wildcard subscribe pattern> "
 msgstr	"Wildcardmuster für zu abonnierende Gruppen> "
 
-#: src/lang.c:756
+#: src/lang.c:675
 #, c-format
 msgid	"subscribed to %d groups"
 msgstr	"%d Gruppen sind abonniert"
 
-#: src/lang.c:757
+#: src/lang.c:676
 #, c-format
 msgid	"Subscribed to %s"
 msgstr	"%s wurde abonniert"
 
-#: src/lang.c:758
+#: src/lang.c:677
 msgid	"Subscribing... "
 msgstr	"Abonniere... "
 
-#: src/lang.c:759
+#: src/lang.c:678
 msgid	"Repost or supersede article(s) [%%.*s]? (%s/%s/%s): "
 msgstr	"Artikel erneut posten oder überschreiben [%%.*s]? (%s/%s/%s): "
 
-#: src/lang.c:760
+#: src/lang.c:679
 #, c-format
 msgid	"Supersede article(s) to group(s) [%s]> "
 msgstr	"Supersede (überschreibe) Artikel in den Gruppen [%s]> "
 
-#: src/lang.c:761
+#: src/lang.c:680
 msgid	"Superseding article ..."
 msgstr	"Überschreibe Artikel ..."
 
-#: src/lang.c:762
+#: src/lang.c:681
 #, c-format
 msgid	"\n"
 	"Stopped. Type 'fg' to restart %s\n"
 msgstr	"\n"
 	"Angehalten. Geben sie 'fg' ein um %s wieder zu starten\n"
 
-#: src/lang.c:763
+#: src/lang.c:683
+#, c-format
+msgid	"%d days"
+msgstr	"%d Tage"
+
+#: src/lang.c:684
 msgid	"<TAB>"
 msgstr	"<TAB>"
 
-#: src/lang.c:764
+#: src/lang.c:685
 msgid	"Tagged article"
 msgstr	"Artikel markiert"
 
-#: src/lang.c:765
+#: src/lang.c:686
 msgid	"Tagged thread"
 msgstr	"Thread markiert"
 
-#: src/lang.c:768
-msgid	"# For color-adjust use the following numbers\n"
-	"#  0-black       1-red         2-green        3-brown\n"
-	"#  4-blue        5-pink        6-cyan         7-white\n"
-	"# These are *only* for foreground:\n"
-	"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
-	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
-	"# A '-1' is interpreted as default (foreground normally is white, and\n"
-	"# background black)\n"
-	"\n"
-msgstr	"# Für die Farbanpassung benutzen Sie folgende Nummern\n"
-	"#  0-schwarz     1-rot         2-grün         3-braun\n"
-	"#  4-blau        5-rosa        6-cyan         7-weiß\n"
-	"# Diese sind *nur* für den Vordergrund:\n"
-	"#  8-grau        9-hellrot   10-hellgrün   11-gelb\n"
-	"# 12-hellblau   13-hellrosa  14-hellcyan   15-hellweiß\n"
-	"# Eine '-1' wird als Voreinstellung interpretiert (der Vordergrund ist\n"
-	"# normalerweise weiß und der Hintergrund schwarz)\n"
-
-#: src/lang.c:778
+#: src/lang.c:687
 msgid	"# Default action/prompt strings\n"
 msgstr	"# Voreingestellte Aktion/zeige Zeichenkette\n"
 
-#: src/lang.c:779
+#: src/lang.c:688
 msgid	"# Defaults for quick (1 key) kill & auto-selection filters\n"
 	"# header=NUM  0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n"
 	"#             5=Message-ID: & last References: entry only\n"
@@ -2986,1373 +2892,1488 @@ msgstr	"# Voreinstellung für schnellen (
 	"# case=ON/OFF    ON=Filter case sensitive OFF=ignoriere case\n"
 	"# expire=ON/OFF  ON=Verfallen nach default_filter_days OFF=verfällt nie\n"
 
-#: src/lang.c:794
+#: src/lang.c:701
 msgid	"# If ON use print current subject or newsgroup description in the last line\n"
 msgstr	"# Falls ON anzeige des Subject oder des Gruppennamens in der letzten Zeile.\n"
 
-#: src/lang.c:795
+#: src/lang.c:702
 msgid	"# Host & time info used for detecting new groups (don't touch)\n"
 msgstr	"# Host & Zeit Info benutzen um neue Gruppen zu finden (nicht ändern)\n"
 
-#: src/lang.c:796
-msgid	"Enter wildcard unsubscribe pattern> "
-msgstr	"Wildcardmuster für abzubestellende Gruppen> "
+#: src/lang.c:703
+msgid	"There is no news\n"
+msgstr	"Es gibt keine neuen Artikel\n"
 
-#: src/lang.c:797
-#, c-format
-msgid	"View '%s' (%s/%s)?"
-msgstr	"'%s' (%s/%s) anzeigen?"
+#: src/lang.c:704
+msgid	"Thread"
+msgstr	"Thread"
 
-#.
-#. * Special value used to override option-list behavior
-#.
-#: src/lang.c:802 src/lang.c:866
-msgid	"Default"
-msgstr	"Voreinstellung"
+#: src/lang.c:705
+msgid	"Thread Level Commands"
+msgstr	"Thread Level Kommandos"
 
-#: src/lang.c:814 src/lang.c:839 src/lang.c:855 src/refs.c:266
-msgid	"None"
-msgstr	"Nichts"
+#: src/lang.c:706
+msgid	"Thread deselected"
+msgstr	"Thread nicht mehr ausgewählt"
 
-#: src/lang.c:815
-msgid	"Subject"
-msgstr	"Subject"
+#: src/lang.c:707
+msgid	"Thread selected"
+msgstr	"Thread ausgewählt"
 
-#: src/lang.c:816
-msgid	"References"
-msgstr	"References"
+#: src/lang.c:708
+msgid	"Thread range"
+msgstr	"Thread-Bereich"
 
-#: src/lang.c:817
-msgid	"Both Subject and References"
-msgstr	"Beides: Subject und References"
+#: src/lang.c:709
+#, c-format
+msgid	"%sThread %4s of %4s"
+msgstr	"%sThread %4s v. %4s"
 
-#: src/lang.c:818
-msgid	"Multipart Subject"
-msgstr	"Mehrteilige Artikel (Subject)"
+#: src/lang.c:710
+msgid	"Threading articles..."
+msgstr	"Sortiere Artikel..."
 
-#: src/lang.c:830 src/lang.c:941
-msgid	"No"
-msgstr	"Nein"
+#: src/lang.c:711
+#, c-format
+msgid	"Toggled word highlighting %s"
+msgstr	"Wort-Hervorhebung: %s"
 
-#: src/lang.c:831 src/lang.c:943
-msgid	"Yes"
-msgstr	"Ja"
+#: src/lang.c:712
+msgid	"Toggled rot13 encoding"
+msgstr	"ROT13-Kodierung (de)aktiviert"
 
-#: src/lang.c:832
-msgid	"Hide All"
-msgstr	"Alle ausblenden"
+#: src/lang.c:713
+#, c-format
+msgid	"Toggled german TeX encoding %s"
+msgstr	"Deutsche TeX-Dekodierung: %s"
 
-#: src/lang.c:840
-msgid	"Address"
-msgstr	"Adresse"
+#: src/lang.c:714
+#, c-format
+msgid	"Toggled tab-width to %d"
+msgstr	"Tabulatorweite zu %d gewechselt"
 
-#: src/lang.c:841
-msgid	"Full Name"
-msgstr	"Voller Name"
+#: src/lang.c:715
+#, c-format
+msgid	"%d Trying to dotlock %s"
+msgstr	"%d Versuche %s zu dotlocken"
 
-#: src/lang.c:842
-msgid	"Address and Name"
-msgstr	"Adresse und Name"
+#: src/lang.c:716
+#, c-format
+msgid	"%d Trying to lock %s"
+msgstr	"%d Versuche %s zu locken"
 
-#: src/lang.c:849
-msgid	"Max"
-msgstr	"Höchster"
+#: src/lang.c:717
+msgid	"           h=help\n"
+msgstr	"          h=Hilfe\n"
 
-#: src/lang.c:850
-msgid	"Sum"
-msgstr	"Summe"
+#: src/lang.c:719
+msgid	"Unlimited"
+msgstr	"Unbegrenzt"
 
-#: src/lang.c:851
-msgid	"Average"
-msgstr	"Durchschnitt"
+#: src/lang.c:720
+msgid	"Enter wildcard unsubscribe pattern> "
+msgstr	"Wildcardmuster für abzubestellende Gruppen> "
 
-#: src/lang.c:856
-msgid	"Lines"
-msgstr	"Zeilen"
+#: src/lang.c:721
+#, c-format
+msgid	"Error decoding %s : %s"
+msgstr	"Fehler beim Dekodieren von %s : %s"
 
-#: src/lang.c:857
-msgid	"Score"
-msgstr	"Bewertung"
+#: src/lang.c:722
+msgid	"No end."
+msgstr	"Kein Ende."
 
-#: src/lang.c:858
-msgid	"Lines & Score"
-msgstr	"Zeilen und Bewertung"
+#: src/lang.c:723
+#, c-format
+msgid	"%s successfully decoded."
+msgstr	"%s erfolgreich dekodiert"
 
-#: src/lang.c:867
-msgid	"Black"
-msgstr	"Schwarz"
+#: src/lang.c:724
+#, c-format
+msgid	"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
+	"\n"
+msgstr	"%*s[-- %s/%s, %suukodierte Datei, %d Zeilen, Name: %s --]\n"
+	"\n"
 
-#: src/lang.c:868
-msgid	"Red"
-msgstr	"Rot"
+#: src/lang.c:725
+msgid	"unread "
+msgstr	"ungelesen "
 
-#: src/lang.c:869
-msgid	"Green"
-msgstr	"Grün"
+#: src/lang.c:726
+#, c-format
+msgid	"unsubscribed from %d groups"
+msgstr	"%d Gruppen abbestellt"
 
-#: src/lang.c:870
-msgid	"Brown"
-msgstr	"Braun"
+#: src/lang.c:727
+#, c-format
+msgid	"Unsubscribed from %s"
+msgstr	"%s wurde abbestellt"
 
-#: src/lang.c:871
-msgid	"Blue"
-msgstr	"Blau"
+#: src/lang.c:728
+msgid	"Unsubscribing... "
+msgstr	"Abbestellen... "
 
-#: src/lang.c:872
-msgid	"Pink"
-msgstr	"Rosa"
+#: src/lang.c:729
+msgid	"Untagged article"
+msgstr	"Artikelmarkierung entfernt"
 
-#: src/lang.c:873
-msgid	"Cyan"
-msgstr	"Cyan"
+#: src/lang.c:730
+msgid	"Untagged thread"
+msgstr	"Unmarkierter Thread"
 
-#: src/lang.c:874
-msgid	"White"
-msgstr	"Weiß"
+#: src/lang.c:731
+msgid	"Unthreading articles..."
+msgstr	"Aktuelle Sortierung der Artikel aufheben..."
 
-#: src/lang.c:875
-msgid	"Gray"
-msgstr	"Grau"
+#: src/lang.c:732
+msgid	"Updated"
+msgstr	"Aktualisiert"
 
-#: src/lang.c:876
-msgid	"Light Red"
-msgstr	"Helles Rot"
+#: src/lang.c:733
+msgid	"Updating"
+msgstr	"Aktualisiere"
 
-#: src/lang.c:877
-msgid	"Light Green"
-msgstr	"Helles Grün"
+#: src/lang.c:734
+#, c-format
+msgid	"Opening %s\n"
+msgstr	"Öffne %s\n"
 
-#: src/lang.c:878
-msgid	"Yellow"
-msgstr	"Gelb"
+#: src/lang.c:735
+msgid	"No more URL's in this article"
+msgstr	"Keine weiteren URLs im Artikel"
 
-#: src/lang.c:879
-msgid	"Light Blue"
-msgstr	"Helles Blau"
+#: src/lang.c:736
+msgid	"Use MIME display program for this message?"
+msgstr	"MIME-Anzeigeprogramm für diese Nachricht benutzen?"
 
-#: src/lang.c:880
-msgid	"Light Pink"
-msgstr	"Helles Rosa"
+#: src/lang.c:737
+msgid	"  -c       mark all news as read in subscribed newsgroups (batch mode)"
+msgstr	"  -c       Markiere Artikel gelesen in den abonnierten Gruppen (Batch-Modus)"
 
-#: src/lang.c:881
-msgid	"Light Cyan"
-msgstr	"Helles Cyan"
+#: src/lang.c:738
+msgid	"  -Z       return status indicating if any unread news (batch mode)"
+msgstr	"  -Z       Rückgabewert zeigt, ob ungelesene Artikel vorliegen (Batch-Modus)"
 
-#: src/lang.c:882
-msgid	"Light White"
-msgstr	"Helles Weiß"
+#: src/lang.c:739
+msgid	"  -q       don't check for new newsgroups"
+msgstr	"  -q       Überprüfe nicht auf neue Newsgruppen"
 
-#: src/lang.c:890 src/lang.c:947 src/lang.c:961
-msgid	"Nothing"
-msgstr	"Nichts"
+#: src/lang.c:740
+msgid	"  -X       don't save any files on quit"
+msgstr	"  -X       Speicher keine Dateien beim Beenden"
 
-#: src/lang.c:891
-msgid	"Mark"
-msgstr	"Markierung"
+#: src/lang.c:741
+msgid	"  -d       don't show newsgroup descriptions"
+msgstr	"  -d       Zeige keine Newsgruppenbeschreibungen"
 
-#: src/lang.c:892
-msgid	"Space"
-msgstr	"Leerzeichen"
+#: src/lang.c:742
+msgid	"  -G limit get only limit articles/group"
+msgstr	"  -G limit Hole nur 'limit' Artikel pro Newsgruppe"
 
-#: src/lang.c:899
-msgid	"Normal"
-msgstr	"Normal"
+#: src/lang.c:743
+#, c-format
+msgid	"  -H       help information about %s"
+msgstr	"  -H       Hilfe und Informationen über %s"
 
-#: src/lang.c:900
-msgid	"Best highlighting"
-msgstr	"Beste Hervorhebung"
+#: src/lang.c:744
+msgid	"  -h       this help message"
+msgstr	"  -h       Diese Hilfeseite"
 
-#: src/lang.c:901
-msgid	"Underline"
-msgstr	"Unterstreichen"
+#: src/lang.c:745
+#, c-format
+msgid	"  -I dir   news index file directory [default=%s]"
+msgstr	"  -I Verz. Verzeichnis für Artikel-Index-Datei [Standard=%s]"
 
-#: src/lang.c:902
-msgid	"Reverse video"
-msgstr	"Invers"
+#: src/lang.c:746
+msgid	"  -u       update index files (batch mode)"
+msgstr	"  -u       Erneuere Index-Dateien (Batch-Modus)"
 
-#: src/lang.c:903
-msgid	"Blinking"
-msgstr	"Blinkend"
+#: src/lang.c:747
+#, c-format
+msgid	"  -m dir   mailbox directory [default=%s]"
+msgstr	"  -m Verz. Mailbox-Verzeichnis [Standard=%s]"
 
-#: src/lang.c:904
-msgid	"Half bright"
-msgstr	"Halbe Helligkeit"
+#: src/lang.c:748
+#, c-format
+msgid	"\n"
+	"Mail bug reports/comments to %s"
+msgstr	"\n"
+	"Schicken Sie Fehlerberichte/Kommentare an %s"
 
-#: src/lang.c:905
-msgid	"Bold"
-msgstr	"Fett"
+#: src/lang.c:749
+msgid	"  -N       mail new news to your posts (batch mode)"
+msgstr	"  -N       Maile neue Artikel an sich selbst (Batch-Modus)"
 
-#: src/lang.c:910
-msgid	"none"
-msgstr	"Nichts"
+#: src/lang.c:750
+msgid	"  -M user  mail new news to specified user (batch mode)"
+msgstr	"  -M user  Maile neue News-Artikel an 'user' (Batch-Modus)"
 
-#: src/lang.c:911
-msgid	"commands"
-msgstr	"Kommandos"
+#: src/lang.c:751
+#, c-format
+msgid	"  -f file  subscribed to newsgroups file [default=%s]"
+msgstr	"  -f Datei 'Datei' als .newsrc-Datei nutzen [Standard=%s]"
 
-#: src/lang.c:912
-msgid	"select"
-msgstr	"X-Befehl"
+#: src/lang.c:752
+msgid	"  -w       post an article and exit"
+msgstr	"  -w       Postet einen Artikel und beendet tin"
 
-#: src/lang.c:914
-msgid	"commands & quit"
-msgstr	"Kommandos & Ende"
+#: src/lang.c:753
+msgid	"  -o       post all postponed articles and exit"
+msgstr	"  -o       Postet alle zurückgelegten Artikel und beendet tin"
 
-#: src/lang.c:915
-msgid	"commands & select"
-msgstr	"Kommandos & X-Befehl"
+#: src/lang.c:754
+msgid	"  -r       read news remotely from default NNTP server"
+msgstr	"  -r       Lese Artikel vom Standard-NNTP-Server"
 
-#: src/lang.c:916
-msgid	"quit & select"
-msgstr	"Ende & X-Befehl"
+#: src/lang.c:755
+msgid	"  -R       read news saved by -S option"
+msgstr	"  -R       Lese Artikel, die durch -S gespeichert wurden"
 
-#: src/lang.c:917
-msgid	"commands & quit & select"
-msgstr	"Kmndos & Ende & X-Befehl"
+#: src/lang.c:756
+#, c-format
+msgid	"  -s dir   save news directory [default=%s]"
+msgstr	"  -s Verz. Verzeichnis zum News-Speichern [Standard=%s]"
 
-#: src/lang.c:942
-msgid	"Shell archive"
-msgstr	"Shellarchiv"
+#: src/lang.c:757
+msgid	"  -S       save new news for later reading (batch mode)"
+msgstr	"  -S       Speichere Artikel für das spätere Lesen (Batch-Modus)"
 
-#: src/lang.c:948
-msgid	"Subject: (descending)"
-msgstr	"Subject: (Absteigend)"
+#: src/lang.c:758
+msgid	"  -z       start if any unread news"
+msgstr	"  -z       Starte, wenn ungelesene Artikel vorliegen"
 
-#: src/lang.c:949
-msgid	"Subject: (ascending)"
-msgstr	"Subject: (Aufsteigend)"
+#: src/lang.c:759
+#, c-format
+msgid	"A Usenet reader.\n"
+	"\n"
+	"Usage: %s [options] [newsgroup[,...]]"
+msgstr	"Ein Usenet-Client.\n"
+	"\n"
+	"Syntax: %s [Optionen] [Newsgruppe[,...]]"
 
-#: src/lang.c:950
-msgid	"From: (descending)"
-msgstr	"From: (Absteigend)"
+#: src/lang.c:760
+msgid	"  -v       verbose output for batch mode options"
+msgstr	"  -v       Ausführliche Ausgabe für Batch-Modus-Optionen"
 
-#: src/lang.c:951
-msgid	"From: (ascending)"
-msgstr	"From: (Aufsteigend)"
+#: src/lang.c:761
+msgid	"  -V       print version & date information"
+msgstr	"  -V       Gebe Versions- und Datumsinformationen aus"
 
-#: src/lang.c:952
-msgid	"Date: (descending)"
-msgstr	"Date: (Absteigend)"
+#: src/lang.c:762
+#, c-format
+msgid	"%s only useful without batch mode operations\n"
+msgstr	"%s ist nur sinnvoll ohne Batchmodeoperationen\n"
 
-#: src/lang.c:953
-msgid	"Date: (ascending)"
-msgstr	"Date: (Aufsteigend)"
+#: src/lang.c:763
+#, c-format
+msgid	"%s only useful for batch mode operations\n"
+msgstr	"%s ist nur sinnvoll für Batchmodeoperationen\n"
 
-#: src/lang.c:954 src/lang.c:962
-msgid	"Score (descending)"
-msgstr	"Bewertung (Absteigend)"
+#: src/lang.c:765
+#, c-format
+msgid	"\n"
+	"%s%d out of range (0 - %d). Reset to 0"
+msgstr	"\n"
+	"%s%d ist außerhalb der Grenzen (0 - %d). Zurücksetzen auf 0"
 
-#: src/lang.c:955 src/lang.c:963
-msgid	"Score (ascending)"
-msgstr	"Bewertung (Aufsteigend)"
+#: src/lang.c:766
+#, c-format
+msgid	"View '%s' (%s/%s)?"
+msgstr	"'%s' (%s/%s) anzeigen?"
 
-#: src/lang.c:956
-msgid	"Lines: (descending)"
-msgstr	"Lines: (Absteigend)"
+#: src/lang.c:768
+#, c-format
+msgid	"\n"
+	"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
+	"%-100s\n"
+msgstr	"\n"
+	"Warnung: Artikel überschreitet %d Spalten. Zeile %d ist die erste lange:\n"
+	"%-100s\n"
 
-#: src/lang.c:957
-msgid	"Lines: (ascending)"
-msgstr	"Lines: (Aufsteigend)"
+#: src/lang.c:769
+msgid	"\n"
+	"Warning: article unchanged after editing\n"
+msgstr	"\n"
+	"Warnung: Artikel wurde im Editor nicht verändert\n"
 
-#: src/lang.c:968
-msgid	"Always Keep"
-msgstr	"Immer behalten"
+#: src/lang.c:770
+msgid	"\n"
+	"Warning: \"Subject:\" contains only whitespaces.\n"
+msgstr	"\n"
+	"Warnung: \"Subject:\" enthält nur Leerzeichen.\n"
 
-#: src/lang.c:969
-msgid	"Always Remove"
-msgstr	"Immer entfernen"
+#: src/lang.c:771
+msgid	"\n"
+	"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n"
+msgstr	"\n"
+	"Warnung: \"Subject:\" beginnt mit \"Re: \", aber es gibt keine "
+	"\"References:\".\n"
 
-#: src/lang.c:970
-msgid	"Mark with D on selection screen"
-msgstr	"Mit D in der Anzeige markiert"
+#: src/lang.c:773
+msgid	"\n"
+	"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
+	"         with \"Re: \" and does not contain \"(was:\".\n"
+msgstr	"\n"
+	"Warnung: Artikel hat \"References:\" aber \"Subject:\" beginnt nicht\n"
+	"         mit \"Re: \" and enthält auch kein \"(was:\".\n"
 
-#: src/lang.c:975
-msgid	"Kill only unread arts"
-msgstr	"Killt nur ungelesene Artikel"
+#: src/lang.c:776
+msgid	"Read carefully!\n"
+	"\n"
+	"  You are about to cancel an article seemingly written by you. This will "
+	"wipe\n"
+	"  the article from most  news servers  throughout the world,  but there is "
+	"no\n"
+	"  guarantee that it will work.\n"
+	"\n"
+	"This is the article you are about to cancel:\n"
+	"\n"
+msgstr	"Sorgfältig lesen!\n"
+	"\n"
+	" Sie wollen einen Artikel canceln (löschen), der offenbar von ihnen stammt.\n"
+	" Dies wird den Artikel von den meisten Newsservern dieser Welt löschen.\n"
+	" Es gibt aber keine Garantie, das dies überall geschieht.\n"
+	"\n"
+	"Das ist der Artikel, den sie canceln (löschen) wollen:\n"
+	"\n"
 
-#: src/lang.c:976
-msgid	"Kill all arts & show with K"
-msgstr	"Killt alle Artikel, markiert mit K"
+#: src/lang.c:780
+msgid	"\n"
+	"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
+	"         quoted-printable) and an external inews program to submit your\n"
+	"         article. If a signature is appended by that inews program it will\n"
+	"         not be encoded properly.\n"
+msgstr	"\n"
+	"Warnung: Sie benutzen eine Zeichenkodierung, die Zeichen verändert (z.B.\n"
+	"         base64 oder quoted-printable) und einen externen inews um ihren\n"
+	"         Artikel zu übertragen. Falls durch diesen inews eine Signatur\n"
+	"         angehängt wird, so kann diese nicht korrekt kodiert werden.\n"
 
-#: src/lang.c:977
-msgid	"Kill all arts and never show"
-msgstr	"Killt alle Artikel, zeigt sie nie"
+#: src/lang.c:785
+#, c-format
+msgid	"\n"
+	"\n"
+	"You are upgrading to tin %s from an earlier version.\n"
+	"Some values in your %s file have changed!\n"
+	"Read WHATSNEW, etc...\n"
+msgstr	"\n"
+	"\n"
+	"Sie benutzen jetzt tin %s, eine neuere Version als früher.\n"
+	"Einige Einstellungen in Ihrem %s-File haben sich geändert!\n"
+	"Lesen sie \"WHATSNEW\", usw....\n"
 
-#: src/lang.c:982
-msgid	"Nothing special"
-msgstr	"Nichts besonderes"
+#: src/lang.c:787
+#, c-format
+msgid	"\n"
+	"\n"
+	"You are downgrading to tin %s from a more recent version!\n"
+	"Some values in your %s file may be ignored, others might have changed!\n"
+msgstr	"\n"
+	"\n"
+	"Sie benutzen jetzt tin %s, eine ältere Version als früher!\n"
+	"Evtl. werden Einstellungen in Ihrem %s-File nicht erkannt\n"
+	"oder ändern sich!\n"
 
-#: src/lang.c:983
-msgid	"Compress quotes"
-msgstr	"Zitatzeichen zusammenfassen"
+#: src/lang.c:790
+#, c-format
+msgid	"Warning: tin wrote fewer groups to your\n"
+	"\t%s\n"
+	"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
+	"this session this indicates an error and you should backup your %s\n"
+	"before you start tin once again!\n"
+msgstr	"Warnung: tin hat weniger Gruppen in ihre\n"
+	"\t%s\n"
+	"geschrieben, als es beim Start eingelesen hat. Falls Sie nicht %ld %s\n"
+	"währenddessen abbestellt haben, ist ein Fehler aufgetreten und Sie sollten\n"
+	"ihre %s wiederherstellen, bevor Sie tin nochmal starten!\n"
 
-#: src/lang.c:984
-msgid	"Quote signatures"
-msgstr	"Signaturen zitieren"
+#: src/lang.c:794
+#, c-format
+msgid	"\n"
+	"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
+msgstr	"\n"
+	"Warnung: Es gibt %d '-- \\n' Zeilen. Das könnte einige Leute verwirren.\n"
 
-#: src/lang.c:985
-msgid	"Compress quotes, quote sigs"
-msgstr	"Zitatz. kürzen, Signat. zitieren"
+#: src/lang.c:795
+#, c-format
+msgid	"Warning: Only %d out of %d articles were saved"
+msgstr	"Warnung: Nur %d von %d Artikeln gespeichert"
 
-#: src/lang.c:986
-msgid	"Quote empty lines"
-msgstr	"Leerzeilen zitieren"
+#: src/lang.c:796
+#, c-format
+msgid	"\n"
+	"Warning: Your signature  is longer than %d lines.  Since signatures usually "
+	"do\n"
+	"         not  transport any  useful information,  they should be as  short "
+	"as\n"
+	"         possible.\n"
+msgstr	"\n"
+	"Warnung: Ihre Signatur ist mehr als %d Zeilen lang. Da Signaturen meist "
+	"keine\n"
+	"         nützlichen Informationen enthalten, sollten sie so kurz wie möglich\n"
+	"         gehalten werden.\n"
 
-#: src/lang.c:987
-msgid	"Compress quotes, quote empty lines"
-msgstr	"Zitatz. kürzen, Leerzeilen zit."
+#: src/lang.c:800
+#, c-format
+msgid	"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
+msgstr	"Warnung: E-Mailadr. evtl. verfälscht (Spamfalle). %s=weiter, %s=Abbruch? "
 
-#: src/lang.c:988
-msgid	"Quote sigs & empty lines"
-msgstr	"Signat. und Leerzeilen zitieren"
+#: src/lang.c:801
+msgid	"\n"
+	"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
+msgstr	"\n"
+	"Warnung: Signaturen sollten mit '-- \\n' und nicht mit '--\\n' beginnen.\n"
 
-#: src/lang.c:989
-msgid	"Comp. q., quote sigs & empty lines"
-msgstr	"Zitatz. kürzen, Sign & Leerz. zit."
+#: src/lang.c:802
+msgid	"Writing attributes file..."
+msgstr	"Schreibe Datei mit den Eigenschaften der Newsgruppen..."
 
-#: src/lang.c:1026
-msgid	"Print"
-msgstr	"drucken"
+#: src/lang.c:804
+#, c-format
+msgid	"%d Responses%s"
+msgstr	"%d Antworten%s"
 
-#: src/lang.c:1027
-msgid	"Printing..."
-msgstr	"Drucke..."
+#: src/lang.c:806
+#, c-format
+msgid	"Added %d %s"
+msgstr	"%d %s hinzugefügt"
+
+#: src/lang.c:807
+msgid	"No unsubscribed groups to show"
+msgstr	"Keine nicht abonnierte Gruppen gefunden"
+
+#: src/lang.c:808
+msgid	"Showing subscribed to groups only"
+msgstr	"Zeige nur abonnierte Gruppen"
+
+#: src/lang.c:809
+msgid	"Yes "
+msgstr	"Ja  "
+
+#: src/lang.c:810
+msgid	"    You have mail\n"
+msgstr	"   Sie haben Mail\n"
+
+#: src/lang.c:815
+#, c-format
+msgid	"\n"
+	"Warning: Posting is in %s and contains characters which are not\n"
+	"         in your selected MM_NETWORK_CHARSET: %s.\n"
+	"         These characters will be replaced by '?' if you post this\n"
+	"         article unchanged. To avoid garbling your article please either\n"
+	"         edit it and remove those characters or change the setting of\n"
+	"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
+	"         M)enu option.\n"
+msgstr	"\n"
+	"Warnung: Artikel ist in %s und enthält Zeichen die nicht im\n"
+	"         konfiguriertem MM_NETWORK_CHARSET: %s enthalten sind.\n"
+	"         Diese Zeichen werden durch '?' ersetzt wenn der Artikel\n"
+	"         unverändert gepostet wird. Um das zu vermeiden sollten Sie\n"
+	"         entweder den Artiklen entspechend ändern und diese Zeichen\n"
+	"         entfernen oder MM_NETWORK_CHARSET im M)neu auf einen\n"
+	"         passenderen Wert setzen.\n"
+
+#: src/lang.c:826
+#, c-format
+msgid	"Redefined key %s '%s' -> '%s'\n"
+msgstr	"Neubelegung %s '%s' -> '%s'\n"
+
+#: src/lang.c:827
+msgid	"  -D       debug mode 1=NNTP 2=ALL"
+msgstr	"  -D       Debug-Modus 1=NNTP 2=ALLES"
 
-#: src/lang.c:1032
+#: src/lang.c:831
+msgid	"Read carefully!\n"
+	"\n"
+	"  You are about to cancel an article seemingly not written by you.  This "
+	"will\n"
+	"  wipe the article from lots of news servers throughout the world;\n"
+	"  Usenet's majority  considers this  rather inappropriate,  to say the "
+	"least.\n"
+	"  Only press 'd'  if you are  absolutely positive  that you are ready to "
+	"take\n"
+	"  the rap.\n"
+	"\n"
+	"This is the article you are about to cancel:\n"
+	"\n"
+msgstr	"Sorgfältig lesen!\n"
+	"\n"
+	" Sie wollen einen Artikel canceln (löschen), der offenbar nicht von ihnen "
+	"stammt.\n"
+	" Dies wird den Artikel auf sehr vielen Newsservern dieser Welt löschen;\n"
+	" Der Grossteil der Usenetteilnehmer hält dies für nicht akzeptabel.\n"
+	" Drücken Sie 'd' nur, wenn Sie wirklich sicher sind, das Sie mit den\n"
+	" eventuellen Konsequenzen leben können.\n"
+	"\n"
+	"Dies ist der Artikel, den Sie canceln (löschen) wollen:\n"
+	"\n"
+
+#: src/lang.c:840
+msgid	"toggle color"
+msgstr	"Farben ein/aus"
+
+#: src/lang.c:841
+msgid	"# For color-adjust use the following numbers\n"
+	"#  0-black       1-red         2-green        3-brown\n"
+	"#  4-blue        5-pink        6-cyan         7-white\n"
+	"# These are *only* for foreground:\n"
+	"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
+	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
+	"# A '-1' is interpreted as default (foreground normally is white, and\n"
+	"# background black)\n"
+	"\n"
+msgstr	"# Für die Farbanpassung benutzen Sie folgende Nummern\n"
+	"#  0-schwarz     1-rot         2-grün         3-braun\n"
+	"#  4-blau        5-rosa        6-cyan         7-weiß\n"
+	"# Diese sind *nur* für den Vordergrund:\n"
+	"#  8-grau        9-hellrot   10-hellgrün   11-gelb\n"
+	"# 12-hellblau   13-hellrosa  14-hellcyan   15-hellweiß\n"
+	"# Eine '-1' wird als Voreinstellung interpretiert (der Vordergrund ist\n"
+	"# normalerweise weiß und der Hintergrund schwarz)\n"
+
+#: src/lang.c:849
+msgid	"  -a       toggle color flag"
+msgstr	"  -a       Farbe ein- oder ausschalten"
+
+#: src/lang.c:853
+msgid	"\n"
+	"Error: Followup-To set to more than one newsgroup!\n"
+msgstr	"\n"
+	"Fehler: Followup-To auf mehr als eine Newsgruppe gesetzt!\n"
+
+#: src/lang.c:854
+#, c-format
+msgid	"\n"
+	"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
+msgstr	"\n"
+	"Fehler: Crossposting in %d Newsgruppen und kein Followup-To gesetzt!\n"
+
+#: src/lang.c:855
+#, c-format
+msgid	"\n"
+	"Error: \"%s\" is not a valid newsgroup!\n"
+msgstr	"\n"
+	"Fehler: \"%s\" ist keine gültige Newsgruppe!\n"
+
+#: src/lang.c:857
+msgid	"\n"
+	"Warning: Followup-To set to more than one newsgroup!\n"
+msgstr	"\n"
+	"Warnung: Followup-To in mehr als eine Newsgruppe gesetzt!\n"
+
+#: src/lang.c:858
+#, c-format
+msgid	"\n"
+	"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
+msgstr	"\n"
+	"Warnung: Crossposting in %d Newsgruppen und kein Followup-To gesetzt!\n"
+
+#: src/lang.c:859
+#, c-format
+msgid	"\n"
+	"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
+msgstr	"\n"
+	"Warnung: \"%s\" ist nicht in Ihrer newsrc, sie könnte ungültig sein!\n"
+
+#: src/lang.c:860
+#, c-format
+msgid	"\n"
+	"Warning: \"%s\" is not a valid newsgroup at this site!\n"
+msgstr	"\n"
+	"Warnung: \"%s\" ist keine gültige Newsgruppe auf diesem Server!\n"
+
+#: src/lang.c:864
+#, c-format
+msgid	"%d files successfully written from %d articles. %d %s occurred."
+msgstr	"%d Dateien aus %d Artikeln erfolgreich geschrieben. %d %s traten auf"
+
+#: src/lang.c:865
+msgid	"Missing parts."
+msgstr	"Teile fehlen."
+
+#: src/lang.c:866
+msgid	"No beginning."
+msgstr	"Kein Anfang."
+
+#: src/lang.c:867
+msgid	"No data."
+msgstr	"Keine Daten."
+
+#: src/lang.c:868
+msgid	"Unknown error."
+msgstr	"Unbekannter Fehler."
+
+#: src/lang.c:870
+#, c-format
+msgid	"\tChecksum of %s (%ld %s)"
+msgstr	"\tPrüfsumme für %s (%ld %s)"
+
+#: src/lang.c:874
+msgid	"Reading mail active file... "
+msgstr	"Lese EMail-Active-Datei... "
+
+#: src/lang.c:875
+msgid	"Reading mailgroups file... "
+msgstr	"Lese Mailgruppen-Datei... "
+
+#: src/lang.c:879
+msgid	"perform PGP operations on article"
+msgstr	"wendet PGP auf den Artikel an"
+
+#: src/lang.c:880
+msgid	"Add key(s) to public keyring?"
+msgstr	"Schlüssel dem Öffentlichen Schlüsselring hinzufügen?"
+
+#: src/lang.c:881
+#, c-format
+msgid	"%s=encrypt, %s=sign, %s=both, %s=quit: "
+msgstr	"%s=verschlüsseln, %s=signieren, %s=beides, %s=Ende: "
+
+#: src/lang.c:882
+#, c-format
+msgid	"%s=sign, %s=sign & include public key, %s=quit: "
+msgstr	"%s=signiere, %s=signiere & füge öffentl. Schlüssel hinzu, %s=Ende: "
+
+#: src/lang.c:883
+#, c-format
+msgid	"PGP has not been set up (can't open %s)"
+msgstr	"PGP Wurde nicht konfiguriert (kann %s nicht öffnen)"
+
+#: src/lang.c:884
+msgid	"Article not signed and no public keys found"
+msgstr	"Artikel ist nicht signiert; keine öffentlichen Schlüssel gefunden"
+
+#: src/lang.c:886
 #, c-format
 msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
 msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=Menu, %s=posten, "
 	"%s=zurücklegen: "
 
-#: src/lang.c:1033
+#: src/lang.c:887
 msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
 msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=verschicken [%%.*s]: "
 
-#: src/lang.c:1034
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=post, %s=Zurückl. [%%.*s]: "
+#: src/lang.c:888
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=Menu, %s=posten, %s=zurücklegen "
+	"[%%.*s]: "
 
-#: src/lang.c:1036
+#: src/lang.c:890
 #, c-format
 msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
 msgstr	"%s=Ende, %s=bearbeiten, %s=pgp, %s=Menu, %s=posten, %s=zurücklegen: "
 
-#: src/lang.c:1037
+#: src/lang.c:891
 msgid	"%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
 msgstr	"%s=Ende, %s=bearbeiten, %s=pgp, %s=verschicken [%%.*s]: "
 
-#: src/lang.c:1038
-msgid	"%s=quit, %s=edit, %s=pgp, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=Ende, %s=bearbeiten, %s=pgp, %s=posten, %s=zurücklegen [%%.*s]: "
+#: src/lang.c:892
+msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=Ende, %s=bearbeiten, %s=pgp, %s=Menu, %s=posten, %s=zurücklegen [%%.*s]: "
 
-#: src/lang.c:1042
+#: src/lang.c:896
 #, c-format
 msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=Menu, %s=posten, "
-	"%s=zurücklegen: "
+msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=Menü, %s=posten, %s=zurücklegen: "
 
-#: src/lang.c:1043
+#: src/lang.c:897
 msgid	"%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
 msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=verschicken [%%.*s]: "
 
-#: src/lang.c:1044
-msgid	"%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=posten, %s=Zurückl. [%%.*s]: "
+#: src/lang.c:898
+msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=Menü, %s=post, %s=Zurückl. [%%.*s]: "
 
-#: src/lang.c:1046
+#: src/lang.c:900
 #, c-format
 msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=Ende, %s=bearbeiten, %s=pgp, %s=Menu, %s=posten, %s=zurücklegen: "
+msgstr	"%s=Ende, %s=bearbeiten, %s=Menu, %s=posten, %s=zurücklegen: "
 
-#: src/lang.c:1047
+#: src/lang.c:901
 msgid	"%s=quit, %s=edit, %s=send [%%.*s]: "
 msgstr	"%s=Ende, %s=bearbeiten, %s=verschicken [%%.*s]: "
 
-#: src/lang.c:1048
-msgid	"%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=Ende, %s=bearbeiten, %s=posten, %s=zurücklegen [%%.*s]: "
+#: src/lang.c:902
+msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=Ende, %s=bearbeiten, %s=Menü, %s=posten, %s=zurücklegen [%%.*s]: "
 
-#: src/lang.c:1052
+#: src/lang.c:908
 #, c-format
-msgid	" at %s"
-msgstr	" bei %s"
+msgid	"Environment variable %s not found. Set and retry..."
+msgstr	"Umgebungsvariable %s nicht gefunden. Setzen und nochmal versuchen..."
 
-#: src/lang.c:1053
-msgid	"There is no news\n"
-msgstr	"Es gibt keine neuen Artikel\n"
+#: src/lang.c:909
+msgid	"  -B       BBS mode. File operations limited to home directories."
+msgstr	"  -B       BBS-Modus. Datei-Operationen limitiert auf das Home-Verzeichnis."
 
-#: src/lang.c:1054
-msgid	"Thread"
-msgstr	"Thread"
+#: src/lang.c:917
+msgid	"Try cache_overview_files to speed up things.\n"
+msgstr	"Setze cache_overview_files um das lesen zu beschleubigen.\n"
 
-#: src/lang.c:1055
-msgid	"Thread Level Commands"
-msgstr	"Thread Level Kommandos"
+#: src/lang.c:918
+msgid	"Tin will use local index files instead.\n"
+msgstr	"Tin wird lokale index files benutzen.\n"
 
-#: src/lang.c:1056
-msgid	"Thread deselected"
-msgstr	"Thread nicht mehr ausgewählt"
+#: src/lang.c:919
+msgid	"Cannot find NNTP server name"
+msgstr	"Kann den Namen des NNTP Servers nicht finden"
 
-#: src/lang.c:1057
-msgid	"Thread selected"
-msgstr	"Thread ausgewählt"
+#: src/lang.c:920
+#, c-format
+msgid	"Connecting to %s:%d..."
+msgstr	"Verbinde mit %s:%d..."
 
-#: src/lang.c:1058
-msgid	"Thread range"
-msgstr	"Thread-Bereich"
+#: src/lang.c:921
+msgid	"Disconnecting from server...\n"
+msgstr	"Trenne Verbindung zum Server...\n"
 
-#: src/lang.c:1059
+#: src/lang.c:922
 #, c-format
-msgid	"%sThread %4s of %4s"
-msgstr	"%sThread %4s v. %4s"
-
-#: src/lang.c:1060
-msgid	"Threading articles..."
-msgstr	"Sortiere Artikel..."
+msgid	"Wrong newsgroup name in response of GROUP command, %s for %s"
+msgstr	"Falsche Newsgruppe in Antwort auf GROUP-Befehl, %s statt %s"
 
-#: src/lang.c:1061
+#: src/lang.c:923
 #, c-format
-msgid	"Toggled word highlighting %s"
-msgstr	"Wort-Hervorhebung: %s"
+msgid	"Failed to connect to NNTP server %s. Exiting..."
+msgstr	"Konnte nicht zum NNTP Server %s verbinden. Beende..."
 
-#: src/lang.c:1062
-msgid	"Toggled rot13 encoding"
-msgstr	"ROT13-Kodierung (de)aktiviert"
+#: src/lang.c:924 src/nntplib.c:975
+msgid	"205  Closing connection"
+msgstr	"205  Schließe Verbindung"
 
-#: src/lang.c:1063
+#: src/lang.c:925
+msgid	"Your server does not support the NNTP XOVER or OVER command.\n"
+msgstr	"Ihr Server unterstützt kein NNTP XOVER oder OVER Kommando.\n"
+
+#: src/lang.c:926
+msgid	"Connection to news server has timed out. Reconnect?"
+msgstr	"Die Verbindung zum Newsserver wurde unterbrochen. Wieder verbinden?"
+
+#: src/lang.c:927
 #, c-format
-msgid	"Toggled german TeX encoding %s"
-msgstr	"Deutsche TeX-Dekodierung: %s"
+msgid	"Put the server name in the file %s,\n"
+	"or set the environment variable NNTPSERVER"
+msgstr	"Schreiben Sie den Servernamen in die Datei %s,\n"
+	"oder setzen Sie die Umgebungsvariable NNTPSERVER"
+
+#: src/lang.c:928
+msgid	"  -A       force authentication on connect"
+msgstr	"  -A       Erzwinge Anmeldung bei Verbindung"
 
-#: src/lang.c:1064
+#: src/lang.c:929
 #, c-format
-msgid	"Toggled tab-width to %d"
-msgstr	"Tabulatorweite zu %d gewechselt"
+msgid	"  -g serv  read news from NNTP server serv [default=%s]"
+msgstr	"  -g serv  Lese Artikel vom NNTP-Server 'serv' [Standard=%s]"
 
-#: src/lang.c:1065
+#: src/lang.c:930
 #, c-format
-msgid	"Trying %s"
-msgstr	"Versuche %s"
+msgid	"  -p port  use port as NNTP port [default=%d]"
+msgstr	"  -p port  Benutze 'port' als NNTP-Port [Standard=%d]"
+
+#: src/lang.c:931
+msgid	"  -Q       quick start. Same as -nqd"
+msgstr	"  -Q       Schnellstart. Das Selbe wie -nqd"
+
+#: src/lang.c:932
+msgid	"  -l       use only LIST instead of GROUP (-n) command"
+msgstr	"  -l       Benutze nur das LIST anstelle vom GROUP-Kommando (-n)"
+
+#: src/lang.c:933
+msgid	"  -n       only read subscribed .newsrc groups from NNTP server"
+msgstr	"  -n       Lese nur Gruppen aus der .newsrc-Datei vom NNTP-Server"
 
-#: src/lang.c:1066
+#: src/lang.c:935
 #, c-format
-msgid	"%d Trying to dotlock %s"
-msgstr	"%d Versuche %s zu dotlocken"
+msgid	"%s/tcp: Unknown service.\n"
+msgstr	"%s/tcp: Unbekannter Service.\n"
+
+#: src/lang.c:938
+msgid	"\n"
+	"socket or connect problem\n"
+msgstr	"\n"
+	"Socket oder Verbindungsproblem\n"
 
-#: src/lang.c:1067
+#: src/lang.c:940
 #, c-format
-msgid	"%d Trying to lock %s"
-msgstr	"%d Versuche %s zu locken"
+msgid	"\n"
+	"Connection to %s: "
+msgstr	"\n"
+	"Verbindung mit %s: "
 
-#: src/lang.c:1068
-msgid	"           h=help\n"
-msgstr	"          h=Hilfe\n"
+#: src/lang.c:941
+msgid	"Giving up...\n"
+msgstr	"Gebe auf...\n"
 
-#: src/lang.c:1069
-msgid	"unread "
-msgstr	"ungelesen "
+#: src/lang.c:944
+msgid	"Your server does not have Xref: in its XOVER information.\n"
+	"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
+msgstr	"Ihr Server hat kein Xref: in seiner XOVER-Information.\n"
+	"Tin versucht XHDR XREF zu benutzen (verlangsamt den Prozess etwas).\n"
+
+#: src/lang.c:947
+msgid	"Your server does not have Xref: in its XOVER information.\n"
+msgstr	"Ihr Server hat kein Xref: in seiner XOVER-Information.\n"
 
-#: src/lang.c:1070
+#: src/lang.c:950
 #, c-format
-msgid	"unsubscribed from %d groups"
-msgstr	"%d Gruppen abbestellt"
+msgid	"Can't open %s. Try %s -r to read news via NNTP.\n"
+msgstr	"Kann %s nicht öffnen. Probieren Sie %s -r um via NNTP zu lesen.\n"
+
+#: src/lang.c:953
+msgid	"  -Q       quick start. Same as -qd"
+msgstr	"  -Q       Schnellstart. Das Selbe wie -qd"
+
+#: src/lang.c:954
+msgid	"  -l       read only active file instead of scanning spool (-n) command"
+msgstr	"  -l       Nur active File lesen ohne den Spool zu durchsuchen (-n) Kommando"
+
+#: src/lang.c:955
+msgid	"  -n       only read subscribed .newsrc groups from spool"
+msgstr	"  -n       Lese nur Gruppen aus der .newsrc-Datei aus dem lokalen Spool"
+
+#: src/lang.c:956
+msgid	"Your server does not have Xref: in its NOV-files.\n"
+msgstr	"Ihr Server hat kein Xref: in seinern NOV-Dateien.\n"
+
+#: src/lang.c:960
+msgid	"Posting using external inews failed. Use built in inews instead?"
+msgstr	"Fehler beim Posten mit externem inews, verwende eingebautes?"
+
+#: src/lang.c:961
+msgid	"It worked! Should I always use my built in inews from now on?"
+msgstr	"Das hat funktioniert. In Zukunft immer eingebautes inews verwenden?"
 
-#: src/lang.c:1071
+#: src/lang.c:969
 #, c-format
-msgid	"Unsubscribed from %s"
-msgstr	"%s wurde abbestellt"
+msgid	"%d %s printed"
+msgstr	"%d %s gedruckt"
 
-#: src/lang.c:1072
-msgid	"Unsubscribing... "
-msgstr	"Abbestellen... "
+#: src/lang.c:970
+msgid	"output article/thread/hot/pattern/tagged articles to printer"
+msgstr	"druckt Artikel/Thread/hervorgehobene/Muster/markierten"
 
-#: src/lang.c:1073
-msgid	"Untagged article"
-msgstr	"Artikelmarkierung entfernt"
+#: src/lang.c:971
+msgid	"Print"
+msgstr	"drucken"
 
-#: src/lang.c:1074
-msgid	"Untagged thread"
-msgstr	"Unmarkierter Thread"
+#: src/lang.c:972
+msgid	"Printing..."
+msgstr	"Drucke..."
 
-#: src/lang.c:1075
-msgid	"Unthreading articles..."
-msgstr	"Aktuelle Sortierung der Artikel aufheben..."
+#: src/lang.c:976
+msgid	"pipe article/thread/hot/pattern/tagged articles into command"
+msgstr	"pipet Artikel/thread hervorgehoben/muster/markierten Artikel"
 
-#: src/lang.c:1076
-msgid	"Updated"
-msgstr	"Aktualisiert"
+#: src/lang.c:977
+msgid	"No command"
+msgstr	"Kein Kommando"
 
-#: src/lang.c:1077
-msgid	"Updating"
-msgstr	"Aktualisiere"
+#: src/lang.c:978
+msgid	"Pipe"
+msgstr	"Pipe"
 
-#: src/lang.c:1078
+#: src/lang.c:979
 #, c-format
-msgid	"Opening %s\n"
-msgstr	"Öffne %s\n"
+msgid	"Pipe to command [%.*s]> "
+msgstr	"Pipen in Kommando [%.*s]> "
 
-#: src/lang.c:1079
-msgid	"No more URL's in this article"
-msgstr	"Keine weiteren URLs im Artikel"
+#: src/lang.c:980
+msgid	"Piping..."
+msgstr	"Pipen..."
 
-#: src/lang.c:1080
-msgid	"Use MIME display program for this message?"
-msgstr	"MIME-Anzeigeprogramm für diese Nachricht benutzen?"
+#: src/lang.c:982
+msgid	"Piping not enabled."
+msgstr	"Pipen nicht aktiviert."
 
-#: src/lang.c:1081
-msgid	"  -c       mark all news as read in subscribed newsgroups (batch mode)"
-msgstr	"  -c       Markiere Artikel gelesen in den abonnierten Gruppen (Batch-Modus)"
+#: src/lang.c:986
+#, c-format
+msgid	"\n"
+	"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
+	"       The only allowable  space is the one  separating the colon (:)\n"
+	"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
+	"       newsgroup names.\n"
+msgstr	"\n"
+	"Fehler: Die \"%s:\" Zeile hat Leerzeichen, die entfernt werden MÜSSEN.\n"
+	"        Der einzig erlaubte Leerraum ist derjenige, der das ':'\n"
+	"        vom Inhalt trennt. Benutzen sie ein ',' um mehrere Newsgruppen\n"
+	"        anzugeben\n"
 
-#: src/lang.c:1082
-msgid	"  -Z       return status indicating if any unread news (batch mode)"
-msgstr	"  -Z       Rückgabewert zeigt, ob ungelesene Artikel vorliegen (Batch-Modus)"
+#: src/lang.c:991
+#, c-format
+msgid	"\n"
+	"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
+	"       the line  may not  contain  whitespace,  this is  not allowed.\n"
+	"       Please write all newsgroups into a single line.\n"
+msgstr	"\n"
+	"Fehler: Die \"%s:\" Zeile ist in der nächsten Zeile fortgesetzt.\n"
+	"        Da diese Zeile keinen leeren Raum enthalten darf, ist dies nicht\n"
+	"        erlaubt. Bitte schreiben Sie alle Newsgruppen in eine Zeile\n"
 
-#: src/lang.c:1083
-msgid	"  -q       don't check for new newsgroups"
-msgstr	"  -q       Überprüfe nicht auf neue Newsgruppen"
+#: src/lang.c:996
+#, c-format
+msgid	"\n"
+	"Warning: The \"%s:\" line is continued in the next line.\n"
+	"         This is a very new feature and may not be accepted by all servers.\n"
+	"         To avoid trouble please write all newsgroups into a single line.\n"
+msgstr	"\n"
+	"Warnung: Die \"%s:\" Zeile ist in der nächsten Zeile fortgesetzt.\n"
+	"         Da diese Zeile keinen leeren Raum enthalten darf, ist dies nicht\n"
+	"         erlaubt. Bitte schreiben Sie alle Newsgruppen in eine Zeile.\n"
 
-#: src/lang.c:1084
-msgid	"  -X       don't save any files on quit"
-msgstr	"  -X       Speicher keine Dateien beim Beenden"
+#: src/lang.c:1000
+#, c-format
+msgid	"\n"
+	"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
+msgstr	"\n"
+	"Warnung: Die \"%s:\" Zeile enthält Leerzeichen die entfernt\n"
+	"         werden sollten.\n"
 
-#: src/lang.c:1085
-msgid	"  -d       don't show newsgroup descriptions"
-msgstr	"  -d       Zeige keine Newsgruppenbeschreibungen"
+#: src/lang.c:1005
+msgid	"\n"
+	"  If your article contains quoted text  please take some time to pare it "
+	"down\n"
+	"  to just the  key points to which you are  responding,  or people will "
+	"think\n"
+	"  you are a dweeb!  Many people have the habit of skipping any article  "
+	"whose\n"
+	"  first page is largely  quoted material.  Format your article to fit in "
+	"less\n"
+	"  then 80 chars,  since that's the conventional size  (72 is a good choice "
+	"as\n"
+	"  it allows quoting without exceeding the limit).  If your lines are too "
+	"long\n"
+	"  they'll wrap  around  ugly and  people won't  read what you  write.  If "
+	"you\n"
+	"  aren't  careful  and considerate  in  formatting  your posting, people  "
+	"are\n"
+	"  likely to ignore it completely.  It's a crowded net out there.\n"
+msgstr	"\n"
+	"  Wenn ihr Artikel zitierten Text enthält, nehmen Sie sich Zeit und kürzen\n"
+	"  Sie die Zitate auf das Nötigste, behalten Sie nur die Kernpunkte bei, auf\n"
+	"  die Sie sich beziehen! Viele Leute lesen Artikel, deren erste Seite nur\n"
+	"  aus zitiertem Text besteht, überhaupt nicht. Formatieren Sie ihren Artikel\n"
+	"  so, dass er maximal 80 Zeichen lange Zeilen enthält, für ihren eigenen\n"
+	"  Text sind 72 Zeichen eine gute Wahl, so bleibt dieser auch zitiert unter\n"
+	"  80 Zeichen. Wenn ihre Zeilen zu lang sind, werden Sie auf dem Bildschirm\n"
+	"  kammartig umbrochen, und sind daher sehr mühsam zu lesen. Wenn Sie ihren\n"
+	"  Artikel nicht sorgfältig formatieren, ist es sehr wahrscheinlich, dass er\n"
+	"  von vielen gar nicht gelesen wird.\n"
 
-#: src/lang.c:1086
-msgid	"  -G limit get only limit articles/group"
-msgstr	"  -G limit Hole nur 'limit' Artikel pro Newsgruppe"
+#: src/lang.c:1018
+msgid	"shell escape"
+msgstr	"Ausgang zur Shell"
 
-#: src/lang.c:1087
+#: src/lang.c:1019
 #, c-format
-msgid	"  -H       help information about %s"
-msgstr	"  -H       Hilfe und Informationen über %s"
-
-#: src/lang.c:1088
-msgid	"  -h       this help message"
-msgstr	"  -h       Diese Hilfeseite"
+msgid	"Shell Command (%s)"
+msgstr	"Shellkommando (%s)"
 
-#: src/lang.c:1089
+#: src/lang.c:1020
 #, c-format
-msgid	"  -I dir   news index file directory [default=%s]"
-msgstr	"  -I Verz. Verzeichnis für Artikel-Index-Datei [Standard=%s]"
-
-#: src/lang.c:1090
-msgid	"  -u       update index files (batch mode)"
-msgstr	"  -u       Erneuere Index-Dateien (Batch-Modus)"
+msgid	"Enter shell command [%s]> "
+msgstr	"Geben Sie ein Shellkommando ein [%s]> "
 
-#: src/lang.c:1091
+#: src/lang.c:1024
 #, c-format
-msgid	"  -m dir   mailbox directory [default=%s]"
-msgstr	"  -m Verz. Mailbox-Verzeichnis [Standard=%s]"
+msgid	"%s: Can't get entry for TERM\n"
+msgstr	"%s: Kann den Wert für TERM nicht finden\n"
 
-#: src/lang.c:1092
+#: src/lang.c:1028
 #, c-format
-msgid	"\n"
-	"Mail bug reports/comments to %s"
-msgstr	"\n"
-	"Schicken Sie Fehlerberichte/Kommentare an %s"
-
-#: src/lang.c:1093
-msgid	"  -N       mail new news to your posts (batch mode)"
-msgstr	"  -N       Maile neue Artikel an sich selbst (Batch-Modus)"
-
-#: src/lang.c:1094
-msgid	"  -M user  mail new news to specified user (batch mode)"
-msgstr	"  -M user  Maile neue News-Artikel an 'user' (Batch-Modus)"
+msgid	"Group %.*s ('q' to quit)..."
+msgstr	"Gruppe %.*s ('q' zum beenden...)"
 
-#: src/lang.c:1095
+#: src/lang.c:1030
 #, c-format
-msgid	"  -f file  subscribed to newsgroups file [default=%s]"
-msgstr	"  -f Datei 'Datei' als .newsrc-Datei nutzen [Standard=%s]"
-
-#: src/lang.c:1096
-msgid	"  -w       post an article and exit"
-msgstr	"  -w       Postet einen Artikel und beendet tin"
+msgid	"Group %.*s..."
+msgstr	"Gruppe %.*s..."
 
-#: src/lang.c:1097
-msgid	"  -o       post all postponed articles and exit"
-msgstr	"  -o       Postet alle zurückgelegten Artikel und beendet tin"
+#: src/lang.c:1034
+msgid	"Server unavailable\n"
+msgstr	"Server nicht erreichbar\n"
 
-#: src/lang.c:1098
-msgid	"  -r       read news remotely from default NNTP server"
-msgstr	"  -r       Lese Artikel vom Standard-NNTP-Server"
+#: src/lang.c:1040
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
+	"%s=post"
+msgstr	"%s=Pipe; %s=Mail; %s=Drucken; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; "
+	"%s=tag; %s=Posten"
 
-#: src/lang.c:1099
-msgid	"  -R       read news saved by -S option"
-msgstr	"  -R       Lese Artikel, die durch -S gespeichert wurden"
+#: src/lang.c:1041
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=Pipe; %s=Mail; %s=Drucken; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; "
+	"%s=Posten"
 
-#: src/lang.c:1100
+#: src/lang.c:1043
 #, c-format
-msgid	"  -s dir   save news directory [default=%s]"
-msgstr	"  -s Verz. Verzeichnis zum News-Speichern [Standard=%s]"
+msgid	"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=Mail; %s=Drucken; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; "
+	"%s=Posten"
 
-#: src/lang.c:1101
-msgid	"  -S       save new news for later reading (batch mode)"
-msgstr	"  -S       Speichere Artikel für das spätere Lesen (Batch-Modus)"
+#: src/lang.c:1044
+#, c-format
+msgid	"%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=Mail; %s=Drucken; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten"
 
-#: src/lang.c:1102
-msgid	"  -z       start if any unread news"
-msgstr	"  -z       Starte, wenn ungelesene Artikel vorliegen"
+#: src/lang.c:1048
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=Pipe; %s=Mail; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; %s=Posten"
 
-#: src/lang.c:1103
+#: src/lang.c:1049
 #, c-format
-msgid	"A Usenet reader.\n"
-	"\n"
-	"Usage: %s [options] [newsgroup[,...]]"
-msgstr	"Ein Usenet-Client.\n"
-	"\n"
-	"Syntax: %s [Optionen] [Newsgruppe[,...]]"
+msgid	"%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=Pipe; %s=Mail; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten"
 
-#: src/lang.c:1105
-msgid	"  -a       toggle color flag"
-msgstr	"  -a       Farbe ein- oder ausschalten"
+#: src/lang.c:1051
+#, c-format
+msgid	"%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=Mail; %s=Ende; %s=Alle/Nur ungel.; %s=Speich.; %s=tag; %s=Posten"
 
-#: src/lang.c:1107
-msgid	"  -v       verbose output for batch mode options"
-msgstr	"  -v       Ausführliche Ausgabe für Batch-Modus-Optionen"
+#: src/lang.c:1052
+#, c-format
+msgid	"%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=Mail; %s=Ende; %s=Antw. Mail; %s=Speich.; %s=tag; %s=Posten"
 
-#: src/lang.c:1108
-msgid	"  -V       print version & date information"
-msgstr	"  -V       Gebe Versions- und Datumsinformationen aus"
+#: src/lang.c:1058
+msgid	"Terminal does not support color"
+msgstr	"Terminal unterstützt keine Farben"
 
-#: src/lang.c:1109
+#: src/lang.c:1063
 #, c-format
-msgid	"%s only useful without batch mode operations\n"
-msgstr	"%s ist nur sinnvoll ohne Batchmodeoperationen\n"
+msgid	"Trying %s"
+msgstr	"Versuche %s"
 
-#: src/lang.c:1110
-#, c-format
-msgid	"%s only useful for batch mode operations\n"
-msgstr	"%s ist nur sinnvoll für Batchmodeoperationen\n"
+#: src/lang.c:1077 src/lang.c:1102 src/lang.c:1118 src/refs.c:266
+msgid	"None"
+msgstr	"Nichts"
 
-#: src/lang.c:1111
-#, c-format
-msgid	"\n"
-	"%s%d out of range (0 - %d). Reset to 0"
-msgstr	"\n"
-	"%s%d ist außerhalb der Grenzen (0 - %d). Zurücksetzen auf 0"
+#: src/lang.c:1078
+msgid	"Subject"
+msgstr	"Subject"
 
-#: src/lang.c:1112
-#, c-format
-msgid	"\n"
-	"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
-	"%-100s\n"
-msgstr	"\n"
-	"Warnung: Artikel überschreitet %d Spalten. Zeile %d ist die erste lange:\n"
-	"%-100s\n"
+#: src/lang.c:1079
+msgid	"References"
+msgstr	"References"
 
-#: src/lang.c:1113
-msgid	"\n"
-	"Warning: article unchanged after editing\n"
-msgstr	"\n"
-	"Warnung: Artikel wurde im Editor nicht verändert\n"
+#: src/lang.c:1080
+msgid	"Both Subject and References"
+msgstr	"Beides: Subject und References"
 
-#: src/lang.c:1114
-msgid	"\n"
-	"Warning: \"Subject:\" contains only whitespaces.\n"
-msgstr	"\n"
-	"Warnung: \"Subject:\" enthält nur Leerzeichen.\n"
+#: src/lang.c:1081
+msgid	"Multipart Subject"
+msgstr	"Mehrteilige Artikel (Subject)"
 
-#: src/lang.c:1116
-#, c-format
-msgid	"\n"
-	"Warning: Posting is in %s and contains characters which are not\n"
-	"         in your selected MM_NETWORK_CHARSET: %s.\n"
-	"         These characters will be replaced by '?' if you post this\n"
-	"         article unchanged. To avoid garbling your article please either\n"
-	"         edit it and remove those characters or change the setting of\n"
-	"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
-	"         M)enu option.\n"
-msgstr	"\n"
-	"Warnung: Artikel ist in %s und enthält Zeichen die nicht im\n"
-	"         konfiguriertem MM_NETWORK_CHARSET: %s enthalten sind.\n"
-	"         Diese Zeichen werden durch '?' ersetzt wenn der Artikel\n"
-	"         unverändert gepostet wird. Um das zu vermeiden sollten Sie\n"
-	"         entweder den Artiklen entspechend ändern und diese Zeichen\n"
-	"         entfernen oder MM_NETWORK_CHARSET im M)neu auf einen\n"
-	"         passenderen Wert setzen.\n"
+#: src/lang.c:1093 src/lang.c:1204
+msgid	"No"
+msgstr	"Nein"
 
-#: src/lang.c:1125
-msgid	"\n"
-	"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n"
-msgstr	"\n"
-	"Warnung: \"Subject:\" beginnt mit \"Re: \", aber es gibt keine "
-	"\"References:\".\n"
+#: src/lang.c:1094 src/lang.c:1206
+msgid	"Yes"
+msgstr	"Ja"
 
-#: src/lang.c:1127
-msgid	"\n"
-	"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
-	"         with \"Re: \" and does not contain \"(was:\".\n"
-msgstr	"\n"
-	"Warnung: Artikel hat \"References:\" aber \"Subject:\" beginnt nicht\n"
-	"         mit \"Re: \" and enthält auch kein \"(was:\".\n"
+#: src/lang.c:1095
+msgid	"Hide All"
+msgstr	"Alle ausblenden"
 
-#: src/lang.c:1130
-msgid	"Read carefully!\n"
-	"\n"
-	"  You are about to cancel an article seemingly written by you. This will "
-	"wipe\n"
-	"  the article from most  news servers  throughout the world,  but there is "
-	"no\n"
-	"  guarantee that it will work.\n"
-	"\n"
-	"This is the article you are about to cancel:\n"
-	"\n"
-msgstr	"Sorgfältig lesen!\n"
-	"\n"
-	" Sie wollen einen Artikel canceln (löschen), der offenbar von ihnen stammt.\n"
-	" Dies wird den Artikel von den meisten Newsservern dieser Welt löschen.\n"
-	" Es gibt aber keine Garantie, das dies überall geschieht.\n"
-	"\n"
-	"Das ist der Artikel, den sie canceln (löschen) wollen:\n"
-	"\n"
+#: src/lang.c:1103
+msgid	"Address"
+msgstr	"Adresse"
 
-#: src/lang.c:1134
-msgid	"\n"
-	"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
-	"         quoted-printable) and an external inews program to submit your\n"
-	"         article. If a signature is appended by that inews program it will\n"
-	"         not be encoded properly.\n"
-msgstr	"\n"
-	"Warnung: Sie benutzen eine Zeichenkodierung, die Zeichen verändert (z.B.\n"
-	"         base64 oder quoted-printable) und einen externen inews um ihren\n"
-	"         Artikel zu übertragen. Falls durch diesen inews eine Signatur\n"
-	"         angehängt wird, so kann diese nicht korrekt kodiert werden.\n"
+#: src/lang.c:1104
+msgid	"Full Name"
+msgstr	"Voller Name"
 
-#: src/lang.c:1141
-#, c-format
-msgid	"\n"
-	"Warning: The \"%s:\" line is continued in the next line.\n"
-	"         This is a very new feature and may not be accepted by all servers.\n"
-	"         To avoid trouble please write all newsgroups into a single line.\n"
-msgstr	"\n"
-	"Warnung: Die \"%s:\" Zeile ist in der nächsten Zeile fortgesetzt.\n"
-	"         Da diese Zeile keinen leeren Raum enthalten darf, ist dies nicht\n"
-	"         erlaubt. Bitte schreiben Sie alle Newsgruppen in eine Zeile.\n"
+#: src/lang.c:1105
+msgid	"Address and Name"
+msgstr	"Adresse und Name"
 
-#: src/lang.c:1145
-#, c-format
-msgid	"\n"
-	"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
-msgstr	"\n"
-	"Warnung: Die \"%s:\" Zeile enthält Leerzeichen die entfernt\n"
-	"         werden sollten.\n"
+#: src/lang.c:1112
+msgid	"Max"
+msgstr	"Höchster"
 
-#: src/lang.c:1149
-#, c-format
-msgid	"\n"
-	"\n"
-	"You are upgrading to tin %s from an earlier version.\n"
-	"Some values in your %s file have changed!\n"
-	"Read WHATSNEW, etc...\n"
-msgstr	"\n"
-	"\n"
-	"Sie benutzen jetzt tin %s, eine neuere Version als früher.\n"
-	"Einige Einstellungen in Ihrerm %-File haben sich geändert!\n"
-	"Lesen sie \"WHATSNEW\", usw....\n"
+#: src/lang.c:1113
+msgid	"Sum"
+msgstr	"Summe"
+
+#: src/lang.c:1114
+msgid	"Average"
+msgstr	"Durchschnitt"
 
-#: src/lang.c:1152
-#, c-format
-msgid	"\n"
-	"\n"
-	"You are downgrading to tin %s from a more recent version!\n"
-	"Some values in your %s file may be ignored, others might have changed!\n"
-msgstr	"\n"
-	"\n"
-	"Sie benutzen jetzt tin %s, eine ältere Version als früher!\n"
-	"Evtl. werden Einstellungen in Ihrem %s-File nicht erkannt\n"
-	"oder ändern sich!\n"
+#: src/lang.c:1119
+msgid	"Lines"
+msgstr	"Zeilen"
 
-#: src/lang.c:1157
-#, c-format
-msgid	"Warning: tin wrote fewer groups to your\n"
-	"\t%s\n"
-	"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
-	"this session this indicates an error and you should backup your %s\n"
-	"before you start tin once again!\n"
-msgstr	"Warnung: tin hat weniger Gruppen in ihre\n"
-	"\t%s\n"
-	"geschrieben, als es beim Start eingelesen hat. Falls Sie nicht %ld %s\n"
-	"währenddessen abbestellt haben, ist ein Fehler aufgetreten und Sie sollten\n"
-	"ihre %s wiederherstellen, bevor Sie tin nochmal starten!\n"
+#: src/lang.c:1120
+msgid	"Score"
+msgstr	"Bewertung"
 
-#: src/lang.c:1163
-msgid	"Read carefully!\n"
-	"\n"
-	"  You are about to cancel an article seemingly not written by you.  This "
-	"will\n"
-	"  wipe the article from lots of news servers throughout the world;\n"
-	"  Usenet's majority  considers this  rather inappropriate,  to say the "
-	"least.\n"
-	"  Only press 'd'  if you are  absolutely positive  that you are ready to "
-	"take\n"
-	"  the rap.\n"
-	"\n"
-	"This is the article you are about to cancel:\n"
-	"\n"
-msgstr	"Sorgfältig lesen!\n"
-	"\n"
-	" Sie wollen einen Artikel canceln (löschen), der offenbar nicht von ihnen "
-	"stammt.\n"
-	" Dies wird den Artikel auf sehr vielen Newsservern dieser Welt löschen;\n"
-	" Der Grossteil der Usenetteilnehmer hält dies für nicht akzeptabel.\n"
-	" Drücken Sie 'd' nur, wenn Sie wirklich sicher sind, das Sie mit den\n"
-	" eventuellen Konsequenzen leben können.\n"
-	"\n"
-	"Dies ist der Artikel, den Sie canceln (löschen) wollen:\n"
-	"\n"
+#: src/lang.c:1121
+msgid	"Lines & Score"
+msgstr	"Zeilen und Bewertung"
 
-#: src/lang.c:1172
-msgid	"\n"
-	"Warning: Followup-To set to more than one newsgroup!\n"
-msgstr	"\n"
-	"Warnung: Followup-To in mehr als eine Newsgruppe gesetzt!\n"
+#: src/lang.c:1130
+msgid	"Black"
+msgstr	"Schwarz"
 
-#: src/lang.c:1173
-#, c-format
-msgid	"\n"
-	"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
-msgstr	"\n"
-	"Warnung: Crossposting in %d Newsgruppen und kein Followup-To gesetzt!\n"
+#: src/lang.c:1131
+msgid	"Red"
+msgstr	"Rot"
 
-#: src/lang.c:1174
-#, c-format
-msgid	"\n"
-	"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
-msgstr	"\n"
-	"Warnung: \"%s\" ist nicht in Ihrer newsrc, sie könnte ungültig sein!\n"
+#: src/lang.c:1132
+msgid	"Green"
+msgstr	"Grün"
 
-#: src/lang.c:1175
-#, c-format
-msgid	"\n"
-	"Warning: \"%s\" is not a valid newsgroup at this site!\n"
-msgstr	"\n"
-	"Warnung: \"%s\" ist keine gültige Newsgruppe auf diesem Server!\n"
+#: src/lang.c:1133
+msgid	"Brown"
+msgstr	"Braun"
 
-#: src/lang.c:1179
-msgid	"\n"
-	"  If your article contains quoted text  please take some time to pare it "
-	"down\n"
-	"  to just the  key points to which you are  responding,  or people will "
-	"think\n"
-	"  you are a dweeb!  Many people have the habit of skipping any article  "
-	"whose\n"
-	"  first page is largely  quoted material.  Format your article to fit in "
-	"less\n"
-	"  then 80 chars,  since that's the conventional size  (72 is a good choice "
-	"as\n"
-	"  it allows quoting without exceeding the limit).  If your lines are too "
-	"long\n"
-	"  they'll wrap  around  ugly and  people won't  read what you  write.  If "
-	"you\n"
-	"  aren't  careful  and considerate  in  formatting  your posting, people  "
-	"are\n"
-	"  likely to ignore it completely.  It's a crowded net out there.\n"
-msgstr	"\n"
-	"  Wenn ihr Artikel zitierten Text enthält, nehmen Sie sich Zeit und kürzen\n"
-	"  Sie die Zitate auf das Nötigste, behalten Sie nur die Kernpunkte bei, auf\n"
-	"  die Sie sich beziehen! Viele Leute lesen Artikel, deren erste Seite nur\n"
-	"  aus zitiertem Text besteht, überhaupt nicht. Formatieren Sie ihren Artikel\n"
-	"  so, dass er maximal 80 Zeichen lange Zeilen enthält, für ihren eigenen\n"
-	"  Text sind 72 Zeichen eine gute Wahl, so bleibt dieser auch zitiert unter\n"
-	"  80 Zeichen. Wenn ihre Zeilen zu lang sind, werden Sie auf dem Bildschirm\n"
-	"  kammartig umbrochen, und sind daher sehr mühsam zu lesen. Wenn Sie ihren\n"
-	"  Artikel nicht sorgfältig formatieren, ist es sehr wahrscheinlich, dass er\n"
-	"  von vielen gar nicht gelesen wird.\n"
+#: src/lang.c:1134
+msgid	"Blue"
+msgstr	"Blau"
 
-#: src/lang.c:1191
-#, c-format
-msgid	"\n"
-	"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
-msgstr	"\n"
-	"Warnung: Es gibt %d '-- \\n' Zeilen. Das könnte einige Leute verwirren.\n"
+#: src/lang.c:1135
+msgid	"Pink"
+msgstr	"Rosa"
 
-#: src/lang.c:1192
-#, c-format
-msgid	"Warning: Only %d out of %d articles were saved"
-msgstr	"Warnung: Nur %d von %d Artikeln gespeichert"
+#: src/lang.c:1136
+msgid	"Cyan"
+msgstr	"Cyan"
 
-#: src/lang.c:1193
-#, c-format
-msgid	"\n"
-	"Warning: Your signature  is longer than %d lines.  Since signatures usually "
-	"do\n"
-	"         not  transport any  useful information,  they should be as  short "
-	"as\n"
-	"         possible.\n"
-msgstr	"\n"
-	"Warnung: Ihre Signatur ist mehr als %d Zeilen lang. Da Signaturen meist "
-	"keine\n"
-	"         nützlichen Informationen enthalten, sollten sie so kurz wie möglich\n"
-	"         gehalten werden.\n"
+#: src/lang.c:1137
+msgid	"White"
+msgstr	"Weiß"
 
-#: src/lang.c:1197
-#, c-format
-msgid	"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
-msgstr	"Warnung: E-Mailadr. evtl. verfälscht (Spamfalle). %s=weiter, %s=Abbruch? "
+#: src/lang.c:1138
+msgid	"Gray"
+msgstr	"Grau"
 
-#: src/lang.c:1198
-msgid	"\n"
-	"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
-msgstr	"\n"
-	"Warnung: Signaturen sollten mit '-- \\n' und nicht mit '--\\n' beginnen.\n"
+#: src/lang.c:1139
+msgid	"Light Red"
+msgstr	"Helles Rot"
 
-#: src/lang.c:1199
-msgid	"Writing attributes file..."
-msgstr	"Schreibe Datei mit den Eigenschaften der Newsgruppen..."
+#: src/lang.c:1140
+msgid	"Light Green"
+msgstr	"Helles Grün"
 
-#: src/lang.c:1200
-#, c-format
-msgid	"%d Responses%s"
-msgstr	"%d Antworten%s"
+#: src/lang.c:1141
+msgid	"Yellow"
+msgstr	"Gelb"
 
-#: src/lang.c:1201
-#, c-format
-msgid	"Added %d %s"
-msgstr	"%d %s hinzugefügt"
+#: src/lang.c:1142
+msgid	"Light Blue"
+msgstr	"Helles Blau"
 
-#: src/lang.c:1202
-msgid	"No unsubscribed groups to show"
-msgstr	"Keine nicht abonnierte Gruppen gefunden"
+#: src/lang.c:1143
+msgid	"Light Pink"
+msgstr	"Helles Rosa"
 
-#: src/lang.c:1203
-msgid	"Showing subscribed to groups only"
-msgstr	"Zeige nur abonnierte Gruppen"
+#: src/lang.c:1144
+msgid	"Light Cyan"
+msgstr	"Helles Cyan"
 
-#: src/lang.c:1204
-msgid	"Showing unread groups only"
-msgstr	"Zeige nur Gruppen mit ungelesenen Artikeln"
+#: src/lang.c:1145
+msgid	"Light White"
+msgstr	"Helles Weiß"
 
-#: src/lang.c:1205
-msgid	"Yes "
-msgstr	"Ja  "
+#: src/lang.c:1153 src/lang.c:1210 src/lang.c:1224
+msgid	"Nothing"
+msgstr	"Nichts"
 
-#: src/lang.c:1206
-msgid	"    You have mail\n"
-msgstr	"   Sie haben Mail\n"
+#: src/lang.c:1154
+msgid	"Mark"
+msgstr	"Markierung"
 
-#: src/lang.c:1207
-msgid	"All groups"
-msgstr	"Alle Gruppen"
+#: src/lang.c:1155
+msgid	"Space"
+msgstr	"Leerzeichen"
 
-#: src/lang.c:1208
-msgid	"Comment (optional)  : "
-msgstr	"Kommentar (optional): "
+#: src/lang.c:1162
+msgid	"Normal"
+msgstr	"Normal"
 
-#: src/lang.c:1209
-msgid	"Apply pattern to    : "
-msgstr	"Wende Muster an auf : "
+#: src/lang.c:1163
+msgid	"Best highlighting"
+msgstr	"Beste Hervorhebung"
 
-#: src/lang.c:1210
-msgid	"From: line (ignore case)      "
-msgstr	"From: Zeile (ignoriere Groß- Kleinschreibung)"
+#: src/lang.c:1164
+msgid	"Underline"
+msgstr	"Unterstreichen"
 
-#: src/lang.c:1211
-msgid	"From: line (case sensitive)   "
-msgstr	"From: Zeile (Groß- Kleinschreibung beachten) "
+#: src/lang.c:1165
+msgid	"Reverse video"
+msgstr	"Invers"
 
-#: src/lang.c:1212
-msgid	"One or more lines of comment. <CR> to add a line or proceed if line is empty."
-msgstr	"Kommentarzeile(n). <CR> für nächsten Menüpunkt bzw. Ende der eingeg. Zeile."
+#: src/lang.c:1166
+msgid	"Blinking"
+msgstr	"Blinkend"
 
-#: src/lang.c:1213
-msgid	"From: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	"From: zum Filter hinzufügen. <SPACE> wechselt & <CR> setzt."
+#: src/lang.c:1167
+msgid	"Half bright"
+msgstr	"Halbe Helligkeit"
 
-#: src/lang.c:1214
-msgid	"Linecount of articles to be filtered. < for less, > for more, = for equal."
-msgstr	"Zeilenzahl der Artikel, die gefiltert werden. < weniger, > mehr, = gleich."
+#: src/lang.c:1168
+msgid	"Bold"
+msgstr	"Fett"
 
-#: src/lang.c:1215
-msgid	"Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	"Message-ID: zum Filter hinzufügen. <SPACE> wechselt & <CR> setzt."
+#: src/lang.c:1173
+msgid	"none"
+msgstr	"Nichts"
 
-#: src/lang.c:1216
-msgid	"Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	"Subject: zum Filter hinzufügen. <SPACE> wechselt & <CR> setzt."
+#: src/lang.c:1174
+msgid	"commands"
+msgstr	"Kommandos"
 
-#: src/lang.c:1217
-msgid	"Enter text pattern to filter if Subject: & From: lines are not what you want."
-msgstr	"Textmuster zum Filtern, wenn Subject: & From: nicht ihren Wünschen entspricht."
+#: src/lang.c:1175
+msgid	"select"
+msgstr	"X-Befehl"
 
-#: src/lang.c:1218
-msgid	"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
-msgstr	"Wähle worauf das Textmuster angewendet wird. <SPACE> wechselt & <CR> setzt."
+#: src/lang.c:1177
+msgid	"commands & quit"
+msgstr	"Kommandos & Ende"
+
+#: src/lang.c:1178
+msgid	"commands & select"
+msgstr	"Kommandos & X-Befehl"
+
+#: src/lang.c:1179
+msgid	"quit & select"
+msgstr	"Ende & X-Befehl"
 
-#: src/lang.c:1219
-msgid	"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
-msgstr	"Gültigkeitsdauer in Tagen für den Filter. <SPACE> wechselt & <CR> setzt."
+#: src/lang.c:1180
+msgid	"commands & quit & select"
+msgstr	"Kmndos & Ende & X-Befehl"
 
-#: src/lang.c:1220
-msgid	"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
-msgstr	"Filterregel gilt für aktuelle/alle Gruppe(n). <SPACE> wechselt & <CR> setzt."
+#: src/lang.c:1205
+msgid	"Shell archive"
+msgstr	"Shellarchiv"
 
-#: src/lang.c:1221
-msgid	"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
-msgstr	"Filterregel gilt für aktuelle/allen Gruppe(n).<SPACE> wechselt & <CR> setzt."
+#: src/lang.c:1211
+msgid	"Subject: (descending)"
+msgstr	"Subject: (Absteigend)"
 
-#: src/lang.c:1222
-#, c-format
-msgid	"Kill From:     [%-*.*s] (y/n): "
-msgstr	"Filter From:   [%-*.*s] (y/n): "
+#: src/lang.c:1212
+msgid	"Subject: (ascending)"
+msgstr	"Subject: (Aufsteigend)"
 
-#: src/lang.c:1223
-msgid	"Kill Lines: (</>num): "
-msgstr	"Filter Z.:  (</>num): "
+#: src/lang.c:1213
+msgid	"From: (descending)"
+msgstr	"From: (Absteigend)"
 
-#: src/lang.c:1224
-msgid	"Kill Article Menu"
-msgstr	"Filter Menü (Kill, Bewertung/Score verringern)"
+#: src/lang.c:1214
+msgid	"From: (ascending)"
+msgstr	"From: (Aufsteigend)"
 
-#: src/lang.c:1225
-#, c-format
-msgid	"Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
-msgstr	"Filter Msg-Id: [%-*.*s] (f/l/o/n): "
+#: src/lang.c:1215
+msgid	"Date: (descending)"
+msgstr	"Date: (Absteigend)"
 
-#: src/lang.c:1226
-msgid	"Kill pattern scope  : "
-msgstr	"Filter nach Muster  : "
+#: src/lang.c:1216
+msgid	"Date: (ascending)"
+msgstr	"Date: (Aufsteigend)"
 
-#: src/lang.c:1227
-#, c-format
-msgid	"Kill Subject:  [%-*.*s] (y/n): "
-msgstr	"Filter Subject:[%-*.*s] (y/n): "
+#: src/lang.c:1217 src/lang.c:1225
+msgid	"Score (descending)"
+msgstr	"Bewertung (Absteigend)"
 
-#: src/lang.c:1228
-msgid	"Kill text pattern   : "
-msgstr	"Filter Textmuster   : "
+#: src/lang.c:1218 src/lang.c:1226
+msgid	"Score (ascending)"
+msgstr	"Bewertung (Aufsteigend)"
 
-#: src/lang.c:1229
-msgid	"Kill time in days   : "
-msgstr	"Filterzeit in Tagen : "
+#: src/lang.c:1219
+msgid	"Lines: (descending)"
+msgstr	"Lines: (Absteigend)"
 
-#: src/lang.c:1230
-msgid	"Message-ID: line              "
-msgstr	"Message-ID: Zeile             "
+#: src/lang.c:1220
+msgid	"Lines: (ascending)"
+msgstr	"Lines: (Aufsteigend)"
 
 #: src/lang.c:1231
-#, c-format
-msgid	"Select From    [%-*.*s] (y/n): "
-msgstr	"Wähle From     [%-*.*s] (y/n): "
+msgid	"Always Keep"
+msgstr	"Immer behalten"
 
 #: src/lang.c:1232
-msgid	"Select Lines: (</>num): "
-msgstr	"Wähle Zeilen: (</>num): "
+msgid	"Always Remove"
+msgstr	"Immer entfernen"
 
 #: src/lang.c:1233
-msgid	"Auto-select Article Menu"
-msgstr	"Filter Menü (Bewertung/Score erhöhen)"
-
-#: src/lang.c:1234
-#, c-format
-msgid	"Select Msg-Id  [%-*.*s] (f/l/o/n): "
-msgstr	"Wähle Msg-Id   [%-*.*s] (f/l/o/n): "
-
-#: src/lang.c:1235
-msgid	"Select pattern scope: "
-msgstr	"Wähle Muster        : "
-
-#: src/lang.c:1236
-#, c-format
-msgid	"Select Subject [%-*.*s] (y/n): "
-msgstr	"Wähle Subject  [%-*.*s] (y/n): "
-
-#: src/lang.c:1237
-msgid	"Select text pattern : "
-msgstr	"Wähle Textmuster    : "
+msgid	"Mark with D on selection screen"
+msgstr	"Mit D in der Anzeige markiert"
 
 #: src/lang.c:1238
-msgid	"Select time in days   : "
-msgstr	"Wähle Zeit in Tagen   : "
+msgid	"Kill only unread arts"
+msgstr	"Killt nur ungelesene Artikel"
 
 #: src/lang.c:1239
-msgid	"Subject: line (ignore case)   "
-msgstr	"Subject: Z. (Groß-Kl. ign.)                  "
+msgid	"Kill all arts & show with K"
+msgstr	"Killt alle Artikel, markiert mit K"
 
+#. TODO: s/K/art_marked_killed/
 #: src/lang.c:1240
-msgid	"Subject: line (case sensitive)"
-msgstr	"Subject: Z. (Groß-Kl. beachten)              "
-
-#: src/lang.c:1241
-#, c-format
-msgid	"%d days"
-msgstr	"%d Tage"
-
-#: src/lang.c:1242
-msgid	"Unlimited"
-msgstr	"Unbegrenzt"
-
-#: src/lang.c:1243
-msgid	"Full"
-msgstr	"Voll"
-
-#: src/lang.c:1244
-msgid	"Last"
-msgstr	"Letzte"
+msgid	"Kill all arts and never show"
+msgstr	"Killt alle Artikel, zeigt sie nie"
 
 #: src/lang.c:1245
-msgid	"Only"
-msgstr	"Nur"
+msgid	"Nothing special"
+msgstr	"Nichts besonderes"
 
 #: src/lang.c:1246
-msgid	"# Format:\n"
-	"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
-	"placed\n"
-	"#                     at the beginning of a rule, or they will be moved to "
-	"the\n"
-	"#                     next rule. '#' is not a valid keyword for a comment!\n"
-	"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
-	"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
-	"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
-	"#     score=NUM         A number (e.g. 70). Or:\n"
-	"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
-	"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
-	"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
-	"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n"
-	"#                     full references.\n"
-	"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
-	"#   msgid_only=STRING Optional. Like above, but without references.\n"
-	"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
-	"without\n"
-	"#                     Message-ID:\n"
-	"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
-	"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
-	"opt.\n"
-	"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
-	"#   time=NUM          Optional. time_t value when rule expires\n"
-	"#\n"
-msgstr	"# Format:\n"
-	"#   comment=STRING    Optionaler Kommentar. Es sind mehrere "
-	"Kommentareinträge\n"
-	"#                     Regel erlaubt. Kommentare müssen ganz am Anfang "
-	"stehen,\n"
-	"#                     sonst werden sie zur nächsten Regel verschoben. '#' "
-	"darf\n"
-	"#                     nicht im Kommentar vorkommen!\n"
-	"#   group=STRING      Liste der Newsgroups (z.B. comp.*,!*sources*) "
-	"[obligatorisch]\n"
-	"#   case=ZAHL         Groß/Kleinschreibung beim Filtern beachten=0,\n"
-	"#                     ignorieren=1        [obligatorisch]\n"
-	"#   score=ZAHL|STRING Score/Bewertung für diese Regel, entweder eine\n"
-	"#                     Zahl (z.B. 70) oder eines der beiden Schlüsselwörter\n"
-	"#                     'hot' oder 'kill'\n"
-	"#   subj=STRING       Subject(Betreff). (z.B. How to be a wizard)\n"
-	"#   from=STRING       From(Absender). (z.B. *Craig Shergold*)\n"
-	"#   msgid=STRING      Message-ID (z.B.<123@@ether.net>) kommt in Message-ID-\n"
-	"#                     oder References-Zeile vor. - Regel wirkt auf den "
-	"Artikel\n"
-	"#                     mit der M-ID und alle Antworten darauf.\n"
-	"#   msgid_last=STRING Message-ID-Header selbst und letzte Element von "
-	"References\n"
-	"#                     Regel wirkt auf Posting selbst oder _direkte_ "
-	"Antworten.\n"
-	"#   msgid_only=STRING Message-ID lautet (z.B.<123@@ether.net>).\n"
-	"#   refs_only=STRING  References-Header (z.B.<123@@ether.net>), kein\n"
-	"#                     Vergleich mit Message-ID-Header.\n"
-	"#   lines=[<>]?ZAHL   Zeilenanzahl (Lines-Header)\n"
-	"#   gnksa=[<>]?ZAHL   Rückgabewert der Funktion GNKSA parse_from()\n"
-	"#\n"
-	"#   xref=MUSTER       Muster passt auf Xref-Header (z.B. alt.flame*)\n"
-	"#\n"
-	"#   time=ZAHL         Ablaufdatum der Regel als time_t Wert\n"
-	"#                     (Anzahl der Sekunden seit 1970-01-01 00:00:00 UTC)\n"
-	"#\n"
-
-#: src/lang.c:1267
-#, c-format
-msgid	"Enter score for rule (default=%d): "
-msgstr	"Bewertung für Regel (Standard=%d): "
-
-#: src/lang.c:1268
-#, c-format
-msgid	"Enter the score weight (range 0 < score <= %d)"
-msgstr	"Geben Sie die Höhe der Bewertung an (Bereich 0 < Bewertung <= %d)"
-
-#. SCORE_MAX
-#: src/lang.c:1270
-msgid	"Article deleted."
-msgstr	"Artikel gelöscht"
-
-#: src/lang.c:1271
-msgid	"Article undeleted."
-msgstr	"Artikellöschen rückgängig gemacht"
-
-#: src/lang.c:1272
-msgid	"Processing mail messages marked for deletion."
-msgstr	"Bearbeite zum Löschen markierte EMails"
-
-#: src/lang.c:1273
-msgid	"Processing saved articles marked for deletion."
-msgstr	"Bearbeite zum Löschen markierte gespeicherte Artikel."
+msgid	"Compress quotes"
+msgstr	"Zitatzeichen zusammenfassen"
 
-#: src/lang.c:1276
-#, c-format
-msgid	"Environment variable %s not found. Set and retry..."
-msgstr	"Umgebungsvariable %s nicht gefunden. Setzen und nochmal versuchen..."
+#: src/lang.c:1247
+msgid	"Quote signatures"
+msgstr	"Signaturen zitieren"
 
-#: src/lang.c:1277
-msgid	"  -B       BBS mode. File operations limited to home directories."
-msgstr	"  -B       BBS-Modus. Datei-Operationen limitiert auf das Home-Verzeichnis."
+#: src/lang.c:1248
+msgid	"Compress quotes, quote sigs"
+msgstr	"Zitatz. kürzen, Signat. zitieren"
 
-#: src/lang.c:1281
-msgid	"\n"
-	"Error: Followup-To set to more than one newsgroup!\n"
-msgstr	"\n"
-	"Fehler: Followup-To auf mehr als eine Newsgruppe gesetzt!\n"
+#: src/lang.c:1249
+msgid	"Quote empty lines"
+msgstr	"Leerzeilen zitieren"
 
-#: src/lang.c:1282
-#, c-format
-msgid	"\n"
-	"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
-msgstr	"\n"
-	"Fehler: Crossposting in %d Newsgruppen und kein Followup-To gesetzt!\n"
+#: src/lang.c:1250
+msgid	"Compress quotes, quote empty lines"
+msgstr	"Zitatz. kürzen, Leerzeilen zit."
 
-#: src/lang.c:1283
-#, c-format
-msgid	"\n"
-	"Error: \"%s\" is not a valid newsgroup!\n"
-msgstr	"\n"
-	"Fehler: \"%s\" ist keine gültige Newsgruppe!\n"
+#: src/lang.c:1251
+msgid	"Quote sigs & empty lines"
+msgstr	"Signat. und Leerzeilen zitieren"
 
-#: src/lang.c:1287
-msgid	"Your server does not have Xref: in its XOVER information.\n"
-	"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
-msgstr	"Ihr Server hat kein Xref: in seiner XOVER-Information.\n"
-	"Tin versucht XHDR XREF zu benutzen (verlangsamt den Prozess etwas).\n"
+#: src/lang.c:1252
+msgid	"Comp. q., quote sigs & empty lines"
+msgstr	"Zitatz. kürzen, Sign & Leerz. zit."
 
 #: src/lang.c:1290
-msgid	"Your server does not have Xref: in its XOVER information.\n"
-msgstr	"Ihr Server hat kein Xref: in seiner XOVER-Information.\n"
-
-#: src/lang.c:1295
 msgid	"Display Options"
 msgstr	"Darstellungseinstellungen"
 
-#: src/lang.c:1301
+#: src/lang.c:1296
 msgid	"Color Options"
 msgstr	"Farbeinstellungen"
 
-#: src/lang.c:1307
+#: src/lang.c:1302
 msgid	"Article-Limiting Options"
 msgstr	"Artikel-Begrenzungseinstellungen"
 
-#: src/lang.c:1313
+#: src/lang.c:1308
 msgid	"Posting/Mailing Options"
 msgstr	"Versandeinstellungen für Mail und News"
 
-#: src/lang.c:1319
+#: src/lang.c:1314
 msgid	"Saving/Printing Options"
 msgstr	"Speicher- und Druckereinstellungen"
 
-#: src/lang.c:1325
+#: src/lang.c:1320
 msgid	"Expert Options"
 msgstr	"Experteneinstellungen"
 
-#: src/lang.c:1331
+#: src/lang.c:1326
 msgid	"Filtering Options"
 msgstr	"Filtereinstellungen"
 
-#: src/lang.c:1336 src/lang.c:1362 src/lang.c:1368 src/lang.c:1375 src/lang.c:1407
-#: src/lang.c:1413 src/lang.c:1421 src/lang.c:1441 src/lang.c:1516 src/lang.c:1678
-#: src/lang.c:1684 src/lang.c:1690 src/lang.c:1702 src/lang.c:1709 src/lang.c:1760
-#: src/lang.c:1769 src/lang.c:1775 src/lang.c:1781 src/lang.c:1787 src/lang.c:1793
-#: src/lang.c:1799 src/lang.c:1805 src/lang.c:1811 src/lang.c:1817 src/lang.c:1823
-#: src/lang.c:1829 src/lang.c:1835 src/lang.c:1841 src/lang.c:1847 src/lang.c:1853
-#: src/lang.c:1859 src/lang.c:1865 src/lang.c:1871 src/lang.c:1877 src/lang.c:1883
-#: src/lang.c:1890 src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1920
-#: src/lang.c:1926 src/lang.c:1932 src/lang.c:1938 src/lang.c:1944 src/lang.c:1958
-#: src/lang.c:1970 src/lang.c:2004 src/lang.c:2056 src/lang.c:2063 src/lang.c:2069
-#: src/lang.c:2094 src/lang.c:2111 src/lang.c:2164 src/lang.c:2197 src/lang.c:2217
-#: src/lang.c:2252 src/lang.c:2260 src/lang.c:2285 src/lang.c:2297
+#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 src/lang.c:1402
+#: src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 src/lang.c:1511 src/lang.c:1673
+#: src/lang.c:1679 src/lang.c:1685 src/lang.c:1697 src/lang.c:1704 src/lang.c:1755
+#: src/lang.c:1764 src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788
+#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 src/lang.c:1818
+#: src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 src/lang.c:1842 src/lang.c:1848
+#: src/lang.c:1854 src/lang.c:1860 src/lang.c:1866 src/lang.c:1872 src/lang.c:1878
+#: src/lang.c:1885 src/lang.c:1891 src/lang.c:1897 src/lang.c:1904 src/lang.c:1915
+#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 src/lang.c:1953
+#: src/lang.c:1965 src/lang.c:1999 src/lang.c:2051 src/lang.c:2058 src/lang.c:2064
+#: src/lang.c:2089 src/lang.c:2106 src/lang.c:2159 src/lang.c:2192 src/lang.c:2212
+#: src/lang.c:2247 src/lang.c:2255 src/lang.c:2280 src/lang.c:2292
 msgid	"<SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	"<SPACE> schaltet um, <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1337
+#: src/lang.c:1332
 msgid	"Show mini menu & posting etiquette :"
 msgstr	"Zeigt Minimenü & Posting etiquette :"
 
-#: src/lang.c:1338
+#: src/lang.c:1333
 msgid	"# If ON show a mini menu of useful commands at each level\n"
 	"# and posting etiquette after composing an article\n"
 msgstr	"# Falls ON wird ein kleines Menü mit nützlichen Kommandos in jedem Level\n"
 	"# angezeigt. Nach dem Erstellen eines Artikels wird die etiquette angezeigt\n"
 
-#: src/lang.c:1343
+#: src/lang.c:1338
 msgid	"Show short description for each newsgroup. <SPACE> toggles & <CR> sets."
 msgstr	"Zeige Kurzbeschreibung für Gruppe. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1344
+#: src/lang.c:1339
 msgid	"Show description of each newsgroup :"
 msgstr	"Zeige Beschreibung der Newsgruppen :"
 
-#: src/lang.c:1345
+#: src/lang.c:1340
 msgid	"# If ON show group description text after newsgroup name at\n"
 	"# group selection level\n"
 msgstr	"# Falls ON wird die Newsgruppenbeschreibung im Gruppenauswahlmenü\n"
 	"# nach dem Namen angezeigt\n"
 
-#: src/lang.c:1350
+#: src/lang.c:1345
 msgid	"Show Subject & From (author) fields in group menu. <SPACE> toggles & <CR> "
 	"sets."
 msgstr	"Zeigt Subject & From (Autor) Felder im Gruppenmenü. <SPACE> wechselt & <CR> "
 	"setzt."
 
-#: src/lang.c:1351
+#: src/lang.c:1346
 msgid	"In group menu, show author by      :"
 msgstr	"Im Gruppenmenü, zeige Autor an nach:"
 
-#: src/lang.c:1352
+#: src/lang.c:1347
 msgid	"# Part of from field to display 0) none 1) address 2) full name 3) both\n"
 msgstr	"# Anzeige des 'From:' Felds 0) nichts 1) Adresse 2) Voller Name 3) beides\n"
 
-#: src/lang.c:1356
+#: src/lang.c:1351
 msgid	"Draw -> or highlighted bar for selection. <SPACE> toggles & <CR> sets."
 msgstr	"Zeige -> oder Hervorhebung für Auswahl. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1357
+#: src/lang.c:1352
 msgid	"Draw -> instead of highlighted bar :"
 msgstr	"Zeige -> anstatt einer Markierung  :"
 
-#: src/lang.c:1358
+#: src/lang.c:1353
 msgid	"# If ON use -> otherwise highlighted bar for selection\n"
 msgstr	"# Falls ON benutze -> andernfalls benutze eine Markierung zur Auswahl\n"
 
-#: src/lang.c:1363
+#: src/lang.c:1358
 msgid	"Use inverse video for page headers :"
 msgstr	"Inverse Darstellung für die Header :"
 
-#: src/lang.c:1364
+#: src/lang.c:1359
 msgid	"# If ON use inverse video for page headers at different levels\n"
 msgstr	"# Falls ON nutze inverse Darstellung für Header bei verschiedenen Ebenen\n"
 
-#: src/lang.c:1369
+#: src/lang.c:1364
 msgid	"Thread articles by                 :"
 msgstr	"Threade Artikel anhand             :"
 
-#: src/lang.c:1370
+#: src/lang.c:1365
 msgid	"# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n"
 	"# 4=(Multipart Subject).\n"
 msgstr	"# Zeige Artikel nach 0=(nichts) 1=(Subject) 2=(References) 3=(beides)\n"
 	"# 4=(Mehrteilige Artikel).\n"
 
-#: src/lang.c:1376
+#: src/lang.c:1371
 msgid	"Score of a thread                  :"
 msgstr	"Bewertung eines Threads            :"
 
-#: src/lang.c:1377
+#: src/lang.c:1372
 msgid	"# Thread score 0=(Max) 1=(Sum) 2=(Average)\n"
 msgstr	"# Bewertung des Threads 0=(Höchster) 1=(Summe) 2=(Durchschnitt)\n"
 
-#: src/lang.c:1381
+#: src/lang.c:1376
 msgid	"Sort articles by Subject, From, Date or Score. <SPACE> toggles & <CR> sets."
 msgstr	"Sortiere Artikel nach Subject, From, Datum oder Bewertung."
 
-#: src/lang.c:1382
+#: src/lang.c:1377
 msgid	"Sort articles by                   :"
 msgstr	"Sortiere Artikel nach              :"
 
-#: src/lang.c:1383
+#: src/lang.c:1378
 msgid	"# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n"
 	"# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n"
 	"# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n"
@@ -4361,56 +4382,56 @@ msgstr	"# Sort. Art. nach 0=(nichts) 1=(
 	"# 7=(Bewertung abst.) 8=(Bewertung aufst.) 9=(Lines abst.) 10=(Lines "
 	"aufst.).\n"
 
-#: src/lang.c:1389
+#: src/lang.c:1384
 msgid	"Sort threads by Nothing or Score. <SPACE> toggles & <CR> sets."
 msgstr	"Threads nach Bewertung (Score) oder nichts ordnen. <SPACE> wechselt & <CR> "
 	"setzt"
 
-#: src/lang.c:1390
+#: src/lang.c:1385
 msgid	"Sort threads by                    :"
 msgstr	"Sortiere Threads nach              :"
 
-#: src/lang.c:1391
+#: src/lang.c:1386
 msgid	"# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n"
 msgstr	"# Ordne Threads nach 0=(nichts) 1=(Bewertung abst.) 2=(Bewertung aufst.)\n"
 
-#: src/lang.c:1395
+#: src/lang.c:1390
 msgid	"Put cursor at first/last unread art in groups. <SPACE> toggles & <CR> sets."
 msgstr	"Setze Cursor an ersten/letzten ungel. Artikel. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1396
+#: src/lang.c:1391
 msgid	"Goto first unread article in group :"
 msgstr	"Setze Cursor auf ersten ungel. Art.:"
 
-#: src/lang.c:1397
+#: src/lang.c:1392
 msgid	"# If ON put cursor at first unread art in group otherwise last art\n"
 msgstr	"# Falls ON setze Cursor auf ersten ungelesenen Art., sonst auf letzten\n"
 
-#: src/lang.c:1401
+#: src/lang.c:1396
 msgid	"Show all articles or only unread articles. <SPACE> toggles & <CR> sets."
 msgstr	"Zeige alle oder nur ungelesene Artikel. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1402
+#: src/lang.c:1397
 msgid	"Show only unread articles          :"
 msgstr	"Zeige nur ungelesene Artikel       :"
 
-#: src/lang.c:1403
+#: src/lang.c:1398
 msgid	"# If ON show only new/unread articles otherwise show all.\n"
 msgstr	"# Falls ON zeige nur neue/ungelesene Artikel, sonst alle.\n"
 
-#: src/lang.c:1408
+#: src/lang.c:1403
 msgid	"Show only groups with unread arts  :"
 msgstr	"Zeige nur Gruppen mit ungel. Art.  :"
 
-#: src/lang.c:1409
+#: src/lang.c:1404
 msgid	"# If ON show only subscribed to groups that contain unread articles.\n"
 msgstr	"# Falls ON zeige nur abonnierte Gruppen mit ungelesen Artikeln.\n"
 
-#: src/lang.c:1414
+#: src/lang.c:1409
 msgid	"Filter which articles              :"
 msgstr	"Filter (kill) anwenden auf         :"
 
-#: src/lang.c:1415
+#: src/lang.c:1410
 msgid	"# 0=(Only kill unread articles)\n"
 	"# 1=(Kill all articles and show in threads marked with K)\n"
 	"# 2=(Kill all articles and never show them).\n"
@@ -4418,216 +4439,215 @@ msgstr	"# 0=(Filtert nur ungelesene Arti
 	"# 1=(Filtert alle Artikel und markiert sie mit K)\n"
 	"# 2=(Filtert alle Artikel und zeigt sie niemals an).\n"
 
-#: src/lang.c:1422
+#: src/lang.c:1417
 msgid	"Tab goes to next unread article    :"
 msgstr	"Tab zeigt nächsten ungelesenen Art.:"
 
-#: src/lang.c:1423
+#: src/lang.c:1418
 msgid	"# If ON the TAB command will go to next unread article at article viewer "
 	"level\n"
 msgstr	"# Falls ON wechselt TAB sofort zum nächsten ungelesenen Artikel\n"
 
-# TRANSLATION MISSING
-#: src/lang.c:1427
+#: src/lang.c:1422
 msgid	"Scrolling with <SPACE> past the end of an art. jumps to the next unread one."
-msgstr	""
+msgstr	"Weiterscrollen mit Leertaste am Artikelende wechselt zum nächsten ungel. "
+	"Artikel"
 
-#: src/lang.c:1428
+#: src/lang.c:1423
 msgid	"Space goes to next unread article  :"
 msgstr	"Leertaste zeigt nächsten unge. Art.:"
 
-#: src/lang.c:1429
+#: src/lang.c:1424
 msgid	"# If ON the SPACE command will go to next unread article at article viewer\n"
 	"# level when the end of the article is reached (rn-style pager)\n"
 msgstr	"# Falls ON wechselt die Leertaste zum nächsten ungelesenen Artikel, wenn\n"
 	"# das Ende des Artikels erreicht wird (rn-Stil)\n"
 
-# TRANSLATION MISSING
-#: src/lang.c:1434
+#: src/lang.c:1429
 msgid	"Scrolling with <PGDN>/<DOWN> past the end of an art. jumps to the unread one."
-msgstr	""
+msgstr	"Weiterscrollen mit BildAb am Artikelende wechselt zum nächsten ungel. Artikel"
 
-#: src/lang.c:1435
+#: src/lang.c:1430
 msgid	"PgDn goes to next unread article   :"
 msgstr	"PgDn zeigt nächst. ungelesenen Art.:"
 
-#: src/lang.c:1436
+#: src/lang.c:1431
 msgid	"# If ON the PGDN or DOWN command will go to next unread article when\n"
 	"# pressed at end of message\n"
 msgstr	"# Falls ON wechselt Bildrunter oder Cursorrunter zum nächsten ungelesenen\n"
 	"# Artikel, wenn das Artikelende erreicht wurde\n"
 
-#: src/lang.c:1442
+#: src/lang.c:1437
 msgid	"List thread using right arrow key  :"
 msgstr	"Zeige Thread mit rechter Pfeilt. an:"
 
-#: src/lang.c:1443
+#: src/lang.c:1438
 msgid	"# If ON automatically list thread when entering it using right arrow key.\n"
 msgstr	"# Falls ON: Thread beim Betreten mit der rechten Cursortaste automatisch\n"
 	"# anzeigen?\n"
 
-#: src/lang.c:1447
+#: src/lang.c:1442
 msgid	"Enter character to indicate deleted articles. <CR> sets, <ESC> cancels."
 msgstr	"Definiere Zeichen für gelöschte Artikel. <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1448
+#: src/lang.c:1443
 msgid	"Character to show deleted articles :"
 msgstr	"Zeichen für gelöschte Artikel      :"
 
-#: src/lang.c:1449
+#: src/lang.c:1444
 msgid	"# Character used to show that an art was deleted (default 'D')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Zeichen für einen Artikel, der gelöscht wurde (Voreinstellung 'D')\n"
 	"# _ wird in ' ' umgewandelt\n"
 
-#: src/lang.c:1454
+#: src/lang.c:1449
 msgid	"Enter character to indicate articles in a range. <CR> sets, <ESC> cancels."
 msgstr	"Definiere Zeichen, das Artikel im Bereich anzeigt.<CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1455
+#: src/lang.c:1450
 msgid	"Character to show inrange articles :"
 msgstr	"Zeichen für Artikel im Bereich     :"
 
-#: src/lang.c:1456
+#: src/lang.c:1451
 msgid	"# Character used to show that an art is in a range (default '#')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Zeichen für Artikel die im Bereich sind (Voreinstellung '#')\n"
 	"# _ wird in ' ' umgewandelt\n"
 
-#: src/lang.c:1461
+#: src/lang.c:1456
 msgid	"Enter character to indicate that article will return. <CR> sets, <ESC> "
 	"cancels."
 msgstr	"Definiere Zeichen für wiederkehrende Art. <CR> setzt. <ESC> bricht ab."
 
-#: src/lang.c:1462
+#: src/lang.c:1457
 msgid	"Character to show returning arts   :"
 msgstr	"Zeichen für wiederkehrende Artikel :"
 
-#: src/lang.c:1463
+#: src/lang.c:1458
 msgid	"# Character used to show that an art will return (default '-')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Zeichen, dass ein Artikel wiederkommen wird (Voreinstellung '-')\n"
 	"# _ wird in ' ' umgewandelt\n"
 
-#: src/lang.c:1468
+#: src/lang.c:1463
 msgid	"Enter character to indicate selected articles. <CR> sets, <ESC> cancels."
 msgstr	"Zeichen für Artikel mit Markierung wichtig/'hot' <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1469
+#: src/lang.c:1464
 msgid	"Character to show selected articles:"
 msgstr	"Zeichen für wichtige Artikel       :"
 
-#: src/lang.c:1470
+#: src/lang.c:1465
 msgid	"# Character used to show that an art was auto-selected (default '*')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Zeichen für Artikel mit Markierung wichtig/'hot' (Voreinstellung '*')\n"
 	"# _ wird in ' ' umgewandelt\n"
 
-#: src/lang.c:1475
+#: src/lang.c:1470
 msgid	"Enter character to indicate recent articles. <CR> sets, <ESC> cancels."
 msgstr	"Definiere Zeichen für aktuelle Artikel. <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1476
+#: src/lang.c:1471
 msgid	"Character to show recent articles  :"
 msgstr	"Zeichen für aktuelle Artikel       :"
 
-#: src/lang.c:1477
+#: src/lang.c:1472
 msgid	"# Character used to show that an art is recent (default 'o')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Zeichen für einen aktuellen Artikel (Voreinstellung ist 'o')\n"
 	"# _ wird in ' ' umgewandelt\n"
 
-#: src/lang.c:1482
+#: src/lang.c:1477
 msgid	"Enter character to indicate unread articles. <CR> sets, <ESC> cancels."
 msgstr	"Zeichen für ungelesene Artikel. <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1483
+#: src/lang.c:1478
 msgid	"Character to show unread articles  :"
 msgstr	"Zeichen für ungelesene Artikel     :"
 
-#: src/lang.c:1484
+#: src/lang.c:1479
 msgid	"# Character used to show that an art is unread (default '+')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Zeichen für ungelesene Artikel (Voreinstellung '+')\n"
 	"# _ wird in ' ' umgewandelt\n"
 
-#: src/lang.c:1489
+#: src/lang.c:1484
 msgid	"Enter character to indicate read articles. <CR> sets, <ESC> cancels."
 msgstr	"Zeichen für gelesene Artikel. <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1490
+#: src/lang.c:1485
 msgid	"Character to show read articles    :"
 msgstr	"Zeichen für gelesene Artikel       :"
 
-#: src/lang.c:1491
+#: src/lang.c:1486
 msgid	"# Character used to show that an art was read (default ' ')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Zeichen für gelesene Artikel (Voreinstellung ' ')\n"
 	"# _ wird in ' ' umgewandelt\n"
 
-#: src/lang.c:1496
+#: src/lang.c:1491
 msgid	"Enter character to indicate killed articles. <CR> sets, <ESC> cancels."
 msgstr	"Zeichen für gekillte Artikel. <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1497
+#: src/lang.c:1492
 msgid	"Character to show killed articles  :"
 msgstr	"Zeichen für gekillte Artikel       :"
 
-#: src/lang.c:1498
+#: src/lang.c:1493
 msgid	"# Character used to show that an art was killed (default 'K')\n"
 	"# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr	"# Zeichen für gekillte Artikel (Voreinstellung 'K')\n"
 	"# _ wird in ' ' umgewandelt, kill_level muss passend gesetzt sein.\n"
 
-#: src/lang.c:1503
+#: src/lang.c:1498
 msgid	"Enter character to indicate read selected articles. <CR> sets, <ESC> cancels."
 msgstr	"Zeichen für gelesene wichtige/'hot' Artikel. <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1504
+#: src/lang.c:1499
 msgid	"Character to show readselected arts:"
 msgstr	"Zeichen für gelesene wichtige Art. :"
 
-#: src/lang.c:1505
+#: src/lang.c:1500
 msgid	"# Character used to show that an art was selected before read (default ':')\n"
 	"# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr	"# Zeichen für bereits gelesene Artikel mit Markierung wichtig/'hot'\n"
 	"# (Voreinstellung ':')\n"
 	"# _ wird in ' ' umgewandelt, kill_level muss passend gesetzt sein.\n"
 
-#: src/lang.c:1510
+#: src/lang.c:1505
 msgid	"Enter maximum length of newsgroup names displayed. <CR> sets."
 msgstr	"Maximale Länge des angezeigten Newsgruppennamens. <CR> setzt."
 
-#: src/lang.c:1511
+#: src/lang.c:1506
 msgid	"Max. length of group names shown   :"
 msgstr	"Max. Länge angezeigter Gruppennamen:"
 
-#: src/lang.c:1512
+#: src/lang.c:1507
 msgid	"# Maximum length of the names of newsgroups displayed\n"
 msgstr	"# Maximale Länge der angezeigten Newsgruppennamen\n"
 
-#: src/lang.c:1517
+#: src/lang.c:1512
 msgid	"Show lines/score in listings       :"
 msgstr	"Zeige Zeilenz./Bewert. in Übersicht:"
 
-#: src/lang.c:1518
+#: src/lang.c:1513
 msgid	"# What informations should be displayed in article/thread listing\n"
 	"# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n"
 msgstr	"# Welche weiteren Informationen sollen in der Artikel/Thread\n"
 	"# Übersicht angezeigt werden:\n"
 	"# 0 = keine, 1 = Zeilenzahl, 2 = Bewertung, 3 = Zeilenzahl & Bewertung\n"
 
-#: src/lang.c:1523
+#: src/lang.c:1518
 msgid	"0 = full page scrolling, -1 = show previous last line as first on next page, "
 	"-2 = half page"
 msgstr	"0 = seitenweise, -1 = zeige zusätzlich letzte Zeile der vorigen Seite, -2 = "
 	"halbe Seite"
 
-#: src/lang.c:1524
+#: src/lang.c:1519
 msgid	"Number of lines to scroll in pager :"
 msgstr	"Blättere Artikel um ... Zeilen     :"
 
-#: src/lang.c:1525
+#: src/lang.c:1520
 msgid	"# Number of lines that cursor-up/down will scroll in article pager\n"
 	"# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n"
 	"# -1 = the top/bottom line is carried over onto the next page,\n"
@@ -4637,27 +4657,27 @@ msgstr	"# Anzahl der Zeilen, die Cursor-
 	"# -1 = seitenweise, zeigt zusätzlich letzte Zeile der vorigen Seite\n"
 	"# -2 = um eine halbe Seite\n"
 
-#: src/lang.c:1532
+#: src/lang.c:1527
 msgid	"Display signatures. <SPACE> toggles & <CR> sets."
 msgstr	"Zeige Signaturen an. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1533
+#: src/lang.c:1528
 msgid	"Display signatures                 :"
 msgstr	"Zeige Signaturen an                :"
 
-#: src/lang.c:1534
+#: src/lang.c:1529
 msgid	"# If OFF don't show signatures when displaying articles\n"
 msgstr	"# Falls OFF zeige keine Signaturen an\n"
 
-#: src/lang.c:1538
+#: src/lang.c:1533
 msgid	"Display uuencoded data as tagged attachments. <SPACE> toggles & <CR> sets."
 msgstr	"Uu-kodierte Teile als Attachment anzeigen. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1539
+#: src/lang.c:1534
 msgid	"Display uue data as an attachment  :"
 msgstr	"Zeige uue-Teile als Attachment     :"
 
-#: src/lang.c:1540
+#: src/lang.c:1535
 msgid	"# Handling of uuencoded data in the pager\n"
 	"# 0 = display raw uuencoded data\n"
 	"# 1 = uuencoded data will be condensed to a single tag line showing\n"
@@ -4670,29 +4690,29 @@ msgstr	"# Behandlung von uuencodeten Dat
 	"#     ähnlich der von MIME Anhängen\n"
 	"# 2 = Einzeilige Zusammenfassung auch für unvollständige Daten\n"
 
-#: src/lang.c:1549
+#: src/lang.c:1544
 msgid	"Decode German style TeX umlaut codes to ISO. <SPACE> toggles & <CR> sets."
 msgstr	"TeX german.sty Umlautkodierung auswerten. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1550
+#: src/lang.c:1545
 msgid	"Display \"a as Umlaut-a             :"
 msgstr	"Wandle TeX-Umlaute automatisch um  :"
 
-#: src/lang.c:1551
+#: src/lang.c:1546
 msgid	"# If ON decode German style TeX umlaut codes to ISO and\n"
 	"# show \"a as Umlaut-a, etc.\n"
 msgstr	"# Wenn ON dekodiere laut german.sty (TeX) kodierte Umlaute und stelle\n"
 	"# \"a als ä, usw. dar\n"
 
-#: src/lang.c:1556 src/lang.c:1566
+#: src/lang.c:1551 src/lang.c:1561
 msgid	"Space separated list of header fields"
 msgstr	"Durch Leerzeichen getrennte Liste der Header-Felder"
 
-#: src/lang.c:1557
+#: src/lang.c:1552
 msgid	"Display these header fields (or *) :"
 msgstr	"Zeige diese Header-Felder (oder *) :"
 
-#: src/lang.c:1558
+#: src/lang.c:1553
 msgid	"# Which news headers you wish to see. If you want to see _all_ the headers,\n"
 	"# place an '*' as this value. This is the only way a wildcard can be used.\n"
 	"# If you enter 'X-' as the value, you will see all headers beginning with\n"
@@ -4706,11 +4726,11 @@ msgstr	"# Welche Header wollen Sie sehen
 	"# Leerzeichen getrennte Werte angeben. Wenn Sie hier nichts definieren\n"
 	"# wird diese Option deaktiviert.\n"
 
-#: src/lang.c:1567
+#: src/lang.c:1562
 msgid	"Do not display these header fields :"
 msgstr	"Zeige folgende Header nicht an     :"
 
-#: src/lang.c:1568
+#: src/lang.c:1563
 msgid	"# Same as 'news_headers_to_display' except it denotes the opposite.\n"
 	"# An example of using both options might be if you thought X- headers were\n"
 	"# A Good Thing(tm), but thought Alan and Pape were miscreants...well then "
@@ -4727,27 +4747,27 @@ msgstr	"# Genau das gleiche wie 'news_he
 	"# news_headers_to_not_display=X-Alan X-Pape\n"
 	"# Wenn Sie hier nichts angeben, wird diese Option deaktiviert.\n"
 
-#: src/lang.c:1578
+#: src/lang.c:1573
 msgid	"Do you want to enable automatic handling of multipart/alternative articles?"
 msgstr	"Automatische Bearbeitung von Art. mit multipart/alternative-Teilen aktivieren?"
 
-#: src/lang.c:1579
+#: src/lang.c:1574
 msgid	"Skip multipart/alternative parts   :"
 msgstr	"Übersp. multipart/alternative-Teile:"
 
-#: src/lang.c:1580
+#: src/lang.c:1575
 msgid	"# If ON strip multipart/alternative messages automatically\n"
 msgstr	"# Falls ON entsorge multipart/alternative Teile des Artikels automatisch\n"
 
-#: src/lang.c:1585
+#: src/lang.c:1580
 msgid	"A regex used to decide which lines to show in col_quote."
 msgstr	"Regulärer Ausdruck für Zeilen, die mit col_quote dargestellt werden."
 
-#: src/lang.c:1586
+#: src/lang.c:1581
 msgid	"Regex used to show quoted lines    :"
 msgstr	"Regulärer Ausd. für zit. Zeilen    :"
 
-#: src/lang.c:1587
+#: src/lang.c:1582
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted when viewing articles. Quoted lines are shown in col_quote.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4756,15 +4776,15 @@ msgstr	"# Ein regulärer Ausdruck, den ti
 	"# Farbe angezeigt, die in col_quote definiert sind.\n"
 	"# Wenn Sie hier nichts angeben, werden die Voreinstellungen benutzt.\n"
 
-#: src/lang.c:1593
+#: src/lang.c:1588
 msgid	"A regex used to decide which lines to show in col_quote2."
 msgstr	"Regulärer Ausdruck für Zeilen, die mit col_quote2 dargestellt werden"
 
-#: src/lang.c:1594
+#: src/lang.c:1589
 msgid	"Regex used to show twice quoted l. :"
 msgstr	"Reg. Ausd. für zweifach zitierte Z.:"
 
-#: src/lang.c:1595
+#: src/lang.c:1590
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted twice. Twice quoted lines are shown in col_quote2.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4773,15 +4793,15 @@ msgstr	"# Ein regulärer Ausdruck, den ti
 	"# Farbe dargestellt, die in col_quote2 definiert ist.\n"
 	"# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n"
 
-#: src/lang.c:1601
+#: src/lang.c:1596
 msgid	"A regex used to decide which lines to show in col_quote3."
 msgstr	"Regulärer Ausdruck für Zeilen, die mit col_quote3 dargestellt werden."
 
-#: src/lang.c:1602
+#: src/lang.c:1597
 msgid	"Regex used to show >= 3 times q.l. :"
 msgstr	"Reg. Ausd. für >=3-fach zitierte Z.:"
 
-#: src/lang.c:1603
+#: src/lang.c:1598
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4790,15 +4810,15 @@ msgstr	"# Ein regulärer Ausdruck, der en
 	"# dargestellt, die in col_quote3 definiert sind.\n"
 	"# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n"
 
-#: src/lang.c:1610
+#: src/lang.c:1605
 msgid	"A regex used to decide which words to show in col_markslashes."
 msgstr	"Regulärer Ausdruck für Zeilen, die mit col_markslashes dargestellt werden."
 
-#: src/lang.c:1611
+#: src/lang.c:1606
 msgid	"Regex used to highlight /slashes/  :"
 msgstr	"Reg. für /Schrägst./ Hervorhebungen:"
 
-#: src/lang.c:1612
+#: src/lang.c:1607
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '/' are to be shown in col_markslashes.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4806,15 +4826,15 @@ msgstr	"# Ein regulärer Ausdruck, der en
 	"# zwischen '/' in col_markslashes angezeigt werden.\n"
 	"# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n"
 
-#: src/lang.c:1618
+#: src/lang.c:1613
 msgid	"A regex used to decide which words to show in col_markstars."
 msgstr	"Regulärer Ausdruck für Zeilen, die mit col_markstars dargestellt werden."
 
-#: src/lang.c:1619
+#: src/lang.c:1614
 msgid	"Regex used to highlight *stars*    :"
 msgstr	"Regu. A. für *Stern* Hervorhebungen:"
 
-#: src/lang.c:1620
+#: src/lang.c:1615
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '*' are to be shown in col_markstars.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4822,15 +4842,15 @@ msgstr	"# Ein regulärer Ausdruck, der en
 	"# zwischen '*' in col_markstars angezeigt werden.\n"
 	"# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n"
 
-#: src/lang.c:1626
+#: src/lang.c:1621
 msgid	"A regex used to decide which words to show in col_markstroke."
 msgstr	"Regulärer Ausdruck für Zeilen, die mit col_markstroke dargestellt werden."
 
-#: src/lang.c:1627
+#: src/lang.c:1622
 msgid	"Regex used to highlight -strokes-  :"
 msgstr	"Reg. für -Durchstr.- Hervorhebungen:"
 
-#: src/lang.c:1628
+#: src/lang.c:1623
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '-' are to be shown in col_markstroke.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4838,15 +4858,15 @@ msgstr	"# Ein regulärer Ausdruck, der en
 	"# zwischen '-' in col_markstroke angezeigt werden.\n"
 	"# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n"
 
-#: src/lang.c:1634
+#: src/lang.c:1629
 msgid	"A regex used to decide which words to show in col_markdash."
 msgstr	"Regulärer Ausdruck für Zeilen, die mit col_markdash dargestellt werden."
 
-#: src/lang.c:1635
+#: src/lang.c:1630
 msgid	"Regex used to highlight _underline_:"
 msgstr	"Reg. für _Unterstr._ Hervorhebungen:"
 
-#: src/lang.c:1636
+#: src/lang.c:1631
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '_' are to be shown in col_markdash.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4854,44 +4874,44 @@ msgstr	"# Ein regulärer Ausdruck, der en
 	"# zwischen '_' in col_markdash angezeigt werden.\n"
 	"# Wenn Sie hier nichts eingeben, werden die Voreinstellungen benutzt.\n"
 
-#: src/lang.c:1642
+#: src/lang.c:1637
 msgid	"A regex used to find Subject prefixes to remove.  Use '|' as separator."
 msgstr	"Reg. Ausd., um Teile im Subjectanfang zu entfernen. '|' trennt die Ausd.."
 
-#: src/lang.c:1643
+#: src/lang.c:1638
 msgid	"Regex with Subject prefixes        :"
 msgstr	"Reg. Ausd. für den Subjectanfang   :"
 
-#: src/lang.c:1644
+#: src/lang.c:1639
 msgid	"# A regular expression that tin will use to find Subject prefixes\n"
 	"# which will be removed before showing the header.\n"
 msgstr	"# Ein regulärer Ausdruck, mit dem tin Worte im Anfang des Subjects findet,\n"
 	"# die dann entfernt werden.\n"
 
-#: src/lang.c:1649
+#: src/lang.c:1644
 msgid	"A regex used to find Subject suffixes to remove.  Use '|' as separator."
 msgstr	"Reg. Ausd., um Teile am Subjectanfang zu entfernen. '|' trennt die Ausd.."
 
-#: src/lang.c:1650
+#: src/lang.c:1645
 msgid	"Regex with Subject suffixes        :"
 msgstr	"Reg. Ausd. für das Subjectende     :"
 
-#: src/lang.c:1651
+#: src/lang.c:1646
 msgid	"# A regular expression that tin will use to find Subject suffixes\n"
 	"# which will be removed when replying or posting followup.\n"
 msgstr	"# Ein regulärer Ausdruck, der beim Antworten zum Abschneiden von\n"
 	"# unerwünschten Teilen am Ende des Subjects verwendet wird.\n"
 
-#: src/lang.c:1656
+#: src/lang.c:1651
 msgid	"Enter name and options for external MIME viewer, --internal for built-in "
 	"viewer"
 msgstr	"Name und Optionen für ext. MIME-Viewer, --internal für eingebaute Version"
 
-#: src/lang.c:1657
+#: src/lang.c:1652
 msgid	"MIME binary content viewer         :"
 msgstr	"MIME-Viewer                        :"
 
-#: src/lang.c:1658
+#: src/lang.c:1653
 msgid	"# If --internal automatically use the built in MIME viewer for non-text\n"
 	"# parts of articles.\n"
 	"# Otherwise specify an external viewer program (eg, metamail) or leave blank\n"
@@ -4900,364 +4920,364 @@ msgstr	"# Falls --internal wird der eing
 	"# nicht Text teilen benutzt. Andernfalls das angegebene Programm\n"
 	"# (z.B. metamail). Keine Angabe schaltet die automatische Anzeige aus.\n"
 
-#: src/lang.c:1665
+#: src/lang.c:1660
 msgid	"Confirm before starting non-text viewing program"
 msgstr	"Start des MIME-Viewers bestätigen"
 
-#: src/lang.c:1666
+#: src/lang.c:1661
 msgid	"Ask before using MIME viewer       :"
 msgstr	"Start des MIME-Viewers bestätigen  :"
 
-#: src/lang.c:1667
+#: src/lang.c:1662
 msgid	"# If ON tin will ask before using metamail to display MIME messages\n"
 	"# this only happens if metamail_prog is set to something\n"
 msgstr	"# Falls ON fragt tin nach, bevor metamail zum Anzeigen von MIME Artikeln\n"
 	"# benutzt wird. Das passiert nur, wenn auch metamail_prog gesetzt ist.\n"
 
-#: src/lang.c:1672
+#: src/lang.c:1667
 msgid	"Ask to mark groups read when quitting. <SPACE> toggles & <CR> sets."
 msgstr	"Beim Beenden anbieten, alle betretenen Gruppen als gelesen zu markieren?"
 
-#: src/lang.c:1673
+#: src/lang.c:1668
 msgid	"Catchup read groups when quitting  :"
 msgstr	"Aufholen der Gruppen beim Beenden  :"
 
-#: src/lang.c:1674
+#: src/lang.c:1669
 msgid	"# If ON ask user if read groups should all be marked read\n"
 msgstr	"# Falls ON: Beim Beenden von tin anbieten, alle betretenen Gruppen\n"
 	"#           als gelesen zu markieren\n"
 
-#: src/lang.c:1679
+#: src/lang.c:1674
 msgid	"Catchup group using left key       :"
 msgstr	"Catchup der Gruppe mit l. Cursor   :"
 
-#: src/lang.c:1680
+#: src/lang.c:1675
 msgid	"# If ON catchup group/thread when leaving with the left arrow key.\n"
 msgstr	"# Falls ON: Aufholen (als gelesen markieren) der Gruppe/des Threads\n"
 	"#           beim Verlassen mit der linken Cursortaste\n"
 
-#: src/lang.c:1685
+#: src/lang.c:1680
 msgid	"Catchup thread by using left key   :"
 msgstr	"Catchup mit der linken Cursort.    :"
 
-#: src/lang.c:1691
+#: src/lang.c:1686
 msgid	"Which actions require confirmation :"
 msgstr	"Bestätigung erforderlich für       :"
 
-#: src/lang.c:1692
+#: src/lang.c:1687
 msgid	"# What should we ask confirmation for.\n"
 msgstr	"# Welche Operationen müssen explizit bestätigt werden.\n"
 	"# Kommandos, die im Manual mit [after confirmation] markiert sind,\n"
 	"# Beenden von tin, markieren aller nicht hochgescorter Artikel als\n"
 	"# gelesen (siehe 'X' Befehl im Manual).\n"
 
-#: src/lang.c:1696
+#: src/lang.c:1691
 msgid	"Program to run to open URL's, <CR> sets, <ESC> cancels."
 msgstr	"Öffne URLs mit ... <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:1697
+#: src/lang.c:1692
 msgid	"Program that opens URL's           :"
 msgstr	"Öffne URLs mit ...                 :"
 
-#: src/lang.c:1698
+#: src/lang.c:1693
 msgid	"# The program used to open URL's. The actual URL will be appended\n"
 msgstr	"# Programm zum Öffnen von URLs, die jeweilige URL wird hinten angehängt.\n"
 
-#: src/lang.c:1703
+#: src/lang.c:1698
 msgid	"Use mouse in xterm                 :"
 msgstr	"Maus in xterm nutzen               :"
 
-#: src/lang.c:1704
+#: src/lang.c:1699
 msgid	"# If ON enable mouse key support on xterm terminals\n"
 msgstr	"# Falls ON wird die Maustastenunterstützung für xterm aktiviert\n"
 
-#: src/lang.c:1710
+#: src/lang.c:1705
 msgid	"Use scroll keys on keypad          :"
 msgstr	"Scrollt. vom Nummernblock nutzen   :"
 
-#: src/lang.c:1711
+#: src/lang.c:1706
 msgid	"# If ON enable scroll keys on terminals that support it\n"
 msgstr	"# Falls ON werden die Scrolltasten genutzt (Terminalabhängig)\n"
 
-#: src/lang.c:1716
+#: src/lang.c:1711
 msgid	"Enter maximum number of article to get. <CR> sets."
 msgstr	"Maximale Anzahl der zu holenden Artikel eingeben. <CR> setzt."
 
-#: src/lang.c:1717
+#: src/lang.c:1712
 msgid	"Number of articles to get          :"
 msgstr	"Anzahl der zu holenden Artikel     :"
 
-#: src/lang.c:1718
+#: src/lang.c:1713
 msgid	"# Number of articles to get (0=no limit), if negative sets maximum number\n"
 	"# of already read articles to be read before first unread one\n"
 msgstr	"# Anzahl der zu holenden Artikel (0=unbegrenzt), falls ein negativer Wert\n"
 	"# angegeben wird, holt tin alle ungelesenen plus die letzten n gelesenen\n"
 	"# Artikel\n"
 
-#: src/lang.c:1723
+#: src/lang.c:1718
 msgid	"Enter number of days article is considered recent. <CR> sets."
 msgstr	"Anzahl der Tage, die ein Artikel als neu eingestuft wird. <CR> setzt."
 
-#: src/lang.c:1724
+#: src/lang.c:1719
 msgid	"Article recentness time limit      :"
 msgstr	"Artikel Neuheitszeit-Limit         :"
 
-#: src/lang.c:1725
+#: src/lang.c:1720
 msgid	"# Number of days in which article is considered recent, (0=OFF)\n"
 msgstr	"# Anzahl der Tage, die ein Artikel als neu eingestuft wird, (0=Aus)\n"
 
-#: src/lang.c:1729
+#: src/lang.c:1724
 msgid	"WILDMAT for normal wildcards, REGEX for full regular expression matching."
 msgstr	"WILDMAT für normale Wildcards, REGEX für die Nutzung von regulären Ausdrücken."
 
-#: src/lang.c:1730
+#: src/lang.c:1725
 msgid	"Wildcard matching                  :"
 msgstr	"Wildcardprüfung                    :"
 
-#: src/lang.c:1731
+#: src/lang.c:1726
 msgid	"# Wildcard matching 0=(wildmat) 1=(regex)\n"
 msgstr	"# Wildcardprüfung 0=(wildmat) 1=(Regulärer Ausdruck)\n"
 
-#: src/lang.c:1735
+#: src/lang.c:1730
 msgid	"Enter minimal score before an article is marked killed. <CR> sets."
 msgstr	"Artikel mit weniger Bewertung (Score) werden als `gekillt' markiert. <CR> "
 	"setzt."
 
-#: src/lang.c:1736
+#: src/lang.c:1731
 msgid	"Score limit (kill)                 :"
 msgstr	"Bewertungsgrenze (kill)            :"
 
-#: src/lang.c:1737
+#: src/lang.c:1732
 msgid	"# Score limit before an article is marked killed\n"
 msgstr	"# Jeder Artikel mit einer niedrigeren Bewertung (Score) wird als\n"
 	"# gekillt markiert\n"
 
-#: src/lang.c:1741
+#: src/lang.c:1736
 msgid	"Enter default score to kill articles. <CR> sets."
 msgstr	"Bewertung für gekillte Artikel. <CR> setzt."
 
-#: src/lang.c:1742
+#: src/lang.c:1737
 msgid	"Default score to kill articles     :"
 msgstr	"Bewertung für gekillte Artikel     :"
 
-#: src/lang.c:1743
+#: src/lang.c:1738
 msgid	"# Default score to kill articles\n"
 msgstr	"# Bewertung für gekillte Artikel\n"
 
-#: src/lang.c:1747
+#: src/lang.c:1742
 msgid	"Enter minimal score before an article is marked hot. <CR> sets."
 msgstr	"Artikel mit einer höheren Bewertung (Score) werd. als wichtig/hot markiert."
 
-#: src/lang.c:1748
+#: src/lang.c:1743
 msgid	"Score limit (select)               :"
 msgstr	"Bewertungsgrenze (select)          :"
 
-#: src/lang.c:1749
+#: src/lang.c:1744
 msgid	"# Score limit before an article is marked hot\n"
 msgstr	"# Artikel mit einer höheren Bewertung (Score) werden als\n"
 	"# wichtig (hot) markiert\n"
 
-#: src/lang.c:1753
+#: src/lang.c:1748
 msgid	"Enter default score to select articles. <CR> sets."
 msgstr	"Bewertung für wichtige Artikel (hot). <CR> setzt."
 
-#: src/lang.c:1754
+#: src/lang.c:1749
 msgid	"Default score to select articles   :"
 msgstr	"Bewertung für wichtige Artikel     :"
 
-#: src/lang.c:1755
+#: src/lang.c:1750
 msgid	"# Default score to select articles\n"
 msgstr	"# Bewertung für wichtige Artikel (hot)\n"
 
-#: src/lang.c:1761
+#: src/lang.c:1756
 msgid	"Use slrnface to show ''X-Face:''s  :"
 msgstr	"''X-Face:''s mit slrnface Anzeigen :"
 
-#: src/lang.c:1762
+#: src/lang.c:1757
 msgid	"# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n"
 	"# Only useful when running in an xterm.\n"
 msgstr	"# Falls ON benutze slrnface(1) um ''X-Face:'' anzuzeigen.\n"
 	"# Funktioniert nur wenn tin in einem xterm läuft.\n"
 
-#: src/lang.c:1770
+#: src/lang.c:1765
 msgid	"Use ANSI color                     :"
 msgstr	"Benutze ANSI-Farben                :"
 
-#: src/lang.c:1771
+#: src/lang.c:1766
 msgid	"# If ON using ANSI-color\n"
 msgstr	"# Falls ON benutze ANSI-Farben\n"
 
-#: src/lang.c:1776
+#: src/lang.c:1771
 msgid	"Standard foreground color          :"
 msgstr	"Standard Vordergrundfarbe          :"
 
-#: src/lang.c:1777
+#: src/lang.c:1772
 msgid	"# Standard foreground color\n"
 msgstr	"# Standard Vordergrundfarbe\n"
 
-#: src/lang.c:1782
+#: src/lang.c:1777
 msgid	"Standard background color          :"
 msgstr	"Standard Hintergrundfarbe          :"
 
-#: src/lang.c:1783
+#: src/lang.c:1778
 msgid	"# Standard-Background-Color\n"
 msgstr	"# Standard Hintergrundfarbe\n"
 
-#: src/lang.c:1788
+#: src/lang.c:1783
 msgid	"Color for inverse text (background):"
 msgstr	"Farbe des inversen Text (Hinterg.) :"
 
-#: src/lang.c:1789
+#: src/lang.c:1784
 msgid	"# Color of background for inverse text\n"
 msgstr	"# Farbe des Hintergrunds für inversen Text\n"
 
-#: src/lang.c:1794
+#: src/lang.c:1789
 msgid	"Color for inverse text (foreground):"
 msgstr	"Farbe des inversen Text (Vordergr.):"
 
-#: src/lang.c:1795
+#: src/lang.c:1790
 msgid	"# Color of foreground for inverse text\n"
 msgstr	"# Farbe des Vordergrunds für inversen Text\n"
 
-#: src/lang.c:1800
+#: src/lang.c:1795
 msgid	"Color of text lines                :"
 msgstr	"Farbe der Textzeilen               :"
 
-#: src/lang.c:1801
+#: src/lang.c:1796
 msgid	"# Color of text-lines\n"
 msgstr	"# Farbe der Textzeilen\n"
 
-#: src/lang.c:1806
+#: src/lang.c:1801
 msgid	"Color of mini help menu            :"
 msgstr	"Farbe des Minihilfemenü            :"
 
-#: src/lang.c:1807
+#: src/lang.c:1802
 msgid	"# Color of mini help menu\n"
 msgstr	"# Farbe des Minihilfemenü\n"
 
-#: src/lang.c:1812
+#: src/lang.c:1807
 msgid	"Color of help text                 :"
 msgstr	"Farbe des Hilfstext                :"
 
-#: src/lang.c:1813
+#: src/lang.c:1808
 msgid	"# Color of help pages\n"
 msgstr	"# Farbe der Hilfsseiten\n"
 
-#: src/lang.c:1818
+#: src/lang.c:1813
 msgid	"Color of status messages           :"
 msgstr	"Farbe der Statusmeldungen          :"
 
-#: src/lang.c:1819
+#: src/lang.c:1814
 msgid	"# Color of messages in last line\n"
 msgstr	"# Farbe der letzten Zeile im Artikel\n"
 
-#: src/lang.c:1824
+#: src/lang.c:1819
 msgid	"Color of quoted lines              :"
 msgstr	"Farbe der zitierten Zeilen         :"
 
-#: src/lang.c:1825
+#: src/lang.c:1820
 msgid	"# Color of quote-lines\n"
 msgstr	"# Farbe der zitierten Zeilen\n"
 
-#: src/lang.c:1830
+#: src/lang.c:1825
 msgid	"Color of twice quoted line         :"
 msgstr	"Farbe von zweifach zitierten Zeilen:"
 
-#: src/lang.c:1831
+#: src/lang.c:1826
 msgid	"# Color of twice quoted lines\n"
 msgstr	"# Farbe von zweifach zitierten Zeilen\n"
 
-#: src/lang.c:1836
+#: src/lang.c:1831
 msgid	"Color of =>3 times quoted line     :"
 msgstr	"Farbe von =>3-fach zitierten Zeilen:"
 
-#: src/lang.c:1837
+#: src/lang.c:1832
 msgid	"# Color of >=3 times quoted lines\n"
 msgstr	"# Farbe von =>3-fach zitierten Zeilen\n"
 
-#: src/lang.c:1842
+#: src/lang.c:1837
 msgid	"Color of article header lines      :"
 msgstr	"Farbe der Artikelheaderzeilen      :"
 
-#: src/lang.c:1843
+#: src/lang.c:1838
 msgid	"# Color of header-lines\n"
 msgstr	"# Farbe der Artikelheaderzeilen\n"
 
-#: src/lang.c:1848
+#: src/lang.c:1843
 msgid	"Color of actual news header fields :"
 msgstr	"Farbe des angezeigten Headers      :"
 
-#: src/lang.c:1849
+#: src/lang.c:1844
 msgid	"# Color of actual news header fields\n"
 msgstr	"# Farbe des angezeigten Headers\n"
 
-#: src/lang.c:1854
+#: src/lang.c:1849
 msgid	"Color of article subject lines     :"
 msgstr	"Farbe der Subjectzeile             :"
 
-#: src/lang.c:1855
+#: src/lang.c:1850
 msgid	"# Color of article subject\n"
 msgstr	"# Farbe der Subjectzeile\n"
 
-#: src/lang.c:1860
+#: src/lang.c:1855
 msgid	"Color of response counter          :"
 msgstr	"Farbe des Antwortzählers           :"
 
-#: src/lang.c:1861
+#: src/lang.c:1856
 msgid	"# Color of response counter\n"
 msgstr	"# Farbe des Antwortzählers\n"
 
-#: src/lang.c:1866
+#: src/lang.c:1861
 msgid	"Color of sender (From:)            :"
 msgstr	"Farbe des Autors (From:)           :"
 
-#: src/lang.c:1867
+#: src/lang.c:1862
 msgid	"# Color of sender (From:)\n"
 msgstr	"# Farbe des Autors (From:)\n"
 
-#: src/lang.c:1872
+#: src/lang.c:1867
 msgid	"Color of help/mail sign            :"
 msgstr	"Farbe des Hilfe/Mail-Zeichen       :"
 
-#: src/lang.c:1873
+#: src/lang.c:1868
 msgid	"# Color of Help/Mail-Sign\n"
 msgstr	"# Farbe des Hilfe/Mail-Zeichen\n"
 
-#: src/lang.c:1878
+#: src/lang.c:1873
 msgid	"Color of signatures                :"
 msgstr	"Farbe von Signaturen               :"
 
-#: src/lang.c:1879
+#: src/lang.c:1874
 msgid	"# Color of signature\n"
 msgstr	"# Farbe von Signaturen\n"
 
-#: src/lang.c:1884
+#: src/lang.c:1879
 msgid	"Color of highlighting with *stars* :"
 msgstr	"Farbe der Hervorhebung *Sterne*    :"
 
-#: src/lang.c:1885
+#: src/lang.c:1880
 msgid	"# Color of word highlighting. There are four possibilities\n"
 	"# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n"
 msgstr	"# Farbe der Hervorhebungen. Es gibt vier Möglichkeiten in Artikeln:\n"
 	"# *Sterne*, _Unterstriche_, /Schrägstriche/ und -Durchstreichen-.\n"
 
-#: src/lang.c:1891
+#: src/lang.c:1886
 msgid	"Color of highlighting with _dash_  :"
 msgstr	"Farbe der Hervorhebung _Striche_   :"
 
-#: src/lang.c:1897
+#: src/lang.c:1892
 msgid	"Color of highlighting with /slash/ :"
 msgstr	"Farbe der Hervorhebung /Schrägstr./:"
 
-#: src/lang.c:1903
+#: src/lang.c:1898
 msgid	"Color of highlighting with -stroke-:"
 msgstr	"Farbe der Hervorhebung -Durchstr.- :"
 
-#: src/lang.c:1910
+#: src/lang.c:1905
 msgid	"Attr. of highlighting with *stars* :"
 msgstr	"Hervorhebungsattribute *Sterne*    :"
 
-#: src/lang.c:1911
+#: src/lang.c:1906
 msgid	"# Attribute of word highlighting on mono terminals.\n"
 	"# There are four possibilities in articles:\n"
 	"# *stars*, /slashes/, _underdashes_ and -strokes-.\n"
@@ -5269,33 +5289,33 @@ msgstr	"# Attribute der Hervorhebung von
 	"# *Sterne*, /Schrägstriche/, _Unterstriche_ und -Durchstreichungen-.\n"
 	"# Die möglichen Werte sind:\n"
 	"# 0 - normal, 1 - unterstrichen, 2 - beste Hervorhebung,\n"
-	"# 3 - invers, 4 - blinkend , 5 - halbe Helligkeit, 6 - fett\n"
+	"# 3 - invers, 4 - blinkend, 5 - halbe Helligkeit, 6 - fett\n"
 
-#: src/lang.c:1921
+#: src/lang.c:1916
 msgid	"Attr. of highlighting with _dash_  :"
 msgstr	"Hervorhebungsattr. _Unterstriche_  :"
 
-#: src/lang.c:1927
+#: src/lang.c:1922
 msgid	"Attr. of highlighting with /slash/ :"
 msgstr	"Hervorhebungsattr. /Schrägstriche/ :"
 
-#: src/lang.c:1933
+#: src/lang.c:1928
 msgid	"Attr. of highlighting with -stroke-:"
 msgstr	"Hervorhebungsattr. -Durchstreich.- :"
 
-#: src/lang.c:1939
+#: src/lang.c:1934
 msgid	"Word highlighting in message body  :"
 msgstr	"Wort-Hervorhebung im Artikel       :"
 
-#: src/lang.c:1940
+#: src/lang.c:1935
 msgid	"# Enable word highlighting?\n"
 msgstr	"# Wort-Hervorhebung aktivieren?\n"
 
-#: src/lang.c:1945
+#: src/lang.c:1940
 msgid	"What to display instead of mark    :"
 msgstr	"Anstelle der Markierung anzeigen   :"
 
-#: src/lang.c:1946
+#: src/lang.c:1941
 msgid	"# Should the leading and ending stars and dashes also be displayed,\n"
 	"# even when they are highlighting marks?\n"
 	"# 0 - no    1 - yes, display mark    2 - print a space instead\n"
@@ -5303,58 +5323,59 @@ msgstr	"# Sollen die führenden und absch
 	"# werden, auch wenn sie Hervorhebungsmarkierungen sind?\n"
 	"# 0 - nein  1 - ja, anzeigen  2 - Leerzeichen anstelle darstellen\n"
 
-#: src/lang.c:1952
+#: src/lang.c:1947
 msgid	"Enter column number to wrap article lines to in the pager. <CR> sets."
 msgstr	"Nach wie vielen Zeichen soll im Pager umbrochen werden? <CR> setzt."
 
-#: src/lang.c:1953
+#: src/lang.c:1948
 msgid	"Page line wrap column              :"
 msgstr	"Zeilen umbrechen nach              :"
 
-#: src/lang.c:1954
+#: src/lang.c:1949
 msgid	"# Wrap article lines at column\n"
 msgstr	"# In der Artikelanzeige Zeilen umbrechen bei Spalte\n"
 
-# TRANSLATION MISSING
-#: src/lang.c:1959
+#: src/lang.c:1954
 msgid	"Wrap around threads on next unread :"
-msgstr	""
+msgstr	"Nä.ungel.-kein Abbr. am Listenende?:"
 
-# TRANSLATION MISSING
-#: src/lang.c:1960
+#: src/lang.c:1955
 msgid	"# If ON wrap around threads on searching next unread article\n"
-msgstr	""
+msgstr	"# Diverse Funktionen in tin wechseln zum \"nächsten\" ungelesenen\n"
+	"# Artikel. Diese Einstellung kontrolliert, ob tin am Ende der\n"
+	"# Artikel/Threadliste abbricht (OFF) oder zum Beginn derselben springt und\n"
+	"# von dort aus den nächsten ungelesenen Artikel sucht. (ON)\n"
 
-#: src/lang.c:1964
+#: src/lang.c:1959
 msgid	"Enter default mail address (and fullname). <CR> sets."
 msgstr	"Standard Mail-Adresse (und Name) eingeben. <CR> setzt."
 
-#: src/lang.c:1965
+#: src/lang.c:1960
 msgid	"Mail address (and fullname)        :"
 msgstr	"Mailadresse (und Name)             :"
 
-#: src/lang.c:1966
+#: src/lang.c:1961
 msgid	"# User's mail address (and fullname), if not username@host (fullname)\n"
 msgstr	"# EMail-Adresse und vollständiger Name des Benutzers, wenn sie nicht\n"
 	"# benutzername@host (Vollständiger Name) lautet\n"
 
-#: src/lang.c:1971
+#: src/lang.c:1966
 msgid	"Show empty Followup-To in editor   :"
 msgstr	"Leeres Fup'2 im Editor anzeigen    :"
 
-#: src/lang.c:1972
+#: src/lang.c:1967
 msgid	"# If ON show empty Followup-To header when editing an article\n"
 msgstr	"# Wenn ON, zeige leeren Followup-To:-Header im Editor\n"
 
-#: src/lang.c:1976
+#: src/lang.c:1971
 msgid	"Enter path/! command/--none to create your default signature. <CR> sets."
-msgstr	"Setze Pfad/! Kommando/--none um ihre Signatur festzulegen . <CR> setzt."
+msgstr	"Setze Pfad/! Kommando/--none um ihre Signatur festzulegen. <CR> setzt."
 
-#: src/lang.c:1977
+#: src/lang.c:1972
 msgid	"Create signature from path/command :"
 msgstr	"Erzeuge Signatur aus Pfad/Kommando :"
 
-#: src/lang.c:1978
+#: src/lang.c:1973
 msgid	"# Signature path (random sigs)/file to be used when posting/replying\n"
 	"# default_sigfile=file       appends file as signature\n"
 	"# default_sigfile=!command   executes external command to generate a "
@@ -5365,49 +5386,49 @@ msgstr	"# Pfad der Sig (Zufällige Sigs)/
 	"# default_sigfile=!Kommando führt Kommando aus um Sig zu erzeugen\n"
 	"# default_sigfile=--none    hängt keine Signatur an\n"
 
-#: src/lang.c:1985
+#: src/lang.c:1980
 msgid	"Prepend signature with \"-- \" on own line. <SPACE> toggles & <CR> sets."
 msgstr	"Trenne Sig mit \"-- \" in eigener Zeile ab. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1986
+#: src/lang.c:1981
 msgid	"Prepend signature with \"-- \"       :"
 msgstr	"Trenne Sig mit \"-- \" ab            :"
 
-#: src/lang.c:1987
+#: src/lang.c:1982
 msgid	"# If ON prepend the signature with dashes '\\n-- \\n'\n"
 msgstr	"# Falls ON trenne Signatur mit '\\n-- \\n' ab\n"
 
-#: src/lang.c:1991
+#: src/lang.c:1986
 msgid	"Add signature when reposting articles. <SPACE> toggles & <CR> sets."
 msgstr	"Sig. beim Reposten eines Artikels hinzufügen? <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:1992
+#: src/lang.c:1987
 msgid	"Add signature when reposting       :"
 msgstr	"Signatur beim Reposten anhängen    :"
 
-#: src/lang.c:1993
+#: src/lang.c:1988
 msgid	"# If ON add signature to reposted articles\n"
 msgstr	"# Falls ON wird die Signatur auch an repostete Artikel angehängt.\n"
 
-#: src/lang.c:1997
+#: src/lang.c:1992
 msgid	"Enter quotation marks, %s or %S for author's initials."
 msgstr	"Zitatzeichen eingeben, %s oder %S für die Initialen des Verfassers."
 
-#: src/lang.c:1998
+#: src/lang.c:1993
 msgid	"Characters used as quote-marks     :"
 msgstr	"Zitatzeichen                       :"
 
-#: src/lang.c:1999
+#: src/lang.c:1994
 msgid	"# Characters used in quoting to followups and replies.\n"
 	"# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n"
 msgstr	"# Zeichen für Zitate in Antworten.\n"
 	"# '_' wird durch ' ' ersetzt. %%s, %%S wird ersetzt durch Autoreninitialen.\n"
 
-#: src/lang.c:2005
+#: src/lang.c:2000
 msgid	"Quoting behavior                   :"
 msgstr	"Zitierverhalten                    :"
 
-#: src/lang.c:2006
+#: src/lang.c:2001
 msgid	"# How quoting should be handled when following up or replying.\n"
 	"# 0 = Nothing special\n"
 	"# 1 = Compress quotes\n"
@@ -5428,15 +5449,15 @@ msgstr	"# Spezielle Optionen beim Zitier
 	"# 7 = Zitatzeichen zusammenziehen & Signaturen zitieren & Leerzeilen "
 	"zitieren\n"
 
-#: src/lang.c:2018 src/lang.c:2026 src/lang.c:2032
+#: src/lang.c:2013 src/lang.c:2021 src/lang.c:2027
 msgid	"%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name"
 msgstr	"%A Adr %D Datum %F Adr+Name %G Gruppenname %M Message-ID %N Name %C Vorname"
 
-#: src/lang.c:2019
+#: src/lang.c:2014
 msgid	"Quote line when following up       :"
 msgstr	"Einleitungszeile beim Antworten    :"
 
-#: src/lang.c:2020
+#: src/lang.c:2015
 msgid	"# Format of quote line when mailing/posting/following-up an article\n"
 	"# %%A Address    %%D Date   %%F Addr+Name   %%G Groupname   %%M Message-ID\n"
 	"# %%N Full Name  %%C First Name   %%I Initials\n"
@@ -5444,35 +5465,35 @@ msgstr	"# Format der Einleitungszeile be
 	"# %%A Adresse  %%D Datum  %%F Adr+Name  %%G Gruppenname  %%M Message-ID\n"
 	"# %%N Voller Name  %%C Vorname  %%I Initialen\n"
 
-#: src/lang.c:2027
+#: src/lang.c:2022
 msgid	"Quote line when cross-posting      :"
 msgstr	"Einleitungszeile beim Crossposten  :"
 
-#: src/lang.c:2033
+#: src/lang.c:2028
 msgid	"Quote line when mailing            :"
 msgstr	"Einleitungszeile bei Mailantwort   :"
 
-#: src/lang.c:2038
+#: src/lang.c:2033
 msgid	"If ON, include User-Agent: header. <SPACE> toggles & <CR> sets."
 msgstr	"Falls ON, füge User-Agent:-Header ein. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:2039
+#: src/lang.c:2034
 msgid	"Insert 'User-Agent:'-header        :"
 msgstr	"Füge 'User-Agent:'-header ein      :"
 
-#: src/lang.c:2040
+#: src/lang.c:2035
 msgid	"# If ON include advertising User-Agent: header\n"
 msgstr	"# Falls ON füge 'User-Agent: header' ein\n"
 
-#: src/lang.c:2044
+#: src/lang.c:2039
 msgid	"Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), <CR> to set."
 msgstr	"Zeichensatz für MIME (z.B. US-ASCII, ISO-8859-1, EUC-KR), <CR> setzt."
 
-#: src/lang.c:2045
+#: src/lang.c:2040
 msgid	"MM_CHARSET                         :"
 msgstr	"MM_CHARSET                         :"
 
-#: src/lang.c:2046
+#: src/lang.c:2041
 msgid	"# Charset supported locally which is also used for MIME header and\n"
 	"# Content-Type header.\n"
 	"# If not set, the value of the environment variable MM_CHARSET is used.\n"
@@ -5489,27 +5510,27 @@ msgstr	"# Der lokale Zeichensatz, der au
 	"# definiert, werden andere Zeichensätze als mm_charset nicht dargestellt\n"
 	"# und die jeweiligen Zeichen durch ein '?' ersetzt.\n"
 
-#: src/lang.c:2057
+#: src/lang.c:2052
 msgid	"MM_NETWORK_CHARSET                 :"
 msgstr	"MM_NETWORK_CHARSET                 :"
 
-#: src/lang.c:2058
+#: src/lang.c:2053
 msgid	"# Charset used for MIME (Content-Type) header in postings.\n"
 msgstr	"# Zeichensatz für den MIME (Content-Type) Header der Artikel.\n"
 
-#: src/lang.c:2064
+#: src/lang.c:2059
 msgid	"Mailbox format                     :"
 msgstr	"Mailbox-Format                     :"
 
-#: src/lang.c:2065
+#: src/lang.c:2060
 msgid	"# Format of the mailbox.\n"
 msgstr	"# Format der Mailbox.\n"
 
-#: src/lang.c:2070
+#: src/lang.c:2065
 msgid	"MIME encoding in news messages     :"
 msgstr	"MIME-Kodierung in Newsartikeln     :"
 
-#: src/lang.c:2071
+#: src/lang.c:2066
 msgid	"# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n"
 	"# for mails and posts, if necessary. QP is efficient for most European\n"
 	"# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n"
@@ -5523,15 +5544,15 @@ msgstr	"# MIME-Kodierung (8bit, base64, 
 	"# die meisten 8Bit Zeichensätze aus Ostasien, Griechenland und Russland\n"
 	"# ist, da dort gehäuft 8Bit Zeichen vorkommen.\n"
 
-#: src/lang.c:2079 src/lang.c:2100
+#: src/lang.c:2074 src/lang.c:2095
 msgid	"Don't change unless you know what you are doing. <ESC> cancels."
 msgstr	"Nur ändern, wenn Sie genau wissen, was Sie machen. <ESC> bricht ab"
 
-#: src/lang.c:2080
+#: src/lang.c:2075
 msgid	"Use 8bit characters in news headers:"
 msgstr	"Benutze 8bit-Zeichen im Newsheader :"
 
-#: src/lang.c:2081
+#: src/lang.c:2076
 msgid	"# If ON, 8bit characters in news headers are NOT encoded.\n"
 	"# default is OFF. Thus 8bit characters are encoded by default.\n"
 	"# 8bit chars in header are encoded regardless of the value of this\n"
@@ -5543,27 +5564,27 @@ msgstr	"# Wenn ON werden 8-Bit-Zeichen (
 	"# kodiert, wenn post_mime_encoding nicht auch auf 8bit eingestellt\n"
 	"# ist.\n"
 
-#: src/lang.c:2088
+#: src/lang.c:2083
 msgid	"Auto-view post-processed files <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	"Nachbearbeitete Artikel autom. anz. <SPACE> wechselt, <CR> setzt, <ESC> Ende"
 
-#: src/lang.c:2089
+#: src/lang.c:2084
 msgid	"View post-processed files          :"
 msgstr	"Nachbearbeitete Artikel anzeigen   :"
 
-#: src/lang.c:2090
+#: src/lang.c:2085
 msgid	"# If set, post processed files will be opened in a viewer\n"
 msgstr	"# Wenn ON werden nachbearbeitete Artikel automatisch angezeigt.\n"
 
-#: src/lang.c:2095
+#: src/lang.c:2090
 msgid	"MIME encoding in mail messages     :"
 msgstr	"MIME-Kodierung für E-Mails         :"
 
-#: src/lang.c:2101
+#: src/lang.c:2096
 msgid	"Use 8bit characters in mail headers:"
 msgstr	"Benutze 8bit Zeichen im Mail Header:"
 
-#: src/lang.c:2102
+#: src/lang.c:2097
 msgid	"# If ON, 8bit characters in mail headers are NOT encoded.\n"
 	"# default is OFF. Thus 8bit characters are encoded by default.\n"
 	"# 8bit chars in headers are encoded regardless of the value of this "
@@ -5580,23 +5601,23 @@ msgstr	"# Wenn ON werden 8-Bit-Zeichen (
 	"# E-Mailheadern verbieten, daher sollte diese Einstellung NICHT auf ON\n"
 	"# geändert werden, wenn es keine zwingende Gründe dafür gibt.\n"
 
-#: src/lang.c:2112
+#: src/lang.c:2107
 msgid	"Strip blanks of end of lines       :"
 msgstr	"Leerzeichen am Zeilenende entfernen:"
 
-#: src/lang.c:2113
+#: src/lang.c:2108
 msgid	"# If ON strip blanks from end of lines to speedup display on slow terminals\n"
 msgstr	"# Falls ON lösche Leerzeichen am Zeilenende; verbessert die Geschwindigkeit\n"
 
-#: src/lang.c:2118
+#: src/lang.c:2113
 msgid	"If ON, use transliteration. <SPACE> toggles & <CR> sets."
 msgstr	"Wenn ON verwende Umschreibungen. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:2119
+#: src/lang.c:2114
 msgid	"Transliteration                    :"
 msgstr	"Verwende Umschreibungen            :"
 
-#: src/lang.c:2120
+#: src/lang.c:2115
 msgid	"# If ON, use //TRANSLIT extension. This means that when a character cannot\n"
 	"# be represented in the in the target character set, it can be approximated\n"
 	"# through one or several similarly looking characters.\n"
@@ -5606,242 +5627,242 @@ msgstr	"# Wenn ON verwende //TRANSLIT Er
 	"# Terminal als EUR umschrieben, ohne //TRANSLIT würde tin ein\n"
 	"# Fragezeichen verwenden.\n"
 
-#: src/lang.c:2127
+#: src/lang.c:2122
 msgid	"Send you a carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr	"Sendet ihnen automatisch eine Kopie. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:2128
+#: src/lang.c:2123
 msgid	"Send you a cc automatically        :"
 msgstr	"Sendet Ihnen ein Cc automatisch    :"
 
-#: src/lang.c:2129
+#: src/lang.c:2124
 msgid	"# If ON automatically put your name in the Cc: field when mailing an article\n"
 msgstr	"# Falls ON wird Ihr Name in das Cc: Feld beim Mailen des Artikels eingesetzt\n"
 
-#: src/lang.c:2133
+#: src/lang.c:2128
 msgid	"Send you a blind carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr	"Sendet ihnen automatisch eine blinde Kopie. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:2134
+#: src/lang.c:2129
 msgid	"Send you a blind cc automatically  :"
 msgstr	"Sendet Ihnen eine blinde cc autom. :"
 
-#: src/lang.c:2135
+#: src/lang.c:2130
 msgid	"# If ON automatically put your name in the Bcc: field when mailing an "
 	"article\n"
 msgstr	"# Falls ON wird Ihr Name in das Bcc: Feld beim Mailen des Artikels "
 	"eingesetzt\n"
 
-#: src/lang.c:2139
+#: src/lang.c:2134
 msgid	"Enter address elements about which you want to be warned. <CR> sets."
 msgstr	"Geben Sie den Adressenteil an, vor dem Sie gewarnt werden. <CR> setzt."
 
-#: src/lang.c:2140
+#: src/lang.c:2135
 msgid	"Spamtrap warning address parts     :"
 msgstr	"Spamfallenwarnung in Adresse       :"
 
-#: src/lang.c:2141
+#: src/lang.c:2136
 msgid	"# A comma-delimited list of address-parts you want to be warned\n"
 	"# about when trying to reply by email.\n"
 msgstr	"# Eine Komma-separierte Liste von Adressteilen, vor denen gewarnt wird, wenn\n"
 	"# Sie via Mail antworten wollen.\n"
 
-#: src/lang.c:2146
+#: src/lang.c:2141
 msgid	"Enter default number of days a filter entry will be valid. <CR> sets."
 msgstr	"Gültigkeit eines Filtereintrags in Tagen. <CR> setzt."
 
-#: src/lang.c:2147
+#: src/lang.c:2142
 msgid	"No. of days a filter entry is valid:"
 msgstr	"Tage, die ein Filter gültig ist    :"
 
-#: src/lang.c:2148
+#: src/lang.c:2143
 msgid	"# Number of days a short term filter will be active\n"
 msgstr	"# Anzahl der Tage die ein temporaerer Filter aktiv ist\n"
 
-#: src/lang.c:2152
+#: src/lang.c:2147
 msgid	"Add posted articles to filter. <SPACE> toggles & <CR> sets."
 msgstr	"Gepostete Artikel zum Filter hinzufügen. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:2153
+#: src/lang.c:2148
 msgid	"Add posted articles to filter      :"
 msgstr	"Füge gepostete Artikel zum Filter  :"
 
-#: src/lang.c:2154
+#: src/lang.c:2149
 msgid	"# If ON add posted articles which start a new thread to filter for\n"
 	"# highlighting follow-ups\n"
 msgstr	"# Falls ON füge gepostete Article die einen neunen Thread einleiten\n"
 	"# zum Filter hinzu um evtl. Antworten hervorzuheben\n"
 
-#: src/lang.c:2158
+#: src/lang.c:2153
 msgid	"The directory where articles/threads are to be saved in mailbox format."
 msgstr	"Verzeichnis, in dem Artikel/Threads im mailbox-Format gespeichert werden"
 
-#: src/lang.c:2159
+#: src/lang.c:2154
 msgid	"Mail directory                     :"
 msgstr	"Mail Verzeichnis                   :"
 
-#: src/lang.c:2160
+#: src/lang.c:2155
 msgid	"# (-m) directory where articles/threads are saved in mailbox format\n"
 msgstr	"# (-m) Verzeichnis für im mailbox-Format gespeicherte Artikel/Threads\n"
 
-#: src/lang.c:2165
+#: src/lang.c:2160
 msgid	"Save articles in batch mode (-S)   :"
 msgstr	"Speicher Artikel im Batchmode (-S) :"
 
-#: src/lang.c:2166
+#: src/lang.c:2161
 msgid	"# If ON articles/threads will be saved in batch mode when save -S\n"
 	"# or mail (-M/-N) is specified on the command line\n"
 msgstr	"# Falls ON werden Artikel/Threads im Batchmode gespeichert wenn save -S,\n"
 	"# oder gemailt, wenn -M bzw. -N in der Kommandozeile angegeben wurde\n"
 
-#: src/lang.c:2171
+#: src/lang.c:2166
 msgid	"The directory where you want articles/threads saved."
 msgstr	"Das Verzeichnis, in dem Artikel/Threads gespeichert werden sollen."
 
-#: src/lang.c:2172
+#: src/lang.c:2167
 msgid	"Directory to save arts/threads in  :"
 msgstr	"Verz. um Art/Threads zu speichern  :"
 
-#: src/lang.c:2173
+#: src/lang.c:2168
 msgid	"# Directory where articles/threads are saved\n"
 msgstr	"# Verzeichnis in dem Artikel/Threads gespeichert werden\n"
 
-#: src/lang.c:2177
+#: src/lang.c:2172
 msgid	"Auto save article/thread by Archive-name: header. <SPACE> toggles & <CR> sets."
 msgstr	"Autom. sp. von Art/Thread anhand Archive-name:-Header. <SPACE> wechselt & "
 	"<CR> setzt."
 
-#: src/lang.c:2178
+#: src/lang.c:2173
 msgid	"Use Archive-name: header for save  :"
 msgstr	"Nutze Archive-name: zum Speichern  :"
 
-#: src/lang.c:2179
+#: src/lang.c:2174
 msgid	"# If ON articles/threads with Archive-name: in mail header will\n"
 	"# be automatically saved with the Archive-name & part/patch no.\n"
 msgstr	"# Falls ON werden Artikel mit gesetztem Archive-name:-Header unter\n"
 	"# diesem abgespeichert\n"
 
-#: src/lang.c:2184
+#: src/lang.c:2179
 msgid	"Mark saved articles/threads as read. <SPACE> toggles, <CR> sets, <ESC> "
 	"cancels."
 msgstr	"Gesp. Art. gelesen markieren. <SPACE> wechselt, <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:2185
+#: src/lang.c:2180
 msgid	"Mark saved articles/threads as read:"
 msgstr	"Mark. gesp. Artikel/Threads gelesen:"
 
-#: src/lang.c:2186
+#: src/lang.c:2181
 msgid	"# If ON mark articles that are saved as read\n"
 msgstr	"# Falls ON werden gespeicherte Artikel als gelesen markiert\n"
 
-#: src/lang.c:2190
+#: src/lang.c:2185
 msgid	"Do post processing (eg. extract attachments) for saved articles."
 msgstr	"Bearbeite (z.B. unshar) gesp. Art/Threads. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:2191
+#: src/lang.c:2186
 msgid	"Post process saved articles        :"
 msgstr	"Nachbearbeiten gespeichert. Artikel:"
 
-#: src/lang.c:2192
+#: src/lang.c:2187
 msgid	"# Perform post processing (saving binary attachments) from saved articles.\n"
 	"# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n"
 msgstr	"# Nachbearbeiten gespeicherter Artikel\n"
 	"# 0=(nein) 1=(ja) 2=(nur Shell Archive (shar) auspacken)\n"
 
-#: src/lang.c:2198
+#: src/lang.c:2193
 msgid	"Process only unread articles       :"
 msgstr	"Bearbeite nur ungelesene Artikel   :"
 
-#: src/lang.c:2199
+#: src/lang.c:2194
 msgid	"# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n"
 msgstr	"# Falls ON speichere/drucke/pipe/maile nur ungelesene Artikel\n"
 	"# (markierte Artikel ausgenommen)\n"
 
-#: src/lang.c:2204
+#: src/lang.c:2199
 msgid	"Print all or just part of header. <SPACE> toggles & <CR> sets."
 msgstr	"Drucke alles oder nur Teile des Headers <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:2205
+#: src/lang.c:2200
 msgid	"Print all headers when printing    :"
 msgstr	"Alle Header beim Drucken ausgeben  :"
 
-#: src/lang.c:2206
+#: src/lang.c:2201
 msgid	"# If ON print all of article header otherwise just the important lines\n"
 msgstr	"# Falls ON drucke alle Header des Artikels aus. Ansonsten nur die "
 	"wichtigsten\n"
 
-#: src/lang.c:2210
+#: src/lang.c:2205
 msgid	"The printer program with options that is to be used to print articles/threads."
 msgstr	"Das Druckprogramm, das zum drucken von Artikeln/Threads benutzt wird."
 
-#: src/lang.c:2211
+#: src/lang.c:2206
 msgid	"Printer program with options       :"
 msgstr	"Druckprogramm mit Optionen         :"
 
-#: src/lang.c:2212
+#: src/lang.c:2207
 msgid	"# Print program with parameters used to print articles/threads\n"
 msgstr	"# Druckprogramm mit Optionen zum drucken der Artikel/Threads\n"
 
-#: src/lang.c:2218
+#: src/lang.c:2213
 msgid	"Force redraw after certain commands:"
 msgstr	"Anzeigeauffrischung nach Kommandos :"
 
-#: src/lang.c:2219
+#: src/lang.c:2214
 msgid	"# If ON a screen redraw will always be done after certain external commands\n"
 msgstr	"# Falls ON wird die Anzeige nach einigen externen Kommandos aufgefrischt\n"
 
-#: src/lang.c:2223
+#: src/lang.c:2218
 msgid	"Start editor with line offset. <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	"Starte Editor mit Einrückung. <SPACE> wechselt, <CR> setzt, <ESC> bricht ab."
 
-#: src/lang.c:2224
+#: src/lang.c:2219
 msgid	"Start editor with line offset      :"
 msgstr	"Starte Editor mit Einrückung       :"
 
-#: src/lang.c:2225
+#: src/lang.c:2220
 msgid	"# If ON editor will be started with cursor offset into the file\n"
 	"# otherwise the cursor will be positioned at the first line\n"
 msgstr	"# Falls ON wird der Cursor im Editor an die definierte Position gesetzt.\n"
 	"# Anderenfalls wird der Cursor in die erste Zeile gesetzt\n"
 
-#: src/lang.c:2230
+#: src/lang.c:2225
 msgid	"Enter %E for editor, %F for filename, %N for line-number, <CR> to set."
 msgstr	"%E für Editor, %F für Dateiname, %N für Zeilennummer, <CR> setzt."
 
-#: src/lang.c:2231
+#: src/lang.c:2226
 msgid	"Invocation of your editor          :"
 msgstr	"Aufruf ihres Editors               :"
 
-#: src/lang.c:2232
+#: src/lang.c:2227
 msgid	"# Format of editor line including parameters\n"
 	"# %%E Editor  %%F Filename  %%N Linenumber\n"
 msgstr	"# Format der Editorzeile mit den Parametern für den Aufruf\n"
 	"# %%E Editor  %%F Dateiname  %%N Zeilennummer\n"
 
-#: src/lang.c:2237
+#: src/lang.c:2232
 msgid	"Enter name and options for external-inews, --internal for internal inews"
 msgstr	"Name und Optionen für ext. inews, --internal für eingebaute Version"
 
-#: src/lang.c:2238
+#: src/lang.c:2233
 msgid	"External inews                     :"
 msgstr	"Externes inews-Programm            :"
 
-#: src/lang.c:2239
+#: src/lang.c:2234
 msgid	"# If --internal use the built in mini inews for posting via NNTP\n"
 	"# otherwise use an external inews program\n"
 msgstr	"# Falls --internal wird das eingebaute mini inews zum posten via NNTP\n"
 	"# benutzt, sonst wird das hier angegebene Programm mit den angebenen\n"
 	"# Optionen verwendet. z.B. 'inews -h'\n"
 
-#: src/lang.c:2243
+#: src/lang.c:2238
 msgid	"Enter %M for mailer, %S for subject, %T for to, %F for filename, <CR> to set."
 msgstr	"%M für den Mailer, %S für Subject, %T für to, %F für Dateinamen, <CR> setzt."
 
-#: src/lang.c:2244
+#: src/lang.c:2239
 msgid	"Invocation of your mail command    :"
 msgstr	"Aufruf ihres Mailkommandos         :"
 
-#: src/lang.c:2245
+#: src/lang.c:2240
 msgid	"# Format of mailer line including parameters\n"
 	"# %%M Mailer  %%S Subject  %%T To  %%F Filename  %%U User (AmigaDOS)\n"
 	"# ie. to use elm as your mailer:    elm -s \"%%S\" \"%%T\" < %%F\n"
@@ -5851,11 +5872,11 @@ msgstr	"# Format der Mailkommandozeile m
 	"# Ein Beispiel für elm           :  elm -s \"%%S\" \"%%T\" < %%F\n"
 	"# Ein Beispiel für elm interaktiv:  elm -i %%F -s \"%%S\" \"%%T\"\n"
 
-#: src/lang.c:2253
+#: src/lang.c:2248
 msgid	"Use interactive mail reader        :"
 msgstr	"Benutze interaktives Mailprogramm  :"
 
-#: src/lang.c:2254
+#: src/lang.c:2249
 msgid	"# Interactive mailreader: if ON mailreader will be invoked earlier for\n"
 	"# reply so you can use more of its features (eg. MIME, pgp, ...)\n"
 	"# this option has to suit default_mailer_format\n"
@@ -5864,344 +5885,344 @@ msgstr	"# Interaktives Mailprogramm: Fal
 	"# kann (z.B. MIME, pgp, ...).\n"
 	"# Diese Option muss zu default_mailer_format passen.\n"
 
-#: src/lang.c:2261
+#: src/lang.c:2256
 msgid	"Remove ~/.article after posting    :"
 msgstr	"Entferne ~/.article nach dem posten:"
 
-#: src/lang.c:2262
+#: src/lang.c:2257
 msgid	"# If ON remove ~/.article after posting.\n"
 msgstr	"# Falls ON entferne ~/.article nach dem posten.\n"
 
-#: src/lang.c:2266
+#: src/lang.c:2261
 msgid	"Filename for all posted articles, <CR> sets, no filename=do not save."
 msgstr	"Dateiname für Kopie geposteter Artikel. <CR> setzt, kein Name=keine Kopie."
 
-#: src/lang.c:2267
+#: src/lang.c:2262
 msgid	"Filename for posted articles       :"
 msgstr	"Gepostete Artikel speichern in     :"
 
-#: src/lang.c:2268
+#: src/lang.c:2263
 msgid	"# Filename where to keep all postings (default posted)\n"
 	"# If no filename is set then postings will not be saved\n"
 msgstr	"# Dateiname für die Kopie aller Postings (Voreinstellung posted)\n"
 	"# Ist kein Name angegeben wird keine Kopie gespeichert\n"
 
-#: src/lang.c:2273
+#: src/lang.c:2268
 msgid	"Keep all failed articles in ~/dead.articles. <SPACE> toggles & <CR> sets."
 msgstr	"Behalte alle Fehlschläge in ~/dead.articles. <SPACE> wechselt & <CR> setzt."
 
-#: src/lang.c:2274
+#: src/lang.c:2269
 msgid	"Keep failed arts in ~/dead.articles:"
 msgstr	"Halte Fehlschl. in ~/dead.articles :"
 
-#: src/lang.c:2275
+#: src/lang.c:2270
 msgid	"# If ON keep all failed postings in ~/dead.articles\n"
 msgstr	"# Falls ON werden Fehlgeschlagene Artikel in ~/dead.articles verwahrt\n"
 
-#: src/lang.c:2279
+#: src/lang.c:2274
 msgid	"Do you want to strip unsubscribed groups from .newsrc"
 msgstr	"Wollen Sie nicht-abonnierte Gruppen aus der .newsrc entfernen?"
 
-#: src/lang.c:2280
+#: src/lang.c:2275
 msgid	"No unsubscribed groups in newsrc   :"
 msgstr	"Nur abonnierte Gruppen in newsrc   :"
 
-#: src/lang.c:2281
+#: src/lang.c:2276
 msgid	"# If ON strip unsubscribed groups from newsrc\n"
 msgstr	"# Falls ON entferne nicht-abonnierte Gruppen aus der newsrc\n"
 
-#: src/lang.c:2286
+#: src/lang.c:2281
 msgid	"Remove bogus groups from newsrc    :"
 msgstr	"Lösche nicht vorhande G. aus newsrc:"
 
-#: src/lang.c:2287
+#: src/lang.c:2282
 msgid	"# What to do with bogus groups in newsrc file\n"
 	"# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n"
 msgstr	"# Was soll mit nicht mehr vorhanden Gruppen in der newsrc-Datei passieren?\n"
 	"# 0=(Behalten) 1=(entfernen) 2=(Mit D in der Auswahl markieren).\n"
 
-#: src/lang.c:2291
+#: src/lang.c:2286
 msgid	"Enter number of seconds until active file will be reread. <CR> sets."
 msgstr	"Sekunden, nach denen die active-Datei wieder gelesen wird. <CR> setzt."
 
-#: src/lang.c:2292
+#: src/lang.c:2287
 msgid	"Interval in secs to reread active  :"
 msgstr	"Active alle ... Sekunden neu lesen :"
 
-#: src/lang.c:2293
+#: src/lang.c:2288
 msgid	"# Time interval in seconds between rereading the active file (0=never)\n"
 msgstr	"# Zeitintervall in Sekunden zwischen dem Wiedereinlesen des active (0=nie)\n"
 
-#: src/lang.c:2298
+#: src/lang.c:2293
 msgid	"Reconnect to server automatically  :"
 msgstr	"Autom. Wiederverbindung zum Server :"
 
-#: src/lang.c:2299
+#: src/lang.c:2294
 msgid	"# If ON automatically reconnect to NNTP server if the connection is broken\n"
 msgstr	"# Falls ON wird eine unterbrochene Verbindung zum NNTP Server\n"
 	"# automatisch reaktiviert\n"
 
-#: src/lang.c:2303
+#: src/lang.c:2298
 msgid	"Create local copies of NNTP overview files. <SPACE> toggles & <CR> sets."
 msgstr	"Erzeuge lokale Kopien der NNTP Overview Dateien. <SPACE> wechselt & <CR> "
 	"setzt."
 
-#: src/lang.c:2304
+#: src/lang.c:2299
 msgid	"Cache NNTP overview files locally  :"
 msgstr	"Speichere NNTP Overview Daten lokal:"
 
-#: src/lang.c:2305
+#: src/lang.c:2300
 msgid	"# If ON, create local copies of NNTP overview files.\n"
 msgstr	"# Falls ON, erzeuge lokale Kopien der NNTP Overview Dateien.\n"
 
-#: src/main.c:627
+#: src/main.c:619
 #, c-format
 msgid	"Version: %s release %s (\"%s\") %s %s"
 msgstr	"Version: %s Ausgabe %s (\"%s\") %s %s"
 
-#: src/main.c:630
+#: src/main.c:622
 #, c-format
 msgid	"Version: %s release %s (\"%s\")"
 msgstr	"Version: %s Ausgabe %s (\"%s\")"
 
-#: src/nntplib.c:795
+#: src/nntplib.c:804
 #, c-format
 msgid	"\n"
 	"Server timed out, trying reconnect # %d\n"
 msgstr	"\n"
 	"Server reagierte nicht, Wiederholung Nummer # %d\n"
 
-#: src/nntplib.c:813
+#: src/nntplib.c:822
 msgid	"Rejoin current group\n"
 msgstr	"Betrete aktuelle Gruppe neu\n"
 
-#: src/nntplib.c:820
+#: src/nntplib.c:829
 #, c-format
 msgid	"Read (%s)\n"
 msgstr	"Lese (%s)\n"
 
-#: src/nntplib.c:822
+#: src/nntplib.c:831
 #, c-format
 msgid	"Resend last command (%s)\n"
 msgstr	"Sende letztes Kommando (%s) neu\n"
 
-#: src/nntplib.c:942
+#: src/nntplib.c:951
 msgid	"100  Help text on way"
 msgstr	"100  Hilfetext ist auf dem Weg"
 
-#: src/nntplib.c:946
+#: src/nntplib.c:955
 msgid	"180  Authorization capabilities"
 msgstr	"180  Anmeldeeigenschaft"
 
-#: src/nntplib.c:950
+#: src/nntplib.c:959
 msgid	"199  Debug output"
 msgstr	"199  Debug-Ausgabe"
 
-#: src/nntplib.c:954
+#: src/nntplib.c:963
 msgid	"200  Hello; you can post"
 msgstr	"200  Hallo; Sie dürfen Posten"
 
-#: src/nntplib.c:958
+#: src/nntplib.c:967
 msgid	"201  Hello; you can't post"
 msgstr	"201  Hallo; Sie dürfen nicht Posten"
 
-#: src/nntplib.c:962
+#: src/nntplib.c:971
 msgid	"202  Slave status noted"
 msgstr	"202  Empfängerstatus notiert"
 
-#: src/nntplib.c:970
+#: src/nntplib.c:979
 msgid	"211  Group selected"
 msgstr	"211  Gruppe ausgewählt"
 
-#: src/nntplib.c:975
+#: src/nntplib.c:984
 msgid	"215  Newsgroups follow"
 msgstr	"215  Newsgruppen folgen"
 
-#: src/nntplib.c:980
+#: src/nntplib.c:989
 msgid	"218  Group index file follows"
 msgstr	"218  Gruppenindexdatei folgt"
 
-#: src/nntplib.c:985
+#: src/nntplib.c:994
 msgid	"220  Article (head & body) follows"
 msgstr	"220  Artikel (Header und Body) folgt"
 
-#: src/nntplib.c:989
+#: src/nntplib.c:998
 msgid	"221  Head follows"
 msgstr	"221  Header folgt"
 
-#: src/nntplib.c:993
+#: src/nntplib.c:1002
 msgid	"222  Body follows"
 msgstr	"222  Body folgt"
 
-#: src/nntplib.c:997
+#: src/nntplib.c:1006
 msgid	"223  No text sent -- stat, next, last"
 msgstr	"223  Kein Text gesendet -- status, nächster, letzter"
 
-#: src/nntplib.c:1001
+#: src/nntplib.c:1010
 msgid	"230  New articles by message-id follow"
 msgstr	"230  Neue Artikel mit Message-ID folgen"
 
-#: src/nntplib.c:1005
+#: src/nntplib.c:1014
 msgid	"231  New newsgroups follow"
 msgstr	"231  Neue Newsgruppen folgen"
 
-#: src/nntplib.c:1009
+#: src/nntplib.c:1018
 msgid	"235  Article transferred successfully"
 msgstr	"235  Artikel erfolgreich übertragen"
 
-#: src/nntplib.c:1013
+#: src/nntplib.c:1022
 msgid	"240  Article posted successfully"
 msgstr	"240  Artikel erfolgreich gepostet"
 
-#: src/nntplib.c:1017
+#: src/nntplib.c:1026
 msgid	"280  Authorization system ok"
 msgstr	"280  Anmeldeart OK"
 
-#: src/nntplib.c:1021
+#: src/nntplib.c:1030
 msgid	"281  Authorization (user/pass) ok"
 msgstr	"281  Anmeldung (Benutzer/Passwort) OK"
 
-#: src/nntplib.c:1025
+#: src/nntplib.c:1034
 msgid	"282  binary data follows"
 msgstr	"282  Binär-Daten folgen"
 
-#: src/nntplib.c:1029
+#: src/nntplib.c:1038
 msgid	"283  spooldir list follows"
 msgstr	"283  Spool-Verzeichnisliste folgt"
 
-#: src/nntplib.c:1033
+#: src/nntplib.c:1042
 msgid	"284  Switching to a different spooldir"
 msgstr	"284  Schalte auf ein anderes Spool-Verzeichnis um"
 
-#: src/nntplib.c:1037
+#: src/nntplib.c:1046
 msgid	"285  Still using same spooldir"
 msgstr	"285  Benutze immer noch das selbe Spool-Verzeichnis"
 
-#: src/nntplib.c:1041
+#: src/nntplib.c:1050
 msgid	"286  Current spooldir"
 msgstr	"286  Aktuelles Spool-Verzeichnis"
 
-#: src/nntplib.c:1045
+#: src/nntplib.c:1054
 msgid	"287  Available spooldir"
 msgstr	"287  Verfügbare Spool-Verzeichnisse"
 
-#: src/nntplib.c:1049
+#: src/nntplib.c:1058
 msgid	"288  Unavailable spooldir or invalid entry"
 msgstr	"288  Nicht verfügbares Spool-Verzeichnis oder ungültiger Eintrag"
 
-#: src/nntplib.c:1053
+#: src/nntplib.c:1062
 msgid	"335  Continue to send article"
 msgstr	"335  Fahren Sie mit dem Senden des Artikels fort"
 
-#: src/nntplib.c:1057
+#: src/nntplib.c:1066
 msgid	"340  Continue to post article"
 msgstr	"340  Fahren sie mit dem Posten des Artikels fort"
 
-#: src/nntplib.c:1061
+#: src/nntplib.c:1070
 msgid	"380  authorization is required"
 msgstr	"380  Anmeldung ist notwendig"
 
-#: src/nntplib.c:1065
+#: src/nntplib.c:1074
 msgid	"381  <type> authorization data required"
 msgstr	"381  <Typ> Anmeldedaten notwendig"
 
-#: src/nntplib.c:1069
+#: src/nntplib.c:1078
 msgid	"400  Have to hang up for some reason"
 msgstr	"400  Muss aus irgendeinem Grund die Verbindung trennen"
 
-#: src/nntplib.c:1073
+#: src/nntplib.c:1082
 msgid	"411  No such newsgroup"
 msgstr	"411  Ungültige Newsgruppe"
 
-#: src/nntplib.c:1077
+#: src/nntplib.c:1086
 msgid	"412  Not currently in newsgroup"
 msgstr	"412  Im Augenblick in keiner Newsgruppe"
 
-#: src/nntplib.c:1081
+#: src/nntplib.c:1090
 msgid	"418  No index file for this group"
 msgstr	"418  Keine Index-Datei für diese Newsgruppe"
 
-#: src/nntplib.c:1085
+#: src/nntplib.c:1094
 msgid	"420  No current article selected"
 msgstr	"420  Kein aktueller Artikel ausgewählt"
 
-#: src/nntplib.c:1089
+#: src/nntplib.c:1098
 msgid	"421  No next article in this group"
 msgstr	"421  Kein nächster Artikel in dieser Gruppe"
 
-#: src/nntplib.c:1093
+#: src/nntplib.c:1102
 msgid	"422  No previous article in this group"
 msgstr	"422  Kein vorheriger Artikel in dieser Gruppe"
 
-#: src/nntplib.c:1097
+#: src/nntplib.c:1106
 msgid	"423  No such article in this group"
 msgstr	"423  Ungültiger Artikel in dieser Gruppe"
 
-#: src/nntplib.c:1101
+#: src/nntplib.c:1110
 msgid	"430  No such article at all"
 msgstr	"430  Allgemein ungültiger Artikel"
 
-#: src/nntplib.c:1105
+#: src/nntplib.c:1114
 msgid	"435  Already got that article, don't send"
 msgstr	"435  Habe den Artikel schon, nicht senden"
 
-#: src/nntplib.c:1109
+#: src/nntplib.c:1118
 msgid	"436  Transfer failed"
 msgstr	"436  Transfer fehlgeschlagen"
 
-#: src/nntplib.c:1113
+#: src/nntplib.c:1122
 msgid	"437  Article rejected, don't resend"
 msgstr	"437  Artikel abgelehnt, nicht neu senden"
 
-#: src/nntplib.c:1117
+#: src/nntplib.c:1126
 msgid	"440  Posting not allowed"
 msgstr	"440  Posten nicht erlaubt"
 
-#: src/nntplib.c:1121
+#: src/nntplib.c:1130
 msgid	"441  Posting failed"
 msgstr	"441  Posten fehlgeschlagen"
 
-#: src/nntplib.c:1125
+#: src/nntplib.c:1134
 msgid	"480  authorization required for command"
 msgstr	"480  Anmeldung für dieses Kommando notwendig"
 
-#: src/nntplib.c:1129
+#: src/nntplib.c:1138
 msgid	"481  Authorization system invalid"
 msgstr	"481  Anmeldeart ungültig"
 
-#: src/nntplib.c:1133
+#: src/nntplib.c:1142
 msgid	"482  Authorization data rejected"
 msgstr	"482  Anmeldedaten abgelehnt"
 
-#: src/nntplib.c:1137
+#: src/nntplib.c:1146
 msgid	"483  Invalid alias on spooldir cmd"
 msgstr	"483  Ungültiger Alias im Kommando für das Spoolverzeichnis"
 
-#: src/nntplib.c:1141
+#: src/nntplib.c:1150
 msgid	"484  No spooldir file found"
 msgstr	"484  Kein Spool-Verzeichnis gefunden"
 
-#: src/nntplib.c:1145
+#: src/nntplib.c:1154
 msgid	"500  Command not recognized"
 msgstr	"500  Kommando nicht erkannt"
 
-#: src/nntplib.c:1149
+#: src/nntplib.c:1158
 msgid	"501  Command syntax error"
 msgstr	"501  Kommandosyntaxfehler"
 
-#: src/nntplib.c:1153
+#: src/nntplib.c:1162
 msgid	"502  Access to server denied"
 msgstr	"502  Zugriff auf Server verboten"
 
-#: src/nntplib.c:1158
+#: src/nntplib.c:1167
 msgid	"503  Program fault, command not performed"
 msgstr	"503  Programmfehler, Kommando nicht ausgeführt"
 
-#: src/nntplib.c:1162
+#: src/nntplib.c:1171
 msgid	"580  Authorization Failed"
 msgstr	"580  Anmeldung fehlgeschlagen"
 
-#: src/nntplib.c:1166
+#: src/nntplib.c:1175
 msgid	"Unknown NNTP response code"
 msgstr	"Unbekannter NNTP-Antwort-Code"
 
@@ -6210,22 +6231,22 @@ msgstr	"Unbekannter NNTP-Antwort-Code"
 msgid	"couldn't expand %s\n"
 msgstr	"Kann %s nicht expandieren\n"
 
-#: src/open.c:1103
+#: src/open.c:1040
 msgid	"Unreachable?\n"
 msgstr	"Unerreichbar?\n"
 
-#: src/post.c:1712
+#: src/post.c:1749
 #, c-format
 msgid	"%s is bogus"
 msgstr	"%s ist ungültig"
 
-#: src/post.c:1903
+#: src/post.c:1940
 #, c-format
 msgid	"Posting: %.*s ..."
 msgstr	"Poste: %.*s ..."
 
 #. TODO: -> lang.c
-#: src/post.c:4012
+#: src/post.c:4037
 #, c-format
 msgid	"Rereading %s..."
 msgstr	"Lese %s..."
@@ -6280,7 +6301,6 @@ msgstr	"Kann slrnface nicht starten: Umg
 msgid	"Can't run slrnface: failed to create %s"
 msgstr	"Kann slrnface nicht starten: Anlegen von %s fehlgeschagen"
 
-# TRANSLATION MISSING
 #: src/xface.c:109
 msgid	"This directory is used to create named pipes for communication between\n"
 	"slrnface and its parent process. It should normally be empty because\n"
@@ -6292,20 +6312,35 @@ msgid	"This directory is used to create 
 	"However, if the directory is mounted from an NFS server, you might see\n"
 	"special files created by your NFS server while slrnface is running.\n"
 	"Do not try to remove them.\n"
-msgstr	""
+msgstr	"Diese Verzeichnis enthält \"named pipes\" zur Kommunikation zwischen\n"
+	"slrnface und dem aufrufenden Prozess. Normalerweise sollte es leer sein,\n"
+	"da diese Dateien nach erfolgreicher Kommunikation sofort gelöscht werden.\n"
+	"\n"
+	"slrnface verwendet Dateinamen der Form hostname.pid, sollten derartige\n"
+	"Dateien länger als wenige Sekundenbruchteile erscheinen, handelt es sich\n"
+	"vermutlich um einen Fehler.\n"
+	"\n"
+	"Wenn dieses Verzeichnis auf einem NFS-Laufwerk liegt, ist es möglich,\n"
+	"dass der NFS-Server spezielle Dateien in diesem Verzeichnis erzeugt,\n"
+	"während slrnface ausgeführt wird. Diese sollten nicht gelöscht werden.\n"
 
 # TRANSLATION MISSING
 #: src/xface.c:123
 msgid	"Can't run slrnface: couldn't construct fifo name."
 msgstr	""
 
-#: src/xface.c:151
+#: src/xface.c:162
 #, c-format
 msgid	"Slrnface abnormally exited, code %d."
-msgstr	""
+msgstr	"Slrnface wurde mit Fehler %d beendet."
 
-# TRANSLATION MISSING
-#: src/xface.c:195
+#: src/xface.c:206
 #, c-format
 msgid	"Slrnface failed: %s."
-msgstr	""
+msgstr	"Fehler %s beim Aufruf von Slrnface."
+
+#~ msgid	"%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: "
+#~ msgstr	"%s=Ende, %s=bearbeiten, %s=ispell, %s=posten, %s=Zurückl. [%%.*s]: "
+
+#~ msgid	"%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: "
+#~ msgstr	"%s=Ende, %s=bearbeiten, %s=posten, %s=zurücklegen [%%.*s]: "
Binary files tin-1.5.18/po/en_GB.gmo and tin-1.6.0/po/en_GB.gmo differ
diff -Nurp tin-1.5.18/po/en_GB.po tin-1.6.0/po/en_GB.po
--- tin-1.5.18/po/en_GB.po	Mon Jun  2 14:54:28 2003
+++ tin-1.6.0/po/en_GB.po	Mon Jul 14 17:48:17 2003
@@ -3,7 +3,7 @@
 #
 msgid	""
 msgstr	"Project-Id-Version: tin 1.5.17\n"
-	"POT-Creation-Date: 2003-06-02 14:53+0200\n"
+	"POT-Creation-Date: 2003-07-14 17:23+0200\n"
 	"PO-Revision-Date: 2002-11-15 20:10+0000\n"
 	"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 	"Language-Team: \n"
@@ -223,591 +223,562 @@ msgstr	""
 msgid	"1 Response%s"
 msgstr	""
 
-#: src/lang.c:45
+#: src/lang.c:46
 #, c-format
 msgid	"\n"
 	"%s contains no newsgroups. Exiting."
 msgstr	""
 
-#: src/lang.c:46
-#, c-format
-msgid	"File %s exists. %s=append, %s=overwrite, %s=quit: "
-msgstr	""
-
 #: src/lang.c:47
 msgid	"all "
 msgstr	""
 
 #: src/lang.c:48
-msgid	"Article cancelled (deleted)."
+msgid	"All groups"
 msgstr	""
 
 #: src/lang.c:49
-msgid	"Article cannot be cancelled (deleted)."
+#, c-format
+msgid	"File %s exists. %s=append, %s=overwrite, %s=quit: "
 msgstr	""
 
 #: src/lang.c:50
-#, c-format
-msgid	"\n"
-	"Your article:\n"
-	"  \"%s\"\n"
-	"will be posted to the following %s:\n"
+msgid	"Article cancelled (deleted)."
 msgstr	""
 
 #: src/lang.c:51
-msgid	"Article not posted!"
+msgid	"Article cannot be cancelled (deleted)."
 msgstr	""
 
 #: src/lang.c:52
-msgid	"Article not saved"
+msgid	"Article deleted."
 msgstr	""
 
 #: src/lang.c:53
-msgid	"Article Level Commands"
+#, c-format
+msgid	"\n"
+	"Your article:\n"
+	"  \"%s\"\n"
+	"will be posted to the following %s:\n"
 msgstr	""
 
 #: src/lang.c:54
-#, c-format
-msgid	"Article posted: %s"
+msgid	"Article not posted!"
 msgstr	""
 
 #: src/lang.c:55
-#, c-format
-msgid	"Article rejected (saved to %s)"
+msgid	"Article not saved"
 msgstr	""
 
 #: src/lang.c:56
-#, c-format
-msgid	"%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: "
+msgid	"Article Level Commands"
 msgstr	""
 
 #: src/lang.c:57
-msgid	"Article unavailable"
+msgid	"Article has no parent"
 msgstr	""
 
 #: src/lang.c:58
-msgid	"Article has no parent"
+msgid	"Parent article has been killed"
 msgstr	""
 
 #: src/lang.c:59
-msgid	"Parent article has been killed"
+msgid	"Parent article is unavailable"
 msgstr	""
 
 #: src/lang.c:60
-msgid	"Parent article is unavailable"
+#, c-format
+msgid	"Article posted: %s"
+msgstr	""
+
+#: src/lang.c:61
+#, c-format
+msgid	"Article rejected (saved to %s)"
 msgstr	""
 
 #: src/lang.c:62
-msgid	"articles"
+#, c-format
+msgid	"%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: "
 msgstr	""
 
 #: src/lang.c:63
-msgid	"This is a repost of the following article:"
+msgid	"Article unavailable"
 msgstr	""
 
 #: src/lang.c:64
-msgid	"article"
+msgid	"Article undeleted."
 msgstr	""
 
-#: src/lang.c:65
-msgid	"Article"
+#: src/lang.c:66
+msgid	"articles"
 msgstr	""
 
-#: src/lang.c:66
-#, c-format
-msgid	"-- %d %s mailed --"
+#: src/lang.c:67
+msgid	"This is a repost of the following article:"
 msgstr	""
 
 #: src/lang.c:68
-#, c-format
-msgid	"%d %s printed"
+msgid	"article"
+msgstr	""
+
+#: src/lang.c:69
+msgid	"Article"
 msgstr	""
 
 #: src/lang.c:70
 #, c-format
-msgid	"%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n"
+msgid	"-- %d %s mailed --"
 msgstr	""
 
 #: src/lang.c:71
-msgid	", charset: "
+#, c-format
+msgid	" at %s"
 msgstr	""
 
 #: src/lang.c:72
 #, c-format
-msgid	"%*s[-- Description: %s --]\n"
+msgid	"%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n"
 msgstr	""
 
 #: src/lang.c:73
-#, c-format
-msgid	"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
-	"\n"
+msgid	", charset: "
 msgstr	""
 
 #: src/lang.c:74
 #, c-format
-msgid	"%d Authentication failed"
+msgid	"%*s[-- Description: %s --]\n"
 msgstr	""
 
 #: src/lang.c:75
-msgid	"Server expects authentication.\n"
+#, c-format
+msgid	"%d Authentication failed"
 msgstr	""
 
 #: src/lang.c:76
-msgid	"    Please enter password: "
+msgid	"Server expects authentication.\n"
 msgstr	""
 
 #: src/lang.c:77
-msgid	"    Please enter username: "
+msgid	"    Please enter password: "
 msgstr	""
 
 #: src/lang.c:78
+msgid	"    Please enter username: "
+msgstr	""
+
+#: src/lang.c:79
 #, c-format
 msgid	"Author search backwards [%s]> "
 msgstr	""
 
-#: src/lang.c:79
+#: src/lang.c:80
 #, c-format
 msgid	"Author search forwards [%s]> "
 msgstr	""
 
-#: src/lang.c:80
+#: src/lang.c:81
 #, c-format
 msgid	"Authorized for user: %s\n"
 msgstr	"Authorised for user: %s\n"
 
-#: src/lang.c:81
+#: src/lang.c:82
 #, c-format
 msgid	"Authorization failed for user: %s\n"
 msgstr	"Authorisation failed for user: %s\n"
 
-#: src/lang.c:82
+#: src/lang.c:83
 #, c-format
 msgid	"\n"
 	"Autosubscribed to %s"
 msgstr	""
 
-#: src/lang.c:83
+#: src/lang.c:84
 msgid	"Autosubscribing groups...\n"
 msgstr	""
 
-#: src/lang.c:84
+#: src/lang.c:85
 #, c-format
 msgid	"Autoselecting articles (use '%s' to see all unread) ..."
 msgstr	""
 
-#: src/lang.c:85
+#: src/lang.c:87
 #, c-format
 msgid	"Active file corrupt - %s"
 msgstr	""
 
-#: src/lang.c:86
+#: src/lang.c:88
 #, c-format
 msgid	"Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: "
 msgstr	""
 
-#: src/lang.c:87
+#: src/lang.c:89
 #, c-format
 msgid	"Unrecognized attribute: %s"
 msgstr	"Unrecognised attribute: %s"
 
-#: src/lang.c:88
+#: src/lang.c:90
 #, c-format
 msgid	"Bad command. Type '%s' for help."
 msgstr	""
 
-#: src/lang.c:90
+#: src/lang.c:92
 msgid	"Base article"
 msgstr	""
 
-#: src/lang.c:91
+#: src/lang.c:93
 msgid	"Base article range"
 msgstr	""
 
-#: src/lang.c:92
+#: src/lang.c:94
 #, c-format
 msgid	"%s: Updating of index files not supported\n"
 msgstr	""
 
-#: src/lang.c:93
+#: src/lang.c:95
 msgid	"*** Beginning of article ***"
 msgstr	""
 
-#: src/lang.c:94
+#: src/lang.c:97
 msgid	"Cancel (delete) or supersede (overwrite) article [%%.*s]? (%s/%s/%s): "
 msgstr	""
 
-#: src/lang.c:95
+#: src/lang.c:98
 msgid	"Cancelling article..."
 msgstr	""
 
-#: src/lang.c:97
+#: src/lang.c:100
 #, c-format
 msgid	"Cannot create %s"
 msgstr	""
 
-#: src/lang.c:98
-#, c-format
-msgid	"Can't find base article %d"
-msgstr	""
-
-#: src/lang.c:99
-msgid	"Cannot find NNTP server name"
-msgstr	""
-
 #: src/lang.c:101
 #, c-format
-msgid	"%s: Can't get entry for TERM\n"
+msgid	"Can't find base article %d"
 msgstr	""
 
-#: src/lang.c:103
+#: src/lang.c:102
 #, c-format
 msgid	"Can't open %s"
 msgstr	""
 
-#: src/lang.c:105
-#, c-format
-msgid	"Can't open %s. Try %s -r to read news via NNTP.\n"
-msgstr	""
-
-#: src/lang.c:107
+#: src/lang.c:103
 #, c-format
 msgid	"Couldn't open %s for saving"
 msgstr	""
 
-#: src/lang.c:108
+#: src/lang.c:104
 msgid	"*** Posting not allowed ***"
 msgstr	""
 
-#: src/lang.c:109
+#: src/lang.c:105
 #, c-format
 msgid	"Posting is not allowed to %s"
 msgstr	""
 
-#: src/lang.c:110
+#: src/lang.c:106
 #, c-format
 msgid	"Can't retrieve %s"
 msgstr	""
 
-#: src/lang.c:111
-#, c-format
-msgid	"Can't write index %s"
-msgstr	""
-
-#: src/lang.c:112
+#: src/lang.c:107
 #, c-format
 msgid	"%s is a directory"
 msgstr	""
 
-#: src/lang.c:113
+#: src/lang.c:108
 msgid	"Catchup"
 msgstr	""
 
-#: src/lang.c:114
+#: src/lang.c:109
 #, c-format
 msgid	"Catchup %s..."
 msgstr	""
 
-#: src/lang.c:115
+#: src/lang.c:110
 msgid	"Catchup all groups entered during this session?"
 msgstr	""
 
-#: src/lang.c:116
+#: src/lang.c:111
 msgid	"You have tagged articles in this group - catchup anyway?"
 msgstr	""
 
-#: src/lang.c:117
+#: src/lang.c:112
 #, c-format
 msgid	"%s %d %s in %lu seconds\n"
 msgstr	""
 
-#: src/lang.c:118
+#: src/lang.c:113
 msgid	"Caughtup"
 msgstr	""
 
-#: src/lang.c:119
+#: src/lang.c:114
 msgid	"Check Prepared Article"
 msgstr	""
 
-#: src/lang.c:120
+#: src/lang.c:115
 msgid	"Checking for new groups... "
 msgstr	""
 
-#: src/lang.c:121
+#: src/lang.c:116
 msgid	"Checking for news..."
 msgstr	""
 
-#: src/lang.c:123
-#, c-format
-msgid	"\tChecksum of %s (%ld %s)"
-msgstr	""
-
-#: src/lang.c:125
+#: src/lang.c:117
 #, c-format
 msgid	"Post-process %s=no, %s=yes, %s=shar, %s=quit: "
 msgstr	""
 
-#: src/lang.c:126
+#: src/lang.c:118
 msgid	"ANSI color disabled"
 msgstr	"ANSI colour disabled"
 
-#: src/lang.c:127
+#: src/lang.c:119
 msgid	"ANSI color enabled"
 msgstr	"ANSI colour enabled"
 
-#: src/lang.c:128
+#: src/lang.c:120
 #, c-format
 msgid	"Command failed: %s"
 msgstr	""
 
-#: src/lang.c:129
+#: src/lang.c:121
 msgid	"Mark not selected articles read?"
 msgstr	""
 
-#: src/lang.c:130
+#: src/lang.c:122
 #, c-format
 msgid	"Connecting to %s..."
 msgstr	""
 
-#: src/lang.c:131
-#, c-format
-msgid	"Connecting to %s:%d..."
-msgstr	""
-
-#: src/lang.c:132
-#, c-format
-msgid	"\n"
-	"Connection to %s: "
-msgstr	""
-
-#: src/lang.c:146
+#: src/lang.c:123
 msgid	"<CR>"
 msgstr	""
 
-#: src/lang.c:147
+#: src/lang.c:124
 msgid	"Creating active file for saved groups...\n"
 msgstr	""
 
-#: src/lang.c:148
+#: src/lang.c:125
 msgid	"Creating newsrc file...\n"
 msgstr	""
 
-#: src/lang.c:149
-msgid	"Delete saved files that have been post processed?"
+#: src/lang.c:127 src/lang.c:1129
+msgid	"Default"
 msgstr	""
 
-#: src/lang.c:150
-msgid	"Deleting temporary files..."
+#: src/lang.c:128
+msgid	"Delete saved files that have been post processed?"
 msgstr	""
 
-#: src/lang.c:151
-msgid	"Disconnecting from server...\n"
+#: src/lang.c:129
+msgid	"Deleting temporary files..."
 msgstr	""
 
-#: src/lang.c:152
+#: src/lang.c:131
 msgid	"*** End of article ***"
 msgstr	""
 
-#: src/lang.c:153
+#: src/lang.c:132
 msgid	"*** End of articles ***"
 msgstr	""
 
-#: src/lang.c:154
+#: src/lang.c:133
 msgid	"*** End of groups ***"
 msgstr	""
 
-#: src/lang.c:155
+#: src/lang.c:134
 msgid	"*** End of thread ***"
 msgstr	""
 
-#: src/lang.c:156
+#: src/lang.c:135
 msgid	"Enter limit of articles to get> "
 msgstr	""
 
-#: src/lang.c:157
+#: src/lang.c:136
 msgid	"Enter Message-ID to go to> "
 msgstr	""
 
-#: src/lang.c:158
+#: src/lang.c:137
 msgid	" and enter next unread thread"
 msgstr	""
 
-#: src/lang.c:159
+#: src/lang.c:138
 msgid	" and enter next unread group"
 msgstr	""
 
-#: src/lang.c:160
+#: src/lang.c:139
 msgid	"Enter option number> "
 msgstr	""
 
-#: src/lang.c:161
+#: src/lang.c:140
 #, c-format
 msgid	"Enter range [%s]> "
 msgstr	""
 
-#: src/lang.c:162
+#: src/lang.c:141
 msgid	"\n"
 	"Warning: Approved: header used.\n"
 msgstr	""
 
-#: src/lang.c:164
+#: src/lang.c:143
 msgid	"\n"
 	"Error: Bad address in Approved: header.\n"
 msgstr	""
 
-#: src/lang.c:165
+#: src/lang.c:144
 msgid	"\n"
 	"Error: Bad address in From: header.\n"
 msgstr	""
 
-#: src/lang.c:166
+#: src/lang.c:145
 msgid	"\n"
 	"Error: Bad address in Reply-To: header.\n"
 msgstr	""
 
-#: src/lang.c:167
+#: src/lang.c:146
 msgid	"\n"
 	"Error: Bad FQDN in Message-ID: header.\n"
 msgstr	""
 
-#: src/lang.c:168
+#: src/lang.c:147
 #, c-format
 msgid	"Can't unlock %s"
 msgstr	""
 
-#: src/lang.c:170
+#: src/lang.c:149
 #, c-format
 msgid	"Corrupted file %s"
 msgstr	""
 
-#: src/lang.c:171
+#: src/lang.c:150
 #, c-format
 msgid	"Couldn't dotlock %s - article not appended!"
 msgstr	""
 
-#: src/lang.c:172
+#: src/lang.c:151
 #, c-format
 msgid	"Couldn't lock %s - article not appended!"
 msgstr	""
 
-#: src/lang.c:174
+#: src/lang.c:153
 msgid	"Internal error in GNKSA routine - send bug report.\n"
 msgstr	""
 
-#: src/lang.c:175
+#: src/lang.c:154
 msgid	"Left angle bracket missing in route address.\n"
 msgstr	""
 
-#: src/lang.c:176
+#: src/lang.c:155
 msgid	"Left parenthesis missing in old-style address.\n"
 msgstr	""
 
-#: src/lang.c:177
+#: src/lang.c:156
 msgid	"Right parenthesis missing in old-style address.\n"
 msgstr	""
 
-#: src/lang.c:178
+#: src/lang.c:157
 msgid	"At-sign missing in mail address.\n"
 msgstr	""
 
-#: src/lang.c:179
+#: src/lang.c:158
 msgid	"Single component FQDN is not allowed. Add your domain.\n"
 msgstr	""
 
-#: src/lang.c:180
+#: src/lang.c:159
 msgid	"Invalid domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	""
 
-#: src/lang.c:181
+#: src/lang.c:160
 msgid	"Illegal domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	""
 
-#: src/lang.c:182
+#: src/lang.c:161
 msgid	"Unknown domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	""
 
-#: src/lang.c:183
+#: src/lang.c:162
 msgid	"Illegal character in FQDN.\n"
 msgstr	""
 
-#: src/lang.c:184
+#: src/lang.c:163
 msgid	"Zero length FQDN component not allowed.\n"
 msgstr	""
 
-#: src/lang.c:185
+#: src/lang.c:164
 msgid	"FQDN component exceeds maximum allowed length (63 chars).\n"
 msgstr	""
 
-#: src/lang.c:186
+#: src/lang.c:165
 msgid	"FQDN component may not start or end with hyphen.\n"
 msgstr	""
 
-#: src/lang.c:187
+#: src/lang.c:166
 msgid	"FQDN component may not start with digit.\n"
 msgstr	""
 
-#: src/lang.c:188
+#: src/lang.c:167
 msgid	"Domain literal has impossible numeric value.\n"
 msgstr	""
 
-#: src/lang.c:189
+#: src/lang.c:168
 msgid	"Domain literal is for private use only and not allowed for global use.\n"
 msgstr	""
 
-#: src/lang.c:190
+#: src/lang.c:169
 msgid	"Right bracket missing in domain literal.\n"
 msgstr	""
 
-#: src/lang.c:191
+#: src/lang.c:170
 msgid	"Missing localpart of mail address.\n"
 msgstr	""
 
-#: src/lang.c:192
+#: src/lang.c:171
 msgid	"Illegal character in localpart of mail address.\n"
 msgstr	""
 
-#: src/lang.c:193
+#: src/lang.c:172
 msgid	"Zero length localpart component not allowed.\n"
 msgstr	""
 
-#: src/lang.c:194
+#: src/lang.c:173
 msgid	"Illegal character in realname.\n"
 	"Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n"
 msgstr	""
 
-#: src/lang.c:195
+#: src/lang.c:174
 msgid	"Illegal character in realname.\n"
 	"Quoted words may not contain '()<>\\'.\n"
 msgstr	""
 
-#: src/lang.c:196
+#: src/lang.c:175
 msgid	"Illegal character in realname.\n"
 	"Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n"
 msgstr	""
 
-#: src/lang.c:197
+#: src/lang.c:176
 msgid	"Bad syntax in encoded word used in realname.\n"
 msgstr	""
 
-#: src/lang.c:198
+#: src/lang.c:177
 msgid	"Illegal character in realname.\n"
 	"Unquoted words may not contain '()<>\\' in old-style addresses.\n"
 msgstr	""
 
-#: src/lang.c:199
+#: src/lang.c:178
 msgid	"Illegal character in realname.\n"
 	"Control characters and unencoded 8bit characters > 127 are not allowed.\n"
 msgstr	""
 
-#: src/lang.c:200
+#: src/lang.c:179
 msgid	"\n"
 	"Error: No blank line found after header.\n"
 msgstr	""
 
 #. TODO: fixme, US-ASCII is not the only 7bit charset we know about
-#: src/lang.c:202
+#: src/lang.c:181
 msgid	"\n"
 	"Error: Posting contains non-ASCII characters but MM_CHARSET is set to\n"
 	"       US-ASCII  - please change this setting to a suitable value for\n"
@@ -815,7 +786,7 @@ msgid	"\n"
 	"       editing tinrc.\n"
 msgstr	""
 
-#: src/lang.c:207
+#: src/lang.c:186
 msgid	"\n"
 	"Error: Posting contains  non-ASCII characters  but the  MIME encoding\n"
 	"       for news  messages  is set  to \"7bit\"  -  please change this\n"
@@ -824,888 +795,913 @@ msgid	"\n"
 	"       using the M)enu of configurable options or by editing tinrc.\n"
 msgstr	""
 
-#: src/lang.c:213
+#: src/lang.c:192
 msgid	"\n"
 	"Error: Article starts with blank line instead of header\n"
 msgstr	""
 
-#: src/lang.c:214
+#: src/lang.c:193
 #, c-format
 msgid	"\n"
 	"Error: Header on line %d does not have a colon after the header name:\n"
 	"%s\n"
 msgstr	""
 
-#: src/lang.c:215
+#: src/lang.c:194
 #, c-format
 msgid	"\n"
 	"Error: The \"%s:\" line is empty.\n"
 msgstr	""
 
-#: src/lang.c:217
-#, c-format
-msgid	"\n"
-	"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
-	"       The only allowable  space is the one  separating the colon (:)\n"
-	"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
-	"       newsgroup names.\n"
-msgstr	""
-
-#: src/lang.c:222
-#, c-format
-msgid	"\n"
-	"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
-	"       the line  may not  contain  whitespace,  this is  not allowed.\n"
-	"       Please write all newsgroups into a single line.\n"
-msgstr	""
-
-#: src/lang.c:227
+#: src/lang.c:195
 #, c-format
 msgid	"\n"
 	"Error: The \"%s:\" line is missing from the article header.\n"
 msgstr	""
 
-#: src/lang.c:228
+#: src/lang.c:196
 #, c-format
 msgid	"\n"
 	"Error: Header on line %d does not have a space after the colon:\n"
 	"%s\n"
 msgstr	""
 
-#: src/lang.c:229
+#: src/lang.c:197
 #, c-format
 msgid	"\n"
 	"Error: There are multiple (%d) \"%s:\" lines in the header.\n"
 msgstr	""
 
-#: src/lang.c:230
+#: src/lang.c:198
 #, c-format
 msgid	"Insecure permissions of %s (%o)"
 msgstr	""
 
-#: src/lang.c:231 src/open.c:1080
+#: src/lang.c:199 src/open.c:1017
 #, c-format
 msgid	"Invalid response to GROUP command, %s"
 msgstr	""
 
-#: src/lang.c:233
+#: src/lang.c:201
 #, c-format
 msgid	"MIME parse error: Unexpected end of %s/%s article"
 msgstr	""
 
-#: src/lang.c:234
+#: src/lang.c:202
 msgid	"MIME parse error: Start boundary whilst reading headers"
 msgstr	""
 
-#: src/lang.c:235
+#: src/lang.c:203
 msgid	"Can't get a (fully-qualified) domain-name!\n"
 msgstr	""
 
-#: src/lang.c:236
+#: src/lang.c:204
 #, c-format
 msgid	"No permissions to go into %s\n"
 msgstr	""
 
-#: src/lang.c:237
+#: src/lang.c:205
 msgid	"\n"
 	"Error: From: line missing.\n"
 msgstr	""
 
-#: src/lang.c:238
+#: src/lang.c:206
 #, c-format
 msgid	"No read permissions for %s\n"
 msgstr	""
 
-#: src/lang.c:239
+#: src/lang.c:207
 #, c-format
 msgid	"File %s does not exist\n"
 msgstr	""
 
-#: src/lang.c:240
+#: src/lang.c:208
 #, c-format
 msgid	"No write permissions for %s\n"
 msgstr	""
 
-#: src/lang.c:241
+#: src/lang.c:209
 msgid	"Can't get user information (/etc/passwd missing?)"
 msgstr	""
 
-#: src/lang.c:242
+#: src/lang.c:210
 msgid	"errors"
 msgstr	""
 
-#: src/lang.c:243
+#: src/lang.c:211
 #, c-format
 msgid	"\n"
 	"Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n"
 msgstr	""
 
-#: src/lang.c:244
+#: src/lang.c:212
 #, c-format
 msgid	"Server has non of the groups listed in %s"
 msgstr	""
 
-#: src/lang.c:245
+#: src/lang.c:213
 msgid	"error"
 msgstr	""
 
-#: src/lang.c:247
-msgid	"\n"
-	"socket or connect problem\n"
-msgstr	""
-
-#: src/lang.c:250
-msgid	"Server unavailable\n"
-msgstr	""
-
-#: src/lang.c:253
+#: src/lang.c:214
 msgid	"Unknown display level"
 msgstr	""
 
-#: src/lang.c:254
-#, c-format
-msgid	"%s/tcp: Unknown service.\n"
-msgstr	""
-
-#: src/lang.c:255
-#, c-format
-msgid	"Wrong newsgroup name in response of GROUP command, %s for %s"
-msgstr	""
-
-#: src/lang.c:256
+#: src/lang.c:215
 msgid	"<ESC>"
 msgstr	""
 
-#: src/lang.c:257
+#: src/lang.c:216
 msgid	"Exiting..."
 msgstr	""
 
-#: src/lang.c:258
+#: src/lang.c:217
 msgid	"leaving external mail-reader"
 msgstr	""
 
-#: src/lang.c:259
+#: src/lang.c:218
 #, c-format
 msgid	"Extracting %s..."
 msgstr	""
 
-#: src/lang.c:260
-#, c-format
-msgid	"Failed to connect to NNTP server %s. Exiting..."
-msgstr	""
-
-#: src/lang.c:261
+#: src/lang.c:220
 #, c-format
 msgid	"Error writing %s file. Filesystem full? File reset to previous state."
 msgstr	""
 
-#: src/lang.c:262
+#: src/lang.c:221
 #, c-format
 msgid	"Error making backup of %s file. Filesystem full?"
 msgstr	""
 
-#: src/lang.c:263
+#: src/lang.c:222
 #, c-format
 msgid	"Filtering global rules (%d/%d)..."
 msgstr	""
 
-#: src/lang.c:264
+#: src/lang.c:223
 msgid	"Rule created by: "
 msgstr	""
 
-#: src/lang.c:265
+#: src/lang.c:224
 #, c-format
 msgid	"Enter pattern [%s]> "
 msgstr	""
 
-#: src/lang.c:266
+#: src/lang.c:225
 #, c-format
 msgid	"\n"
 	"You requested followups to your article to go to the following %s:\n"
 msgstr	""
 
-#: src/lang.c:267
+#: src/lang.c:226
 #, c-format
 msgid	"  %s\t Answers will be directed to you by mail.\n"
 msgstr	""
 
-#: src/lang.c:268
+#: src/lang.c:227
+msgid	"# Format:\n"
+	"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
+	"placed\n"
+	"#                     at the beginning of a rule, or they will be moved to "
+	"the\n"
+	"#                     next rule. '#' is not a valid keyword for a comment!\n"
+	"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
+	"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
+	"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
+	"#     score=NUM         A number (e.g. 70). Or:\n"
+	"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
+	"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
+	"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
+	"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n"
+	"#                     full references.\n"
+	"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
+	"#   msgid_only=STRING Optional. Like above, but without references.\n"
+	"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
+	"without\n"
+	"#                     Message-ID:\n"
+	"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
+	"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
+	"opt.\n"
+	"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
+	"#   time=NUM          Optional. time_t value when rule expires\n"
+	"#\n"
+msgstr	""
+
+#: src/lang.c:248
 #, c-format
-msgid	"%s%s: Unknown host.\n"
+msgid	"Enter score for rule (default=%d): "
 msgstr	""
 
-#: src/lang.c:269
-msgid	"Giving up...\n"
+#: src/lang.c:249
+#, c-format
+msgid	"Enter the score weight (range 0 < score <= %d)"
 msgstr	""
 
-#: src/lang.c:270
-msgid	"global "
+#. SCORE_MAX
+#: src/lang.c:250
+msgid	"Full"
 msgstr	""
 
-#: src/lang.c:273
-#, c-format
-msgid	"Group %.*s ('q' to quit)..."
+#: src/lang.c:251
+msgid	"Comment (optional)  : "
 msgstr	""
 
-#: src/lang.c:275
+#: src/lang.c:252
+msgid	"Apply pattern to    : "
+msgstr	""
+
+#: src/lang.c:253
+msgid	"From: line (ignore case)      "
+msgstr	""
+
+#: src/lang.c:254
+msgid	"From: line (case sensitive)   "
+msgstr	""
+
+#: src/lang.c:256
 #, c-format
-msgid	"Group %.*s..."
+msgid	"%s%s: Unknown host.\n"
 msgstr	""
 
-#: src/lang.c:278
+#: src/lang.c:257
+msgid	"global "
+msgstr	""
+
+#: src/lang.c:258
 #, c-format
 msgid	"Please use %.100s instead"
 msgstr	""
 
-#: src/lang.c:279
+#: src/lang.c:259
 #, c-format
 msgid	"Group %s is moderated. Continue?"
 msgstr	""
 
-#: src/lang.c:280
+#: src/lang.c:260
 msgid	"groups"
 msgstr	""
 
-#: src/lang.c:281
+#: src/lang.c:261
 msgid	"Top Level Commands"
 msgstr	""
 
-#: src/lang.c:282
+#: src/lang.c:262
 msgid	"Group Selection"
 msgstr	""
 
-#: src/lang.c:283
+#: src/lang.c:263
 msgid	"group"
 msgstr	""
 
-#: src/lang.c:285
+#: src/lang.c:265
+msgid	"One or more lines of comment. <CR> to add a line or proceed if line is empty."
+msgstr	""
+
+#: src/lang.c:266
+msgid	"From: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:267
+msgid	"Linecount of articles to be filtered. < for less, > for more, = for equal."
+msgstr	""
+
+#: src/lang.c:268
+msgid	"Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:269
+msgid	"Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:270
+msgid	"Enter text pattern to filter if Subject: & From: lines are not what you want."
+msgstr	""
+
+#: src/lang.c:271
+msgid	"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:272
+msgid	"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:273
+msgid	"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:274
+msgid	"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:275
 msgid	"kill an article via a menu"
 msgstr	""
 
-#: src/lang.c:286
+#: src/lang.c:276
 msgid	"auto-select (hot) an article via a menu"
 msgstr	""
 
-#: src/lang.c:287
+#: src/lang.c:277
 msgid	"Browse URLs in article"
 msgstr	""
 
-#: src/lang.c:288
+#: src/lang.c:278
 msgid	"0 - 9\t  display article by number in current thread"
 msgstr	""
 
-#: src/lang.c:289
+#: src/lang.c:279
 msgid	"cancel (delete) current article; must have been posted by you"
 msgstr	""
 
-#: src/lang.c:290
+#: src/lang.c:280
 msgid	"edit article (mail-groups only)"
 msgstr	""
 
-#: src/lang.c:291
+#: src/lang.c:281
 msgid	"display first article in current thread"
 msgstr	""
 
-#: src/lang.c:292
+#: src/lang.c:282
 msgid	"display first page of article"
 msgstr	""
 
-#: src/lang.c:293
+#: src/lang.c:283
 msgid	"post followup to current article"
 msgstr	""
 
-#: src/lang.c:294
+#: src/lang.c:284
 msgid	"post followup (don't copy text) to current article"
 msgstr	""
 
-#: src/lang.c:295
+#: src/lang.c:285
 msgid	"post followup to current article quoting complete headers"
 msgstr	""
 
-#: src/lang.c:296
+#: src/lang.c:286
 msgid	"display last article in current thread"
 msgstr	""
 
-#: src/lang.c:297
+#: src/lang.c:287
 msgid	"display last page of article"
 msgstr	""
 
-#: src/lang.c:298
+#: src/lang.c:288
 msgid	"mark rest of thread as read and advance to next unread"
 msgstr	""
 
-#: src/lang.c:299
+#: src/lang.c:289
 msgid	"display next article"
 msgstr	""
 
-#: src/lang.c:300
+#: src/lang.c:290
 msgid	"display first article in next thread"
 msgstr	""
 
-#: src/lang.c:301 src/lang.c:311 src/lang.c:382 src/lang.c:383
+#: src/lang.c:291 src/lang.c:298 src/lang.c:357 src/lang.c:358
 msgid	"display next unread article"
 msgstr	""
 
-#: src/lang.c:302
+#: src/lang.c:292
 msgid	"go to the article that this one followed up"
 msgstr	""
 
-#: src/lang.c:304
-msgid	"perform PGP operations on article"
-msgstr	""
-
-#: src/lang.c:306
+#: src/lang.c:293
 msgid	"display previous article"
 msgstr	""
 
-#: src/lang.c:307 src/lang.c:385
+#: src/lang.c:294 src/lang.c:360
 msgid	"display previous unread article"
 msgstr	""
 
-#: src/lang.c:308
+#: src/lang.c:295
 msgid	"quickly kill an article using defaults"
 msgstr	""
 
-#: src/lang.c:309
+#: src/lang.c:296
 msgid	"quickly auto-select (hot) an article using defaults"
 msgstr	""
 
-#: src/lang.c:310
+#: src/lang.c:297
 msgid	"return to group selection level"
 msgstr	""
 
-#: src/lang.c:312
+#: src/lang.c:299
 msgid	"reply through mail to author"
 msgstr	""
 
-#: src/lang.c:313
+#: src/lang.c:300
 msgid	"reply through mail (don't copy text) to author"
 msgstr	""
 
-#: src/lang.c:314
+#: src/lang.c:301
 msgid	"reply through mail to author quoting complete headers"
 msgstr	""
 
-#: src/lang.c:315 src/lang.c:387
+#: src/lang.c:302 src/lang.c:362
 msgid	"repost chosen article to another group"
 msgstr	""
 
-#: src/lang.c:316
+#: src/lang.c:303
 msgid	"search backwards within this article"
 msgstr	""
 
-#: src/lang.c:317
+#: src/lang.c:304
 msgid	"search forwards within this article"
 msgstr	""
 
-#: src/lang.c:318
+#: src/lang.c:305
 msgid	"show article in raw-mode (including all headers)"
 msgstr	""
 
-#: src/lang.c:319
+#: src/lang.c:306
 msgid	"skip next block of included text"
 msgstr	""
 
-#: src/lang.c:320
+#: src/lang.c:307
 msgid	"toggle display of sections hidden by a form-feed (^L) on/off"
 msgstr	""
 
-#: src/lang.c:321
+#: src/lang.c:308
 msgid	"toggle word highlighting on/off"
 msgstr	""
 
-#: src/lang.c:322
+#: src/lang.c:309
 msgid	"toggle ROT-13 (basic decode) for current article"
 msgstr	""
 
-#: src/lang.c:323
+#: src/lang.c:310
 msgid	"toggle tabwidth 4 <-> 8"
 msgstr	""
 
-#: src/lang.c:324
+#: src/lang.c:311
 msgid	"toggle german TeX style decoding for current article"
 msgstr	""
 
-#: src/lang.c:325
+#: src/lang.c:312
 msgid	"toggle display of uuencoded sections"
 msgstr	""
 
-#: src/lang.c:326
+#: src/lang.c:313
 msgid	"View/save multimedia attachments"
 msgstr	""
 
-#: src/lang.c:327
+#: src/lang.c:314
 #, c-format
 msgid	"report bug or comment via mail to %s"
 msgstr	""
 
-#: src/lang.c:328
+#: src/lang.c:315
 msgid	"choose range of articles to be affected by next command"
 msgstr	""
 
-#: src/lang.c:329
+#: src/lang.c:316
 msgid	"escape from command prompt"
 msgstr	""
 
-#: src/lang.c:330
+#: src/lang.c:317
 msgid	"get help"
 msgstr	""
 
-#: src/lang.c:331
+#: src/lang.c:318
 msgid	"display last article viewed"
 msgstr	""
 
-#: src/lang.c:332
+#: src/lang.c:319
 msgid	"down one line"
 msgstr	""
 
-#: src/lang.c:333
+#: src/lang.c:320
 msgid	"up one line"
 msgstr	""
 
-#: src/lang.c:334
+#: src/lang.c:321
 msgid	"go to article chosen by Message-ID"
 msgstr	""
 
-#: src/lang.c:335
+#: src/lang.c:322
 msgid	"mail article/thread/hot/pattern/tagged articles to someone"
 msgstr	""
 
-#: src/lang.c:336
+#: src/lang.c:323
 msgid	"menu of configurable options"
 msgstr	""
 
-#: src/lang.c:337
+#: src/lang.c:324
 msgid	"down one page"
 msgstr	""
 
-#: src/lang.c:338
+#: src/lang.c:325
 msgid	"up one page"
 msgstr	""
 
-#: src/lang.c:340
-msgid	"pipe article/thread/hot/pattern/tagged articles into command"
-msgstr	""
-
-#: src/lang.c:342
+#: src/lang.c:326
 msgid	"post (write) article to current group"
 msgstr	""
 
-#: src/lang.c:343
+#: src/lang.c:327
 msgid	"post postponed articles"
 msgstr	""
 
-#: src/lang.c:344
+#: src/lang.c:328
 msgid	"list articles posted by you (from posted file)"
 msgstr	""
 
-#: src/lang.c:345
+#: src/lang.c:329
 msgid	"return to previous menu"
 msgstr	""
 
-#: src/lang.c:347
-msgid	"output article/thread/hot/pattern/tagged articles to printer"
-msgstr	""
-
-#: src/lang.c:349
+#: src/lang.c:330
 msgid	"quit tin immediately"
 msgstr	""
 
-#: src/lang.c:350
+#: src/lang.c:331
 msgid	"redraw page"
 msgstr	""
 
-#: src/lang.c:351
+#: src/lang.c:332
 msgid	"save article/thread/hot/pattern/tagged articles to file"
 msgstr	""
 
-#: src/lang.c:352
+#: src/lang.c:333
 msgid	"save marked articles automatically without user prompts"
 msgstr	""
 
-#: src/lang.c:353
+#: src/lang.c:334
 msgid	"search for articles by author backwards"
 msgstr	""
 
-#: src/lang.c:354
+#: src/lang.c:335
 msgid	"search for articles by author forwards"
 msgstr	""
 
-#: src/lang.c:355
+#: src/lang.c:336
 msgid	"search all articles for a given string (this may take some time)"
 msgstr	""
 
-#: src/lang.c:356
+#: src/lang.c:337
 msgid	" \t  (searches are case-insensitive and wrap around to all articles)"
 msgstr	""
 
-#: src/lang.c:357
+#: src/lang.c:338
 msgid	"search for articles by Subject line backwards"
 msgstr	""
 
-#: src/lang.c:358
+#: src/lang.c:339
 msgid	"search for articles by Subject line forwards"
 msgstr	""
 
-#: src/lang.c:359
+#: src/lang.c:340
 msgid	"repeat last search"
 msgstr	""
 
-#: src/lang.c:361
-msgid	"shell escape"
-msgstr	""
-
-#: src/lang.c:363
+#: src/lang.c:341
 msgid	"tag current article for reposting/mailing/piping/printing/saving"
 msgstr	""
 
-#: src/lang.c:365
-msgid	"toggle color"
-msgstr	"toggle colour"
-
-#: src/lang.c:367
+#: src/lang.c:342
 msgid	"toggle info message in last line (subject/description)"
 msgstr	""
 
-#: src/lang.c:368
+#: src/lang.c:343
 msgid	"toggle inverse video"
 msgstr	""
 
-#: src/lang.c:369
+#: src/lang.c:344
 msgid	"toggle mini help menu display"
 msgstr	""
 
-#: src/lang.c:370
+#: src/lang.c:345
 msgid	"show version information"
 msgstr	""
 
-#: src/lang.c:371
+#: src/lang.c:346
 msgid	"mark all articles as read and return to group selection menu"
 msgstr	""
 
-#: src/lang.c:372
+#: src/lang.c:347
 msgid	"mark all articles as read and enter next group with unread articles"
 msgstr	""
 
-#: src/lang.c:373
+#: src/lang.c:348
 msgid	"choose first thread in list"
 msgstr	""
 
-#: src/lang.c:374 src/lang.c:405
+#: src/lang.c:349 src/lang.c:380
 msgid	"choose group by name"
 msgstr	""
 
-#: src/lang.c:375
+#: src/lang.c:350
 msgid	"choose last thread in list"
 msgstr	""
 
-#: src/lang.c:376
+#: src/lang.c:351
 msgid	"list articles within current thread (bring up Thread sub-menu)"
 msgstr	""
 
-#: src/lang.c:377
+#: src/lang.c:352
 msgid	"mark article as unread"
 msgstr	""
 
-#: src/lang.c:378
+#: src/lang.c:353
 msgid	"mark current thread as read"
 msgstr	""
 
-#: src/lang.c:379
+#: src/lang.c:354
 msgid	"mark thread as unread"
 msgstr	""
 
-#: src/lang.c:380
+#: src/lang.c:355
 msgid	"toggle display of all/selected articles"
 msgstr	""
 
-#: src/lang.c:381
+#: src/lang.c:356
 msgid	"display next group"
 msgstr	""
 
-#: src/lang.c:384
+#: src/lang.c:359
 msgid	"display previous group"
 msgstr	""
 
-#: src/lang.c:386 src/lang.c:434
+#: src/lang.c:361 src/lang.c:409
 msgid	"read chosen article"
 msgstr	""
 
-#: src/lang.c:388
+#: src/lang.c:363
 msgid	"toggle all selections (all articles)"
 msgstr	""
 
-#: src/lang.c:389
+#: src/lang.c:364
 msgid	"select group (make \"hot\")"
 msgstr	""
 
-#: src/lang.c:390
+#: src/lang.c:365
 msgid	"select thread"
 msgstr	""
 
-#: src/lang.c:391
+#: src/lang.c:366
 msgid	"select threads if at least one unread article is selected"
 msgstr	""
 
-#: src/lang.c:392
+#: src/lang.c:367
 msgid	"select threads that match user specified pattern"
 msgstr	""
 
-#: src/lang.c:393
+#: src/lang.c:368
 msgid	"tag all parts of current multipart-message in order"
 msgstr	""
 
-#: src/lang.c:394
+#: src/lang.c:369
 msgid	"0 - 9\t  choose thread by number"
 msgstr	""
 
-#: src/lang.c:395
+#: src/lang.c:370
 msgid	"toggle limit number of articles to get, and reload"
 msgstr	""
 
-#: src/lang.c:396
+#: src/lang.c:371
 msgid	"toggle display of all/unread articles"
 msgstr	""
 
-#: src/lang.c:397 src/lang.c:435
+#: src/lang.c:372 src/lang.c:410
 msgid	"cycle the display of authors email address, real name, both or neither"
 msgstr	""
 
-#: src/lang.c:398
+#: src/lang.c:373
 msgid	"toggle selection of thread"
 msgstr	""
 
-#: src/lang.c:399
+#: src/lang.c:374
 msgid	"cycle through threading options available"
 msgstr	""
 
-#: src/lang.c:400
+#: src/lang.c:375
 msgid	"undo all selections (all articles)"
 msgstr	""
 
-#: src/lang.c:401
+#: src/lang.c:376
 msgid	"untag all tagged threads"
 msgstr	""
 
-#: src/lang.c:402
+#: src/lang.c:377
 msgid	"mark all articles in group as read"
 msgstr	""
 
-#: src/lang.c:403
+#: src/lang.c:378
 msgid	"mark all articles in group as read and move to next unread group"
 msgstr	""
 
-#: src/lang.c:404
+#: src/lang.c:379
 msgid	"choose first group in list"
 msgstr	""
 
-#: src/lang.c:406
+#: src/lang.c:381
 msgid	"0 - 9\t  choose group by number"
 msgstr	""
 
-#: src/lang.c:407
+#: src/lang.c:382
 msgid	"choose range of groups to be affected by next command"
 msgstr	""
 
-#: src/lang.c:408
+#: src/lang.c:383
 msgid	"choose last group in list"
 msgstr	""
 
-#: src/lang.c:409
+#: src/lang.c:384
 msgid	"mark all articles in chosen group unread"
 msgstr	""
 
-#: src/lang.c:410
+#: src/lang.c:385
 msgid	"move chosen group within list"
 msgstr	""
 
-#: src/lang.c:411
+#: src/lang.c:386
 msgid	"choose next group with unread news"
 msgstr	""
 
-#: src/lang.c:412 src/lang.c:913
+#: src/lang.c:387 src/lang.c:1176
 msgid	"quit"
 msgstr	""
 
-#: src/lang.c:413
+#: src/lang.c:388
 msgid	"quit without saving configuration changes"
 msgstr	""
 
-#: src/lang.c:414
+#: src/lang.c:389
 msgid	"read chosen group"
 msgstr	""
 
-#: src/lang.c:415
+#: src/lang.c:390
 msgid	"reset .newsrc (all available articles in groups marked unread)"
 msgstr	""
 
-#: src/lang.c:416
+#: src/lang.c:391
 msgid	"search backwards for a group name"
 msgstr	""
 
-#: src/lang.c:417
+#: src/lang.c:392
 msgid	" \t  (all searches are case-insensitive and wrap around)"
 msgstr	""
 
-#: src/lang.c:418
+#: src/lang.c:393
 msgid	"search forwards for a group name"
 msgstr	""
 
-#: src/lang.c:419
+#: src/lang.c:394
 msgid	"subscribe to chosen group"
 msgstr	""
 
-#: src/lang.c:420
+#: src/lang.c:395
 msgid	"subscribe to groups that match pattern"
 msgstr	""
 
-#: src/lang.c:421
+#: src/lang.c:396
 msgid	"reread active file to check for any new news"
 msgstr	""
 
-#: src/lang.c:422
+#: src/lang.c:397
 msgid	"toggle display of group name only or group name plus description"
 msgstr	""
 
-#: src/lang.c:423
+#: src/lang.c:398
 msgid	"toggle display to show all/unread subscribed groups"
 msgstr	""
 
-#: src/lang.c:424
+#: src/lang.c:399
 msgid	"unsubscribe from chosen group"
 msgstr	""
 
-#: src/lang.c:425
+#: src/lang.c:400
 msgid	"unsubscribe from groups that match pattern"
 msgstr	""
 
-#: src/lang.c:426
+#: src/lang.c:401
 msgid	"sort the list of groups"
 msgstr	""
 
-#: src/lang.c:427
+#: src/lang.c:402
 msgid	"toggle display to show all/subscribed groups"
 msgstr	""
 
-#: src/lang.c:428
+#: src/lang.c:403
 msgid	"0 - 9\t  choose article by number"
 msgstr	""
 
-#: src/lang.c:429
+#: src/lang.c:404
 msgid	"mark thread as read and return to group index page"
 msgstr	""
 
-#: src/lang.c:430
+#: src/lang.c:405
 msgid	"mark thread as read and enter next unread thread or group"
 msgstr	""
 
-#: src/lang.c:431
+#: src/lang.c:406
 msgid	"choose first article in list"
 msgstr	""
 
-#: src/lang.c:432
+#: src/lang.c:407
 msgid	"choose last article in list"
 msgstr	""
 
-#: src/lang.c:433
+#: src/lang.c:408
 msgid	"mark article as read and move cursor to next unread article"
 msgstr	""
 
-#: src/lang.c:436
+#: src/lang.c:411
 msgid	"Display properties\n"
 	"------------------"
 msgstr	""
 
-#: src/lang.c:437
+#: src/lang.c:412
 msgid	"Miscellaneous\n"
 	"-------------"
 msgstr	""
 
-#: src/lang.c:438
+#: src/lang.c:413
 msgid	"Moving around\n"
 	"-------------"
 msgstr	""
 
-#: src/lang.c:439
+#: src/lang.c:414
 msgid	"Group/thread/article operations\n"
 	"-------------------------------"
 msgstr	""
 
-#: src/lang.c:440
+#: src/lang.c:416
 msgid	"Group Level Commands"
 msgstr	""
 
-#: src/lang.c:441
+#: src/lang.c:417
 msgid	"Kill filter added"
 msgstr	""
 
-#: src/lang.c:442
+#: src/lang.c:418
 msgid	"Auto-selection filter added"
 msgstr	""
 
-#: src/lang.c:443
+#: src/lang.c:419
 msgid	"All parts tagged"
 msgstr	""
 
-#: src/lang.c:444
+#: src/lang.c:420
 msgid	"Storing article for later posting"
 msgstr	""
 
-#: src/lang.c:445
+#: src/lang.c:421
 msgid	"Please enter a valid character"
 msgstr	""
 
-#: src/lang.c:446
+#: src/lang.c:422
 #, c-format
 msgid	"Missing part #%d"
 msgstr	""
 
-#: src/lang.c:447
+#: src/lang.c:423
 msgid	"*** No postponed articles ***"
 msgstr	""
 
-#: src/lang.c:448
+#: src/lang.c:424
 msgid	"Not a multi-part message"
 msgstr	""
 
-#: src/lang.c:449
+#: src/lang.c:425
 msgid	"You are not subscribed to this group"
 msgstr	""
 
-#: src/lang.c:450
+#: src/lang.c:426
 msgid	"No previous expression"
 msgstr	""
 
-#: src/lang.c:451
+#: src/lang.c:427
 msgid	"Operation disabled in no-overwrite mode"
 msgstr	""
 
 #. TODO: replace hardcoded key-name in txt_info_postponed
-#: src/lang.c:453
+#: src/lang.c:429
 #, c-format
 msgid	"%d postponed %s, reuse with ^O...\n"
 msgstr	""
 
-#: src/lang.c:454
+#: src/lang.c:430
 msgid	"X-Conversion-Note: multipart/alternative contents have been removed.\n"
 	"  To get the whole article, turn alternative handling OFF in the Option Menu\n"
 msgstr	""
 
-#: src/lang.c:456
+#: src/lang.c:432
 #, c-format
 msgid	"Save filename for %s/%s is a mailbox. Attachment not saved"
 msgstr	""
 
-#: src/lang.c:457
+#: src/lang.c:433
 msgid	"TeX2Iso encoded article"
 msgstr	""
 
-#: src/lang.c:458
+#: src/lang.c:434
 msgid	"incomplete "
 msgstr	""
 
 #. TODO: replace hardcoded key-names
-#: src/lang.c:460
+#: src/lang.c:436
 #, c-format
 msgid	"\n"
 	"Welcome to %s, a full screen threaded Netnews reader. It can read news "
@@ -1741,512 +1737,415 @@ msgid	"\n"
 	"Please send bug-reports/comments to %s with the 'R' command.\n"
 msgstr	""
 
-#: src/lang.c:476
+#: src/lang.c:452
 #, c-format
 msgid	"Invalid  From: %s  line. Read the INSTALL file again."
 msgstr	""
 
-#: src/lang.c:477
+#: src/lang.c:453
 #, c-format
 msgid	"Invalid  Sender:-header %s"
 msgstr	""
 
-#: src/lang.c:478
+#: src/lang.c:454
 msgid	"Inverse video disabled"
 msgstr	""
 
-#: src/lang.c:479
+#: src/lang.c:455
 msgid	"Inverse video enabled"
 msgstr	""
 
-#: src/lang.c:480
+#: src/lang.c:457
 #, c-format
 msgid	"Missing definition for %s\n"
 msgstr	""
 
-#: src/lang.c:481
+#: src/lang.c:458
 #, c-format
 msgid	"Invalid key definition '%s'\n"
 msgstr	""
 
-#: src/lang.c:482
+#: src/lang.c:459
 #, c-format
 msgid	"Invalid keyname '%s'\n"
 msgstr	""
 
-#: src/lang.c:484
+#: src/lang.c:460
 #, c-format
-msgid	"Redefined key %s '%s' -> '%s'\n"
+msgid	"Key '%s' is defined for both %s%s and %s%s\n"
 msgstr	""
 
-#: src/lang.c:485
-msgid	"  -D       debug mode 1=NNTP 2=ALL"
+#: src/lang.c:461
+#, c-format
+msgid	"Kill From:     [%-*.*s] (y/n): "
 msgstr	""
 
-#: src/lang.c:487
-#, c-format
-msgid	"Key '%s' is defined for both %s%s and %s%s\n"
+#: src/lang.c:462
+msgid	"Kill Lines: (</>num): "
 msgstr	""
 
-#: src/lang.c:488
-msgid	"-- Last response --"
+#: src/lang.c:463
+msgid	"Kill Article Menu"
 msgstr	""
 
-#: src/lang.c:491
+#: src/lang.c:464
 #, c-format
-msgid	"%d files successfully written from %d articles. %d %s occurred."
+msgid	"Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
 msgstr	""
 
-#: src/lang.c:492
-msgid	"Missing parts."
+#: src/lang.c:465
+msgid	"Kill pattern scope  : "
 msgstr	""
 
-#: src/lang.c:493
-msgid	"No beginning."
+#: src/lang.c:466
+#, c-format
+msgid	"Kill Subject:  [%-*.*s] (y/n): "
 msgstr	""
 
-#: src/lang.c:494
-msgid	"No data."
+#: src/lang.c:467
+msgid	"Kill text pattern   : "
 msgstr	""
 
-#: src/lang.c:495
-msgid	"Unknown error."
+#: src/lang.c:468
+msgid	"Kill time in days   : "
 msgstr	""
 
-#: src/lang.c:497
-#, c-format
-msgid	"Error decoding %s : %s"
+#: src/lang.c:470
+msgid	"Last"
 msgstr	""
 
-#: src/lang.c:498
-msgid	"No end."
+#: src/lang.c:471
+msgid	"-- Last response --"
 msgstr	""
 
-#: src/lang.c:499
+#: src/lang.c:472
 #, c-format
-msgid	"%s successfully decoded."
+msgid	"Lines %s  "
 msgstr	""
 
-#: src/lang.c:501
-#, c-format
-msgid	"Lines %s  "
+#: src/lang.c:474
+msgid	"Message-ID: line              "
 msgstr	""
 
-#: src/lang.c:503
+#: src/lang.c:476
 msgid	"mailbox "
 msgstr	""
 
-#: src/lang.c:504
+#: src/lang.c:477
 #, c-format
 msgid	"Mail article(s) to [%.*s]> "
 msgstr	""
 
-#: src/lang.c:505
+#: src/lang.c:478
 #, c-format
 msgid	"Mailing log to %s\n"
 msgstr	""
 
-#: src/lang.c:506
+#: src/lang.c:479
 msgid	"Mail bug report..."
 msgstr	""
 
-#: src/lang.c:507
+#: src/lang.c:480
 #, c-format
 msgid	"Mail BUG REPORT to %s?"
 msgstr	""
 
-#: src/lang.c:508
+#: src/lang.c:481
 msgid	"Mailed"
 msgstr	""
 
-#: src/lang.c:509
+#: src/lang.c:482
 #, c-format
 msgid	"Mailing to %s..."
 msgstr	""
 
-#: src/lang.c:510
+#: src/lang.c:483
 msgid	"# [Mail/Save] active file. Format is like news active file:\n"
 	"#   groupname  max.artnum  min.artnum  /dir\n"
 	"# The 4th field is the basedir (ie. ~/Mail or ~/News)\n"
 	"#\n"
 msgstr	""
 
-#: src/lang.c:513
+#: src/lang.c:486
 #, c-format
 msgid	"%s marked as unread"
 msgstr	""
 
-#: src/lang.c:514
+#: src/lang.c:487
 #, c-format
 msgid	"Marked %d of %d tagged %s as read"
 msgstr	""
 
-#: src/lang.c:515
+#: src/lang.c:488
 #, c-format
 msgid	"Mark all articles as read%s?"
 msgstr	""
 
-#: src/lang.c:516
+#: src/lang.c:489
 #, c-format
 msgid	"Mark %s=tagged articles, %s=current article, %s=quit: "
 msgstr	""
 
-#: src/lang.c:517
+#: src/lang.c:490
 #, c-format
 msgid	"Mark group %.*s as read?"
 msgstr	""
 
-#: src/lang.c:518
+#: src/lang.c:491
 #, c-format
 msgid	"Mark thread as read%s?"
 msgstr	""
 
-#: src/lang.c:519
+#: src/lang.c:492
 #, c-format
 msgid	"Mark %s=tagged articles/threads, %s=current thread, %s=quit: "
 msgstr	""
 
-#: src/lang.c:520
+#: src/lang.c:493
 #, c-format
 msgid	"Matching %s groups..."
 msgstr	""
 
-#: src/lang.c:521 src/lang.c:525
+#: src/lang.c:494 src/lang.c:498
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s=search pattern; %s=kill/select"
 msgstr	""
 
-#: src/lang.c:522
+#: src/lang.c:495
 #, c-format
 msgid	"%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list "
 	"thread"
 msgstr	""
 
-#: src/lang.c:523
+#: src/lang.c:496
 #, c-format
 msgid	"%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom"
 msgstr	""
 
-#: src/lang.c:524
+#: src/lang.c:497
 #, c-format
 msgid	"%s=search forwards; %s=search backwards; %s=quit"
 msgstr	""
 
-#: src/lang.c:526
+#: src/lang.c:499
 #, c-format
 msgid	"%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read"
 msgstr	""
 
-#: src/lang.c:530
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
-	"%s=post"
-msgstr	""
-
-#: src/lang.c:531
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	""
-
-#: src/lang.c:533
-#, c-format
-msgid	"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	""
-
-#: src/lang.c:534
-#, c-format
-msgid	"%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	""
-
-#: src/lang.c:538
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	""
-
-#: src/lang.c:539
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	""
-
-#: src/lang.c:541
-#, c-format
-msgid	"%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	""
-
-#: src/lang.c:542
-#, c-format
-msgid	"%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	""
-
-#: src/lang.c:546
+#: src/lang.c:500
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup"
 msgstr	""
 
-#: src/lang.c:547
+#: src/lang.c:501
 #, c-format
 msgid	"%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread"
 msgstr	""
 
-#: src/lang.c:548
+#: src/lang.c:502
 #, c-format
 msgid	"%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out"
 msgstr	""
 
-#: src/lang.c:549
+#: src/lang.c:503
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s=catchup; %s=display toggle"
 msgstr	""
 
-#: src/lang.c:550
+#: src/lang.c:504
 #, c-format
 msgid	"%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread"
 msgstr	""
 
-#: src/lang.c:551
+#: src/lang.c:505
 msgid	"--More--"
 msgstr	""
 
-#: src/lang.c:552
+#: src/lang.c:506
 #, c-format
 msgid	"Moving %s..."
 msgstr	""
 
-#: src/lang.c:553
+#: src/lang.c:508
 msgid	", name: "
 msgstr	""
 
-#: src/lang.c:554
+#: src/lang.c:509
 #, c-format
 msgid	"Goto newsgroup [%s]> "
 msgstr	""
 
-#: src/lang.c:555
+#: src/lang.c:510
 msgid	"newsgroups"
 msgstr	""
 
-#: src/lang.c:556
+#: src/lang.c:511
 #, c-format
 msgid	"Position %s in group list (1,2,..,$) [%d]> "
 msgstr	""
 
-#: src/lang.c:557
+#: src/lang.c:512
 msgid	"newsgroup"
 msgstr	""
 
-#: src/lang.c:558
+#: src/lang.c:513
 msgid	"Try and save newsrc file again?"
 msgstr	""
 
-#: src/lang.c:559
+#: src/lang.c:514
 msgid	"Warning: No newsgroups were written to your newsrc file. Save aborted."
 msgstr	""
 
-#: src/lang.c:560
+#: src/lang.c:515
 msgid	"newsrc file saved successfully.\n"
 msgstr	""
 
-#: src/lang.c:561
+#: src/lang.c:516
 msgid	"-- Next response --"
 msgstr	""
 
-#: src/lang.c:562
+#: src/lang.c:517
 #, c-format
 msgid	"NNTP authorization password not found for %s"
 msgstr	"NNTP authorisation password not found for %s"
 
-#: src/lang.c:565 src/nntplib.c:966
-msgid	"205  Closing connection"
-msgstr	""
-
-#: src/lang.c:566
-msgid	"  -A       force authentication on connect"
-msgstr	""
-
-#: src/lang.c:567
-#, c-format
-msgid	"  -g serv  read news from NNTP server serv [default=%s]"
-msgstr	""
-
-#: src/lang.c:568
-#, c-format
-msgid	"  -p port  use port as NNTP port [default=%d]"
-msgstr	""
-
-#: src/lang.c:569
-msgid	"  -Q       quick start. Same as -nqd"
-msgstr	""
-
-#: src/lang.c:570
-msgid	"  -l       use only LIST instead of GROUP (-n) command"
-msgstr	""
-
-#: src/lang.c:571
-msgid	"  -n       only read subscribed .newsrc groups from NNTP server"
-msgstr	""
-
-#: src/lang.c:573
-msgid	"  -Q       quick start. Same as -qd"
-msgstr	""
-
-#: src/lang.c:574
-msgid	"  -l       read only active file instead of scanning spool (-n) command"
-msgstr	""
-
-#: src/lang.c:575
-msgid	"  -n       only read subscribed .newsrc groups from spool"
-msgstr	""
-
-#: src/lang.c:578
+#: src/lang.c:518
 msgid	"No  "
 msgstr	""
 
-#: src/lang.c:579
+#: src/lang.c:519
 msgid	"*** No articles ***"
 msgstr	""
 
-#: src/lang.c:580
+#: src/lang.c:520
 msgid	"No articles have been posted"
 msgstr	""
 
-#: src/lang.c:583
-msgid	"No command"
-msgstr	""
-
-#: src/lang.c:588
-msgid	"Terminal does not support color"
-msgstr	"Terminal does not support colour"
-
-#: src/lang.c:592
+#: src/lang.c:521
 msgid	"*** No description ***"
 msgstr	""
 
-#: src/lang.c:593
+#: src/lang.c:522
 msgid	"No filename"
 msgstr	""
 
-#: src/lang.c:594
+#: src/lang.c:523
 msgid	"No group"
 msgstr	""
 
-#: src/lang.c:595
+#: src/lang.c:524
 msgid	"*** No groups ***"
 msgstr	""
 
-#: src/lang.c:596
+#: src/lang.c:525
 msgid	"No more groups to read"
 msgstr	""
 
-#: src/lang.c:597
+#: src/lang.c:526
 msgid	"No last message"
 msgstr	""
 
-#: src/lang.c:598
+#: src/lang.c:527
 msgid	"No mail address"
 msgstr	""
 
-#: src/lang.c:599
+#: src/lang.c:528
 msgid	"No articles marked for saving"
 msgstr	""
 
-#: src/lang.c:600
+#: src/lang.c:529
 msgid	"No match"
 msgstr	""
 
-#: src/lang.c:601
+#: src/lang.c:530
 msgid	"No more groups"
 msgstr	""
 
-#: src/lang.c:602
+#: src/lang.c:531
 msgid	"No newsgroups"
 msgstr	""
 
-#: src/lang.c:603
+#: src/lang.c:532
 msgid	"No next unread article"
 msgstr	""
 
-#: src/lang.c:604
+#: src/lang.c:533
 msgid	"No previous group"
 msgstr	""
 
-#: src/lang.c:605
+#: src/lang.c:534
 msgid	"No previous unread article"
 msgstr	""
 
-#: src/lang.c:606
+#: src/lang.c:535
 #, c-format
 msgid	"No responses%s"
 msgstr	""
 
-#: src/lang.c:607
+#: src/lang.c:536
 msgid	"No responses"
 msgstr	""
 
-#: src/lang.c:608
+#: src/lang.c:537
 msgid	"No responses to list in current thread"
 msgstr	""
 
-#: src/lang.c:609
+#: src/lang.c:538
 msgid	"No search string"
 msgstr	""
 
-#: src/lang.c:610
+#: src/lang.c:539
 msgid	"No subject"
 msgstr	""
 
-#: src/lang.c:611
+#: src/lang.c:540
 #, c-format
 msgid	"%s: Terminal must have clear to end-of-line (ce)\n"
 msgstr	""
 
-#: src/lang.c:612
+#: src/lang.c:541
 #, c-format
 msgid	"%s: Terminal must have clear to end-of-screen (cd)\n"
 msgstr	""
 
-#: src/lang.c:613
+#: src/lang.c:542
 #, c-format
 msgid	"%s: Terminal must have clearscreen (cl) capability\n"
 msgstr	""
 
-#: src/lang.c:614
+#: src/lang.c:543
 #, c-format
 msgid	"%s: Terminal must have cursor motion (cm)\n"
 msgstr	""
 
-#: src/lang.c:615
+#: src/lang.c:544
 #, c-format
 msgid	"%s: TERM variable must be set to use screen capabilities\n"
 msgstr	""
 
-#: src/lang.c:616
+#: src/lang.c:545
 #, c-format
 msgid	"No viewer found for %s/%s\n"
 msgstr	""
 
-#: src/lang.c:617
-msgid	"Your server does not support the NNTP XOVER or OVER command.\n"
-	"Tin will use local index files instead.\n"
-msgstr	""
-
-#: src/lang.c:618
+#: src/lang.c:546
 msgid	"Newsgroup does not exist on this server"
 msgstr	""
 
-#: src/lang.c:619
+#: src/lang.c:547
 #, c-format
 msgid	"Group %s not found in active file"
 msgstr	""
 
-#: src/lang.c:620
+#: src/lang.c:548
 msgid	"c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr	""
 
-#: src/lang.c:621
+#: src/lang.c:549
 msgid	"use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr	""
 
-#: src/lang.c:623
+#: src/lang.c:550
 #, c-format
 msgid	"# NNTP-server -> newsrc translation table and NNTP-server\n"
 	"# shortname list for %s %s\n"
@@ -2262,552 +2161,532 @@ msgid	"# NNTP-server -> newsrc translati
 	"#\n"
 msgstr	""
 
-#: src/lang.c:630
+#: src/lang.c:557
+msgid	"Only"
+msgstr	""
+
+#: src/lang.c:558
 #, c-format
 msgid	"Option not enabled. Recompile with %s."
 msgstr	""
 
-#: src/lang.c:631
+#: src/lang.c:559
 msgid	"Options Menu"
 msgstr	""
 
-#: src/lang.c:634
+#: src/lang.c:562
 #, c-format
 msgid	"Error in regex: %s at pos. %d '%s'"
 msgstr	""
 
-#: src/lang.c:635
+#: src/lang.c:563
 #, c-format
 msgid	"Error in regex: pcre internal error %d"
 msgstr	""
 
-#: src/lang.c:636
+#: src/lang.c:564
 #, c-format
 msgid	"Error in regex: study - pcre internal error %s"
 msgstr	""
 
-#: src/lang.c:639
-msgid	"Add key(s) to public keyring?"
-msgstr	""
-
-#: src/lang.c:640
-#, c-format
-msgid	"%s=encrypt, %s=sign, %s=both, %s=quit: "
-msgstr	""
-
-#: src/lang.c:641
-#, c-format
-msgid	"%s=sign, %s=sign & include public key, %s=quit: "
-msgstr	""
-
-#: src/lang.c:642
-#, c-format
-msgid	"PGP has not been set up (can't open %s)"
-msgstr	""
-
-#: src/lang.c:643
-msgid	"Article not signed and no public keys found"
-msgstr	""
-
-#: src/lang.c:647
-msgid	"Pipe"
-msgstr	""
-
-#: src/lang.c:648
-#, c-format
-msgid	"Pipe to command [%.*s]> "
-msgstr	""
-
-#: src/lang.c:649
-msgid	"Piping..."
-msgstr	""
-
-#: src/lang.c:651
-msgid	"Piping not enabled."
-msgstr	""
-
-#: src/lang.c:654
+#: src/lang.c:565
 msgid	"Post a followup..."
 msgstr	""
 
 #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone
-#: src/lang.c:656
+#: src/lang.c:567
 msgid	"An error has occurred while posting the article. If you think that this\n"
 	"error is temporary or otherwise correctable, you can postpone the article\n"
 	"and pick it up again with ^O later.\n"
 msgstr	""
 
-#: src/lang.c:659
+#: src/lang.c:570
 msgid	"Posted articles history"
 msgstr	""
 
-#: src/lang.c:660
+#: src/lang.c:571
 #, c-format
 msgid	"Post to newsgroup(s) [%s]> "
 msgstr	""
 
-#: src/lang.c:661
+#: src/lang.c:572
 msgid	"-- post processing started --"
 msgstr	""
 
-#: src/lang.c:662
+#: src/lang.c:573
 msgid	"-- post processing completed --"
 msgstr	""
 
-#: src/lang.c:663
+#: src/lang.c:574
 #, c-format
 msgid	"Post subject [%s]> "
 msgstr	""
 
-#: src/lang.c:665
-msgid	"Posting using external inews failed. Use built in inews instead?"
+#: src/lang.c:575
+msgid	"# Summary of mailed/posted messages viewable by 'W' command from within tin.\n"
 msgstr	""
 
-#: src/lang.c:666
-msgid	"It worked! Should I always use my built in inews from now on?"
-msgstr	""
-
-#: src/lang.c:668
-msgid	"# Summary of mailed/posted messages viewable by 'W' command from within tin.\n"
-msgstr	""
-
-#: src/lang.c:669
+#: src/lang.c:576
 msgid	"Posting article..."
 msgstr	""
 
-#: src/lang.c:670
+#: src/lang.c:577
 msgid	"Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): "
 msgstr	""
 
-#: src/lang.c:671
+#: src/lang.c:578
 #, c-format
 msgid	"Hot %s"
 msgstr	""
 
-#: src/lang.c:672
+#: src/lang.c:579
 #, c-format
 msgid	"Tagged %s"
 msgstr	""
 
-#: src/lang.c:673
+#: src/lang.c:580
+msgid	"Processing mail messages marked for deletion."
+msgstr	""
+
+#: src/lang.c:581
+msgid	"Processing saved articles marked for deletion."
+msgstr	""
+
+#: src/lang.c:582
 #, c-format
 msgid	"Accept Followup-To? %s=post, %s=ignore, %s=quit: "
 msgstr	""
 
-#: src/lang.c:674
+#: src/lang.c:583
 msgid	"Article unchanged, abort mailing?"
 msgstr	""
 
-#: src/lang.c:675
+#: src/lang.c:584
 #, c-format
 msgid	"Do you want to see postponed articles (%d)?"
 msgstr	""
 
-#: src/lang.c:676
+#: src/lang.c:586
 msgid	"Add quick kill filter?"
 msgstr	""
 
-#: src/lang.c:677
+#: src/lang.c:587
 msgid	"Add quick selection filter?"
 msgstr	""
 
-#: src/lang.c:678
+#: src/lang.c:588
 msgid	"Do you really want to quit?"
 msgstr	""
 
-#: src/lang.c:679
+#: src/lang.c:589
 msgid	"%s=edit cancel message, %s=quit, %s=delete (cancel) [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:680
+#: src/lang.c:590
 msgid	"You have tagged articles in this group - quit anyway?"
 msgstr	""
 
-#: src/lang.c:681
+#: src/lang.c:591
 #, c-format
 msgid	"%s=quit, %s=edit, %s=postpone: "
 msgstr	""
 
-#: src/lang.c:682
+#: src/lang.c:592
 #, c-format
 msgid	"%s=quit %s=edit %s=save kill description: "
 msgstr	""
 
-#: src/lang.c:683
+#: src/lang.c:593
 #, c-format
 msgid	"%s=quit %s=edit %s=save select description: "
 msgstr	""
 
-#: src/lang.c:684
+#: src/lang.c:594
 msgid	"Do you really want to quit without saving your configuration?"
 msgstr	""
 
-#: src/lang.c:686
+#: src/lang.c:597
 msgid	"Invalid range - valid are '0-9.$' eg. 1-$"
 msgstr	""
 
-#: src/lang.c:687
+#: src/lang.c:598
 msgid	"Do you want to abort this operation?"
 msgstr	""
 
-#: src/lang.c:688
+#: src/lang.c:599
 msgid	"Do you want to exit tin immediately?"
 msgstr	""
 
-#: src/lang.c:689
+#: src/lang.c:600
 msgid	"Read response> "
 msgstr	""
 
-#: src/lang.c:690
+#: src/lang.c:601
 msgid	"Reading ('q' to quit)..."
 msgstr	""
 
-#: src/lang.c:691
+#: src/lang.c:602
 #, c-format
 msgid	"Reading %sarticles..."
 msgstr	""
 
-#: src/lang.c:692
+#: src/lang.c:603
 #, c-format
 msgid	"Reading %sattributes file...\n"
 msgstr	""
 
-#: src/lang.c:693
+#: src/lang.c:604
 #, c-format
 msgid	"Reading %sconfig file...\n"
 msgstr	""
 
-#: src/lang.c:694
+#: src/lang.c:605
 msgid	"Reading filter file...\n"
 msgstr	""
 
-#: src/lang.c:695
+#: src/lang.c:606
 #, c-format
 msgid	"Reading %s groups..."
 msgstr	""
 
-#: src/lang.c:696
+#: src/lang.c:607
 msgid	"Reading input history file...\n"
 msgstr	""
 
-#: src/lang.c:697
+#: src/lang.c:608
 msgid	"Reading keymap file...\n"
 msgstr	""
 
-#: src/lang.c:699
-msgid	"Reading mail active file... "
-msgstr	""
-
-#: src/lang.c:700
-msgid	"Reading mailgroups file... "
-msgstr	""
-
-#: src/lang.c:702
+#: src/lang.c:609
 msgid	"Reading groups from active file... "
 msgstr	""
 
-#: src/lang.c:703
+#: src/lang.c:610
 msgid	"Reading groups from newsrc file... "
 msgstr	""
 
-#: src/lang.c:704
+#: src/lang.c:611
 msgid	"Reading newsgroups file... "
 msgstr	""
 
-#: src/lang.c:705
+#: src/lang.c:612
 msgid	"Reading newsrc file..."
 msgstr	""
 
-#: src/lang.c:706
-msgid	"Connection to news server has timed out. Reconnect?"
-msgstr	""
-
-#: src/lang.c:707
+#: src/lang.c:613
 #, c-format
 msgid	"Bogus group %s removed."
 msgstr	""
 
-#: src/lang.c:708
+#: src/lang.c:614
 #, c-format
 msgid	"Error: rename %s to %s"
 msgstr	""
 
-#: src/lang.c:709
+#: src/lang.c:615
 msgid	"Reply to author..."
 msgstr	""
 
-#: src/lang.c:710
+#: src/lang.c:616
 msgid	"Repost"
 msgstr	""
 
-#: src/lang.c:711
+#: src/lang.c:617
 msgid	"Reposting article..."
 msgstr	""
 
-#: src/lang.c:712
+#: src/lang.c:618
 #, c-format
 msgid	"Repost article(s) to group(s) [%s]> "
 msgstr	""
 
-#: src/lang.c:713
+#: src/lang.c:619
 msgid	"Reset newsrc?"
 msgstr	""
 
-#: src/lang.c:714
+#: src/lang.c:620
 msgid	"Responses have been directed to the following newsgroups"
 msgstr	""
 
-#: src/lang.c:715
+#: src/lang.c:621
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	""
 
-#: src/lang.c:716
+#: src/lang.c:622
 #, c-format
-msgid	"RespNo %3d of %3d%s"
+msgid	"RespNo %4d of %4d%s"
 msgstr	""
 
-#: src/lang.c:717
+#: src/lang.c:623
 msgid	"Press <RETURN> to continue..."
 msgstr	""
 
-#: src/lang.c:718
+#: src/lang.c:625
+#, c-format
+msgid	"Select From    [%-*.*s] (y/n): "
+msgstr	""
+
+#: src/lang.c:626
+msgid	"Select Lines: (</>num): "
+msgstr	""
+
+#: src/lang.c:627
+msgid	"Auto-select Article Menu"
+msgstr	""
+
+#: src/lang.c:628
+#, c-format
+msgid	"Select Msg-Id  [%-*.*s] (f/l/o/n): "
+msgstr	""
+
+#: src/lang.c:629
+msgid	"Select pattern scope: "
+msgstr	""
+
+#: src/lang.c:630
+#, c-format
+msgid	"Select Subject [%-*.*s] (y/n): "
+msgstr	""
+
+#: src/lang.c:631
+msgid	"Select text pattern : "
+msgstr	""
+
+#: src/lang.c:632
+msgid	"Select time in days   : "
+msgstr	""
+
+#: src/lang.c:633
+#, c-format
+msgid	"# %s server configuration file\n"
+	"# This file was automatically saved by %s %s %s (\"%s\")\n"
+	"#\n"
+	"# Do not edit while %s is running, since all your changes to this file\n"
+	"# will be overwritten when you leave %s.\n"
+	"# Do not edit at all if you don't know what you do.\n"
+	"############################################################################\n"
+	"\n"
+msgstr	""
+
+#: src/lang.c:639
+msgid	"Showing unread groups only"
+msgstr	""
+
+#: src/lang.c:640
+msgid	"Subject: line (ignore case)   "
+msgstr	""
+
+#: src/lang.c:641
+msgid	"Subject: line (case sensitive)"
+msgstr	""
+
+#: src/lang.c:642
 msgid	"Save"
 msgstr	""
 
-#: src/lang.c:719
+#: src/lang.c:643
 #, c-format
 msgid	"Save '%s' (%s/%s)?"
 msgstr	""
 
-#: src/lang.c:720
+#: src/lang.c:644
 msgid	"Save configuration before continuing?"
 msgstr	""
 
-#: src/lang.c:721
+#: src/lang.c:645
 msgid	"Save filename> "
 msgstr	""
 
-#: src/lang.c:722
+#: src/lang.c:646
 msgid	"Saved"
 msgstr	""
 
-#: src/lang.c:723
+#: src/lang.c:647
 #, c-format
 msgid	"%4d unread (%4d hot) %s in %s\n"
 msgstr	""
 
-#: src/lang.c:724
+#: src/lang.c:648
 #, c-format
 msgid	"Saved %s...\n"
 msgstr	""
 
-#: src/lang.c:725
+#: src/lang.c:649
 msgid	"Nothing was saved"
 msgstr	""
 
-#: src/lang.c:726
+#: src/lang.c:650
 #, c-format
 msgid	"\n"
 	"%s %d %s from %d %s\n"
 msgstr	""
 
-#: src/lang.c:727
+#: src/lang.c:651
 #, c-format
 msgid	"-- %s saved to %s%s --"
 msgstr	""
 
-#: src/lang.c:728
+#: src/lang.c:652
 #, c-format
 msgid	"-- %s saved to %s - %s --"
 msgstr	""
 
-#: src/lang.c:729
+#: src/lang.c:653
 msgid	"Saving..."
 msgstr	""
 
-#: src/lang.c:730
+#: src/lang.c:654
 #, c-format
 msgid	"%s: Screen initialization failed"
 msgstr	"%s: Screen initialisation failed"
 
-#: src/lang.c:731
+#: src/lang.c:655
 #, c-format
 msgid	"%s: screen is too small\n"
 msgstr	""
 
-#: src/lang.c:732
+#: src/lang.c:656
 #, c-format
 msgid	"screen is too small, %s is exiting\n"
 msgstr	""
 
-#: src/lang.c:733
+#: src/lang.c:657
 #, c-format
 msgid	"Search backwards [%s]> "
 msgstr	""
 
-#: src/lang.c:734
+#: src/lang.c:658
 #, c-format
 msgid	"Search body [%s]> "
 msgstr	""
 
-#: src/lang.c:735
+#: src/lang.c:659
 #, c-format
 msgid	"Search forwards [%s]> "
 msgstr	""
 
-#: src/lang.c:736
+#: src/lang.c:660
 msgid	"Searching..."
 msgstr	""
 
-#: src/lang.c:737
+#: src/lang.c:661
 #, c-format
 msgid	"Searching article %d of %d ('q' to abort)..."
 msgstr	""
 
-#: src/lang.c:738
+#: src/lang.c:662
 msgid	"Select article> "
 msgstr	""
 
-#: src/lang.c:739
+#: src/lang.c:663
 msgid	"Select option number before text or use arrow keys and <CR>. 'q' to quit."
 msgstr	""
 
-#: src/lang.c:740
+#: src/lang.c:664
 msgid	"Select group> "
 msgstr	""
 
-#: src/lang.c:741
+#: src/lang.c:665
 #, c-format
 msgid	"Enter selection pattern [%s]> "
 msgstr	""
 
-#: src/lang.c:742
+#: src/lang.c:666
 msgid	"Select thread > "
 msgstr	""
 
-#: src/lang.c:743
+#: src/lang.c:667
 #, c-format
 msgid	"%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n"
 msgstr	""
 
-#: src/lang.c:744
-#, c-format
-msgid	"Put the server name in the file %s,\n"
-	"or set the environment variable NNTPSERVER"
-msgstr	""
-
-#: src/lang.c:745
+#: src/lang.c:668
 msgid	"servers active-file"
 msgstr	""
 
-#: src/lang.c:747
-#, c-format
-msgid	"Shell Command (%s)"
-msgstr	""
-
-#: src/lang.c:748
-#, c-format
-msgid	"Enter shell command [%s]> "
-msgstr	""
-
-#: src/lang.c:750
+#: src/lang.c:669
 msgid	"Cannot move into new newsgroups. Subscribe first..."
 msgstr	""
 
-#: src/lang.c:751
+#: src/lang.c:670
 msgid	"<SPACE>"
 msgstr	""
 
-#: src/lang.c:752
+#: src/lang.c:671
 #, c-format
 msgid	"Starting: (%s)"
 msgstr	""
 
-#: src/lang.c:753
+#: src/lang.c:672
 #, c-format
 msgid	"List Thread (%d of %d)"
 msgstr	""
 
-#: src/lang.c:754
+#: src/lang.c:673
 #, c-format
 msgid	"Thread (%.*s)"
 msgstr	""
 
-#: src/lang.c:755
+#: src/lang.c:674
 msgid	"Enter wildcard subscribe pattern> "
 msgstr	""
 
-#: src/lang.c:756
+#: src/lang.c:675
 #, c-format
 msgid	"subscribed to %d groups"
 msgstr	""
 
-#: src/lang.c:757
+#: src/lang.c:676
 #, c-format
 msgid	"Subscribed to %s"
 msgstr	""
 
-#: src/lang.c:758
+#: src/lang.c:677
 msgid	"Subscribing... "
 msgstr	""
 
-#: src/lang.c:759
+#: src/lang.c:678
 msgid	"Repost or supersede article(s) [%%.*s]? (%s/%s/%s): "
 msgstr	""
 
-#: src/lang.c:760
+#: src/lang.c:679
 #, c-format
 msgid	"Supersede article(s) to group(s) [%s]> "
 msgstr	""
 
-#: src/lang.c:761
+#: src/lang.c:680
 msgid	"Superseding article ..."
 msgstr	""
 
-#: src/lang.c:762
+#: src/lang.c:681
 #, c-format
 msgid	"\n"
 	"Stopped. Type 'fg' to restart %s\n"
 msgstr	""
 
-#: src/lang.c:763
+#: src/lang.c:683
+#, c-format
+msgid	"%d days"
+msgstr	""
+
+#: src/lang.c:684
 msgid	"<TAB>"
 msgstr	""
 
-#: src/lang.c:764
+#: src/lang.c:685
 msgid	"Tagged article"
 msgstr	""
 
-#: src/lang.c:765
+#: src/lang.c:686
 msgid	"Tagged thread"
 msgstr	""
 
-#: src/lang.c:768
-msgid	"# For color-adjust use the following numbers\n"
-	"#  0-black       1-red         2-green        3-brown\n"
-	"#  4-blue        5-pink        6-cyan         7-white\n"
-	"# These are *only* for foreground:\n"
-	"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
-	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
-	"# A '-1' is interpreted as default (foreground normally is white, and\n"
-	"# background black)\n"
-	"\n"
-msgstr	"# For colour-adjust use the following numbers\n"
-	"#  0-black       1-red         2-green        3-brown\n"
-	"#  4-blue        5-pink        6-cyan         7-white\n"
-	"# These are *only* for foreground:\n"
-	"#  8-grey        9-lightred   10-lightgreen  11-yellow\n"
-	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
-	"# A '-1' is interpreted as default (foreground normally is white, and\n"
-	"# background black)\n"
-	"\n"
-
-#: src/lang.c:778
+#: src/lang.c:687
 msgid	"# Default action/prompt strings\n"
 msgstr	""
 
-#: src/lang.c:779
+#: src/lang.c:688
 msgid	"# Defaults for quick (1 key) kill & auto-selection filters\n"
 	"# header=NUM  0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n"
 	"#             5=Message-ID: & last References: entry only\n"
@@ -2817,788 +2696,860 @@ msgid	"# Defaults for quick (1 key) kill
 	"# expire=ON/OFF  ON=limit to default_filter_days OFF=don't ever expire\n"
 msgstr	""
 
-#: src/lang.c:794
+#: src/lang.c:701
 msgid	"# If ON use print current subject or newsgroup description in the last line\n"
 msgstr	""
 
-#: src/lang.c:795
+#: src/lang.c:702
 msgid	"# Host & time info used for detecting new groups (don't touch)\n"
 msgstr	""
 
-#: src/lang.c:796
-msgid	"Enter wildcard unsubscribe pattern> "
+#: src/lang.c:703
+msgid	"There is no news\n"
 msgstr	""
 
-#: src/lang.c:797
-#, c-format
-msgid	"View '%s' (%s/%s)?"
+#: src/lang.c:704
+msgid	"Thread"
 msgstr	""
 
-#.
-#. * Special value used to override option-list behavior
-#.
-#: src/lang.c:802 src/lang.c:866
-msgid	"Default"
+#: src/lang.c:705
+msgid	"Thread Level Commands"
 msgstr	""
 
-#: src/lang.c:814 src/lang.c:839 src/lang.c:855 src/refs.c:266
-msgid	"None"
+#: src/lang.c:706
+msgid	"Thread deselected"
 msgstr	""
 
-#: src/lang.c:815
-msgid	"Subject"
+#: src/lang.c:707
+msgid	"Thread selected"
 msgstr	""
 
-#: src/lang.c:816
-msgid	"References"
+#: src/lang.c:708
+msgid	"Thread range"
 msgstr	""
 
-#: src/lang.c:817
-msgid	"Both Subject and References"
+#: src/lang.c:709
+#, c-format
+msgid	"%sThread %4s of %4s"
 msgstr	""
 
-#: src/lang.c:818
-msgid	"Multipart Subject"
+#: src/lang.c:710
+msgid	"Threading articles..."
 msgstr	""
 
-#: src/lang.c:830 src/lang.c:941
-msgid	"No"
+#: src/lang.c:711
+#, c-format
+msgid	"Toggled word highlighting %s"
 msgstr	""
 
-#: src/lang.c:831 src/lang.c:943
-msgid	"Yes"
+#: src/lang.c:712
+msgid	"Toggled rot13 encoding"
 msgstr	""
 
-#: src/lang.c:832
-msgid	"Hide All"
+#: src/lang.c:713
+#, c-format
+msgid	"Toggled german TeX encoding %s"
 msgstr	""
 
-#: src/lang.c:840
-msgid	"Address"
+#: src/lang.c:714
+#, c-format
+msgid	"Toggled tab-width to %d"
 msgstr	""
 
-#: src/lang.c:841
-msgid	"Full Name"
+#: src/lang.c:715
+#, c-format
+msgid	"%d Trying to dotlock %s"
 msgstr	""
 
-#: src/lang.c:842
-msgid	"Address and Name"
+#: src/lang.c:716
+#, c-format
+msgid	"%d Trying to lock %s"
 msgstr	""
 
-#: src/lang.c:849
-msgid	"Max"
+#: src/lang.c:717
+msgid	"           h=help\n"
 msgstr	""
 
-#: src/lang.c:850
-msgid	"Sum"
+#: src/lang.c:719
+msgid	"Unlimited"
 msgstr	""
 
-#: src/lang.c:851
-msgid	"Average"
+#: src/lang.c:720
+msgid	"Enter wildcard unsubscribe pattern> "
 msgstr	""
 
-#: src/lang.c:856
-msgid	"Lines"
+#: src/lang.c:721
+#, c-format
+msgid	"Error decoding %s : %s"
 msgstr	""
 
-#: src/lang.c:857
-msgid	"Score"
+#: src/lang.c:722
+msgid	"No end."
 msgstr	""
 
-#: src/lang.c:858
-msgid	"Lines & Score"
+#: src/lang.c:723
+#, c-format
+msgid	"%s successfully decoded."
 msgstr	""
 
-#: src/lang.c:867
-msgid	"Black"
+#: src/lang.c:724
+#, c-format
+msgid	"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
+	"\n"
 msgstr	""
 
-#: src/lang.c:868
-msgid	"Red"
+#: src/lang.c:725
+msgid	"unread "
 msgstr	""
 
-#: src/lang.c:869
-msgid	"Green"
+#: src/lang.c:726
+#, c-format
+msgid	"unsubscribed from %d groups"
 msgstr	""
 
-#: src/lang.c:870
-msgid	"Brown"
+#: src/lang.c:727
+#, c-format
+msgid	"Unsubscribed from %s"
 msgstr	""
 
-#: src/lang.c:871
-msgid	"Blue"
+#: src/lang.c:728
+msgid	"Unsubscribing... "
 msgstr	""
 
-#: src/lang.c:872
-msgid	"Pink"
+#: src/lang.c:729
+msgid	"Untagged article"
 msgstr	""
 
-#: src/lang.c:873
-msgid	"Cyan"
+#: src/lang.c:730
+msgid	"Untagged thread"
 msgstr	""
 
-#: src/lang.c:874
-msgid	"White"
+#: src/lang.c:731
+msgid	"Unthreading articles..."
 msgstr	""
 
-#: src/lang.c:875
-msgid	"Gray"
-msgstr	"Grey"
+#: src/lang.c:732
+msgid	"Updated"
+msgstr	""
 
-#: src/lang.c:876
-msgid	"Light Red"
+#: src/lang.c:733
+msgid	"Updating"
 msgstr	""
 
-#: src/lang.c:877
-msgid	"Light Green"
+#: src/lang.c:734
+#, c-format
+msgid	"Opening %s\n"
 msgstr	""
 
-#: src/lang.c:878
-msgid	"Yellow"
+#: src/lang.c:735
+msgid	"No more URL's in this article"
 msgstr	""
 
-#: src/lang.c:879
-msgid	"Light Blue"
+#: src/lang.c:736
+msgid	"Use MIME display program for this message?"
 msgstr	""
 
-#: src/lang.c:880
-msgid	"Light Pink"
+#: src/lang.c:737
+msgid	"  -c       mark all news as read in subscribed newsgroups (batch mode)"
 msgstr	""
 
-#: src/lang.c:881
-msgid	"Light Cyan"
+#: src/lang.c:738
+msgid	"  -Z       return status indicating if any unread news (batch mode)"
 msgstr	""
 
-#: src/lang.c:882
-msgid	"Light White"
+#: src/lang.c:739
+msgid	"  -q       don't check for new newsgroups"
 msgstr	""
 
-#: src/lang.c:890 src/lang.c:947 src/lang.c:961
-msgid	"Nothing"
+#: src/lang.c:740
+msgid	"  -X       don't save any files on quit"
 msgstr	""
 
-#: src/lang.c:891
-msgid	"Mark"
+#: src/lang.c:741
+msgid	"  -d       don't show newsgroup descriptions"
 msgstr	""
 
-#: src/lang.c:892
-msgid	"Space"
+#: src/lang.c:742
+msgid	"  -G limit get only limit articles/group"
 msgstr	""
 
-#: src/lang.c:899
-msgid	"Normal"
+#: src/lang.c:743
+#, c-format
+msgid	"  -H       help information about %s"
 msgstr	""
 
-#: src/lang.c:900
-msgid	"Best highlighting"
+#: src/lang.c:744
+msgid	"  -h       this help message"
 msgstr	""
 
-#: src/lang.c:901
-msgid	"Underline"
+#: src/lang.c:745
+#, c-format
+msgid	"  -I dir   news index file directory [default=%s]"
 msgstr	""
 
-#: src/lang.c:902
-msgid	"Reverse video"
+#: src/lang.c:746
+msgid	"  -u       update index files (batch mode)"
 msgstr	""
 
-#: src/lang.c:903
-msgid	"Blinking"
+#: src/lang.c:747
+#, c-format
+msgid	"  -m dir   mailbox directory [default=%s]"
 msgstr	""
 
-#: src/lang.c:904
-msgid	"Half bright"
+#: src/lang.c:748
+#, c-format
+msgid	"\n"
+	"Mail bug reports/comments to %s"
 msgstr	""
 
-#: src/lang.c:905
-msgid	"Bold"
+#: src/lang.c:749
+msgid	"  -N       mail new news to your posts (batch mode)"
 msgstr	""
 
-#: src/lang.c:910
-msgid	"none"
+#: src/lang.c:750
+msgid	"  -M user  mail new news to specified user (batch mode)"
 msgstr	""
 
-#: src/lang.c:911
-msgid	"commands"
+#: src/lang.c:751
+#, c-format
+msgid	"  -f file  subscribed to newsgroups file [default=%s]"
 msgstr	""
 
-#: src/lang.c:912
-msgid	"select"
+#: src/lang.c:752
+msgid	"  -w       post an article and exit"
 msgstr	""
 
-#: src/lang.c:914
-msgid	"commands & quit"
+#: src/lang.c:753
+msgid	"  -o       post all postponed articles and exit"
 msgstr	""
 
-#: src/lang.c:915
-msgid	"commands & select"
+#: src/lang.c:754
+msgid	"  -r       read news remotely from default NNTP server"
 msgstr	""
 
-#: src/lang.c:916
-msgid	"quit & select"
+#: src/lang.c:755
+msgid	"  -R       read news saved by -S option"
 msgstr	""
 
-#: src/lang.c:917
-msgid	"commands & quit & select"
+#: src/lang.c:756
+#, c-format
+msgid	"  -s dir   save news directory [default=%s]"
 msgstr	""
 
-#: src/lang.c:942
-msgid	"Shell archive"
+#: src/lang.c:757
+msgid	"  -S       save new news for later reading (batch mode)"
 msgstr	""
 
-#: src/lang.c:948
-msgid	"Subject: (descending)"
+#: src/lang.c:758
+msgid	"  -z       start if any unread news"
 msgstr	""
 
-#: src/lang.c:949
-msgid	"Subject: (ascending)"
+#: src/lang.c:759
+#, c-format
+msgid	"A Usenet reader.\n"
+	"\n"
+	"Usage: %s [options] [newsgroup[,...]]"
 msgstr	""
 
-#: src/lang.c:950
-msgid	"From: (descending)"
+#: src/lang.c:760
+msgid	"  -v       verbose output for batch mode options"
 msgstr	""
 
-#: src/lang.c:951
-msgid	"From: (ascending)"
+#: src/lang.c:761
+msgid	"  -V       print version & date information"
 msgstr	""
 
-#: src/lang.c:952
-msgid	"Date: (descending)"
+#: src/lang.c:762
+#, c-format
+msgid	"%s only useful without batch mode operations\n"
 msgstr	""
 
-#: src/lang.c:953
-msgid	"Date: (ascending)"
+#: src/lang.c:763
+#, c-format
+msgid	"%s only useful for batch mode operations\n"
 msgstr	""
 
-#: src/lang.c:954 src/lang.c:962
-msgid	"Score (descending)"
+#: src/lang.c:765
+#, c-format
+msgid	"\n"
+	"%s%d out of range (0 - %d). Reset to 0"
 msgstr	""
 
-#: src/lang.c:955 src/lang.c:963
-msgid	"Score (ascending)"
+#: src/lang.c:766
+#, c-format
+msgid	"View '%s' (%s/%s)?"
 msgstr	""
 
-#: src/lang.c:956
-msgid	"Lines: (descending)"
+#: src/lang.c:768
+#, c-format
+msgid	"\n"
+	"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
+	"%-100s\n"
 msgstr	""
 
-#: src/lang.c:957
-msgid	"Lines: (ascending)"
+#: src/lang.c:769
+msgid	"\n"
+	"Warning: article unchanged after editing\n"
 msgstr	""
 
-#: src/lang.c:968
-msgid	"Always Keep"
+#: src/lang.c:770
+msgid	"\n"
+	"Warning: \"Subject:\" contains only whitespaces.\n"
 msgstr	""
 
-#: src/lang.c:969
-msgid	"Always Remove"
+#: src/lang.c:771
+msgid	"\n"
+	"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n"
 msgstr	""
 
-#: src/lang.c:970
-msgid	"Mark with D on selection screen"
+#: src/lang.c:773
+msgid	"\n"
+	"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
+	"         with \"Re: \" and does not contain \"(was:\".\n"
 msgstr	""
 
-#: src/lang.c:975
-msgid	"Kill only unread arts"
+#: src/lang.c:776
+msgid	"Read carefully!\n"
+	"\n"
+	"  You are about to cancel an article seemingly written by you. This will "
+	"wipe\n"
+	"  the article from most  news servers  throughout the world,  but there is "
+	"no\n"
+	"  guarantee that it will work.\n"
+	"\n"
+	"This is the article you are about to cancel:\n"
+	"\n"
 msgstr	""
 
-#: src/lang.c:976
-msgid	"Kill all arts & show with K"
+#: src/lang.c:780
+msgid	"\n"
+	"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
+	"         quoted-printable) and an external inews program to submit your\n"
+	"         article. If a signature is appended by that inews program it will\n"
+	"         not be encoded properly.\n"
 msgstr	""
 
-#: src/lang.c:977
-msgid	"Kill all arts and never show"
+#: src/lang.c:785
+#, c-format
+msgid	"\n"
+	"\n"
+	"You are upgrading to tin %s from an earlier version.\n"
+	"Some values in your %s file have changed!\n"
+	"Read WHATSNEW, etc...\n"
 msgstr	""
 
-#: src/lang.c:982
-msgid	"Nothing special"
+#: src/lang.c:787
+#, c-format
+msgid	"\n"
+	"\n"
+	"You are downgrading to tin %s from a more recent version!\n"
+	"Some values in your %s file may be ignored, others might have changed!\n"
 msgstr	""
 
-#: src/lang.c:983
-msgid	"Compress quotes"
+#: src/lang.c:790
+#, c-format
+msgid	"Warning: tin wrote fewer groups to your\n"
+	"\t%s\n"
+	"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
+	"this session this indicates an error and you should backup your %s\n"
+	"before you start tin once again!\n"
 msgstr	""
 
-#: src/lang.c:984
-msgid	"Quote signatures"
+#: src/lang.c:794
+#, c-format
+msgid	"\n"
+	"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
 msgstr	""
 
-#: src/lang.c:985
-msgid	"Compress quotes, quote sigs"
+#: src/lang.c:795
+#, c-format
+msgid	"Warning: Only %d out of %d articles were saved"
 msgstr	""
 
-#: src/lang.c:986
-msgid	"Quote empty lines"
+#: src/lang.c:796
+#, c-format
+msgid	"\n"
+	"Warning: Your signature  is longer than %d lines.  Since signatures usually "
+	"do\n"
+	"         not  transport any  useful information,  they should be as  short "
+	"as\n"
+	"         possible.\n"
 msgstr	""
 
-#: src/lang.c:987
-msgid	"Compress quotes, quote empty lines"
+#: src/lang.c:800
+#, c-format
+msgid	"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
 msgstr	""
 
-#: src/lang.c:988
-msgid	"Quote sigs & empty lines"
+#: src/lang.c:801
+msgid	"\n"
+	"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
 msgstr	""
 
-#: src/lang.c:989
-msgid	"Comp. q., quote sigs & empty lines"
+#: src/lang.c:802
+msgid	"Writing attributes file..."
 msgstr	""
 
-#: src/lang.c:1026
-msgid	"Print"
+#: src/lang.c:804
+#, c-format
+msgid	"%d Responses%s"
 msgstr	""
 
-#: src/lang.c:1027
-msgid	"Printing..."
+#: src/lang.c:806
+#, c-format
+msgid	"Added %d %s"
 msgstr	""
 
-#: src/lang.c:1032
-#, c-format
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
+#: src/lang.c:807
+msgid	"No unsubscribed groups to show"
 msgstr	""
 
-#: src/lang.c:1033
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
+#: src/lang.c:808
+msgid	"Showing subscribed to groups only"
 msgstr	""
 
-#: src/lang.c:1034
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=post, %s=postpone [%%.*s]: "
+#: src/lang.c:809
+msgid	"Yes "
 msgstr	""
 
-#: src/lang.c:1036
+#: src/lang.c:810
+msgid	"    You have mail\n"
+msgstr	""
+
+#: src/lang.c:815
 #, c-format
-msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
+msgid	"\n"
+	"Warning: Posting is in %s and contains characters which are not\n"
+	"         in your selected MM_NETWORK_CHARSET: %s.\n"
+	"         These characters will be replaced by '?' if you post this\n"
+	"         article unchanged. To avoid garbling your article please either\n"
+	"         edit it and remove those characters or change the setting of\n"
+	"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
+	"         M)enu option.\n"
 msgstr	""
 
-#: src/lang.c:1037
-msgid	"%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
+#: src/lang.c:826
+#, c-format
+msgid	"Redefined key %s '%s' -> '%s'\n"
 msgstr	""
 
-#: src/lang.c:1038
-msgid	"%s=quit, %s=edit, %s=pgp, %s=post, %s=postpone [%%.*s]: "
+#: src/lang.c:827
+msgid	"  -D       debug mode 1=NNTP 2=ALL"
 msgstr	""
 
-#: src/lang.c:1042
-#, c-format
-msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
+#: src/lang.c:831
+msgid	"Read carefully!\n"
+	"\n"
+	"  You are about to cancel an article seemingly not written by you.  This "
+	"will\n"
+	"  wipe the article from lots of news servers throughout the world;\n"
+	"  Usenet's majority  considers this  rather inappropriate,  to say the "
+	"least.\n"
+	"  Only press 'd'  if you are  absolutely positive  that you are ready to "
+	"take\n"
+	"  the rap.\n"
+	"\n"
+	"This is the article you are about to cancel:\n"
+	"\n"
 msgstr	""
 
-#: src/lang.c:1043
-msgid	"%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
+#: src/lang.c:840
+msgid	"toggle color"
+msgstr	"toggle colour"
+
+#: src/lang.c:841
+msgid	"# For color-adjust use the following numbers\n"
+	"#  0-black       1-red         2-green        3-brown\n"
+	"#  4-blue        5-pink        6-cyan         7-white\n"
+	"# These are *only* for foreground:\n"
+	"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
+	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
+	"# A '-1' is interpreted as default (foreground normally is white, and\n"
+	"# background black)\n"
+	"\n"
+msgstr	"# For colour-adjust use the following numbers\n"
+	"#  0-black       1-red         2-green        3-brown\n"
+	"#  4-blue        5-pink        6-cyan         7-white\n"
+	"# These are *only* for foreground:\n"
+	"#  8-grey        9-lightred   10-lightgreen  11-yellow\n"
+	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
+	"# A '-1' is interpreted as default (foreground normally is white, and\n"
+	"# background black)\n"
+	"\n"
+
+#: src/lang.c:849
+msgid	"  -a       toggle color flag"
+msgstr	"  -a       toggle colour flag"
+
+#: src/lang.c:853
+msgid	"\n"
+	"Error: Followup-To set to more than one newsgroup!\n"
 msgstr	""
 
-#: src/lang.c:1044
-msgid	"%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: "
+#: src/lang.c:854
+#, c-format
+msgid	"\n"
+	"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
 msgstr	""
 
-#: src/lang.c:1046
+#: src/lang.c:855
 #, c-format
-msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
+msgid	"\n"
+	"Error: \"%s\" is not a valid newsgroup!\n"
 msgstr	""
 
-#: src/lang.c:1047
-msgid	"%s=quit, %s=edit, %s=send [%%.*s]: "
+#: src/lang.c:857
+msgid	"\n"
+	"Warning: Followup-To set to more than one newsgroup!\n"
 msgstr	""
 
-#: src/lang.c:1048
-msgid	"%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: "
+#: src/lang.c:858
+#, c-format
+msgid	"\n"
+	"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
 msgstr	""
 
-#: src/lang.c:1052
+#: src/lang.c:859
 #, c-format
-msgid	" at %s"
+msgid	"\n"
+	"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
 msgstr	""
 
-#: src/lang.c:1053
-msgid	"There is no news\n"
+#: src/lang.c:860
+#, c-format
+msgid	"\n"
+	"Warning: \"%s\" is not a valid newsgroup at this site!\n"
 msgstr	""
 
-#: src/lang.c:1054
-msgid	"Thread"
+#: src/lang.c:864
+#, c-format
+msgid	"%d files successfully written from %d articles. %d %s occurred."
 msgstr	""
 
-#: src/lang.c:1055
-msgid	"Thread Level Commands"
+#: src/lang.c:865
+msgid	"Missing parts."
 msgstr	""
 
-#: src/lang.c:1056
-msgid	"Thread deselected"
+#: src/lang.c:866
+msgid	"No beginning."
 msgstr	""
 
-#: src/lang.c:1057
-msgid	"Thread selected"
+#: src/lang.c:867
+msgid	"No data."
 msgstr	""
 
-#: src/lang.c:1058
-msgid	"Thread range"
+#: src/lang.c:868
+msgid	"Unknown error."
 msgstr	""
 
-#: src/lang.c:1059
+#: src/lang.c:870
 #, c-format
-msgid	"%sThread %4s of %4s"
+msgid	"\tChecksum of %s (%ld %s)"
 msgstr	""
 
-#: src/lang.c:1060
-msgid	"Threading articles..."
+#: src/lang.c:874
+msgid	"Reading mail active file... "
 msgstr	""
 
-#: src/lang.c:1061
-#, c-format
-msgid	"Toggled word highlighting %s"
+#: src/lang.c:875
+msgid	"Reading mailgroups file... "
 msgstr	""
 
-#: src/lang.c:1062
-msgid	"Toggled rot13 encoding"
+#: src/lang.c:879
+msgid	"perform PGP operations on article"
 msgstr	""
 
-#: src/lang.c:1063
-#, c-format
-msgid	"Toggled german TeX encoding %s"
+#: src/lang.c:880
+msgid	"Add key(s) to public keyring?"
 msgstr	""
 
-#: src/lang.c:1064
+#: src/lang.c:881
 #, c-format
-msgid	"Toggled tab-width to %d"
+msgid	"%s=encrypt, %s=sign, %s=both, %s=quit: "
 msgstr	""
 
-#: src/lang.c:1065
+#: src/lang.c:882
 #, c-format
-msgid	"Trying %s"
+msgid	"%s=sign, %s=sign & include public key, %s=quit: "
 msgstr	""
 
-#: src/lang.c:1066
+#: src/lang.c:883
 #, c-format
-msgid	"%d Trying to dotlock %s"
+msgid	"PGP has not been set up (can't open %s)"
 msgstr	""
 
-#: src/lang.c:1067
+#: src/lang.c:884
+msgid	"Article not signed and no public keys found"
+msgstr	""
+
+#: src/lang.c:886
 #, c-format
-msgid	"%d Trying to lock %s"
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
 msgstr	""
 
-#: src/lang.c:1068
-msgid	"           h=help\n"
+#: src/lang.c:887
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:1069
-msgid	"unread "
+#: src/lang.c:888
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:1070
+#: src/lang.c:890
 #, c-format
-msgid	"unsubscribed from %d groups"
+msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
 msgstr	""
 
-#: src/lang.c:1071
-#, c-format
-msgid	"Unsubscribed from %s"
+#: src/lang.c:891
+msgid	"%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:1072
-msgid	"Unsubscribing... "
+#: src/lang.c:892
+msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:1073
-msgid	"Untagged article"
+#: src/lang.c:896
+#, c-format
+msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
 msgstr	""
 
-#: src/lang.c:1074
-msgid	"Untagged thread"
+#: src/lang.c:897
+msgid	"%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:1075
-msgid	"Unthreading articles..."
+#: src/lang.c:898
+msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:1076
-msgid	"Updated"
+#: src/lang.c:900
+#, c-format
+msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
 msgstr	""
 
-#: src/lang.c:1077
-msgid	"Updating"
+#: src/lang.c:901
+msgid	"%s=quit, %s=edit, %s=send [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:1078
-#, c-format
-msgid	"Opening %s\n"
+#: src/lang.c:902
+msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: "
 msgstr	""
 
-#: src/lang.c:1079
-msgid	"No more URL's in this article"
+#: src/lang.c:908
+#, c-format
+msgid	"Environment variable %s not found. Set and retry..."
 msgstr	""
 
-#: src/lang.c:1080
-msgid	"Use MIME display program for this message?"
+#: src/lang.c:909
+msgid	"  -B       BBS mode. File operations limited to home directories."
 msgstr	""
 
-#: src/lang.c:1081
-msgid	"  -c       mark all news as read in subscribed newsgroups (batch mode)"
+#: src/lang.c:917
+msgid	"Try cache_overview_files to speed up things.\n"
 msgstr	""
 
-#: src/lang.c:1082
-msgid	"  -Z       return status indicating if any unread news (batch mode)"
+#: src/lang.c:918
+msgid	"Tin will use local index files instead.\n"
 msgstr	""
 
-#: src/lang.c:1083
-msgid	"  -q       don't check for new newsgroups"
-msgstr	""
-
-#: src/lang.c:1084
-msgid	"  -X       don't save any files on quit"
+#: src/lang.c:919
+msgid	"Cannot find NNTP server name"
 msgstr	""
 
-#: src/lang.c:1085
-msgid	"  -d       don't show newsgroup descriptions"
+#: src/lang.c:920
+#, c-format
+msgid	"Connecting to %s:%d..."
 msgstr	""
 
-#: src/lang.c:1086
-msgid	"  -G limit get only limit articles/group"
+#: src/lang.c:921
+msgid	"Disconnecting from server...\n"
 msgstr	""
 
-#: src/lang.c:1087
+#: src/lang.c:922
 #, c-format
-msgid	"  -H       help information about %s"
-msgstr	""
-
-#: src/lang.c:1088
-msgid	"  -h       this help message"
+msgid	"Wrong newsgroup name in response of GROUP command, %s for %s"
 msgstr	""
 
-#: src/lang.c:1089
+#: src/lang.c:923
 #, c-format
-msgid	"  -I dir   news index file directory [default=%s]"
+msgid	"Failed to connect to NNTP server %s. Exiting..."
 msgstr	""
 
-#: src/lang.c:1090
-msgid	"  -u       update index files (batch mode)"
+#: src/lang.c:924 src/nntplib.c:975
+msgid	"205  Closing connection"
 msgstr	""
 
-#: src/lang.c:1091
-#, c-format
-msgid	"  -m dir   mailbox directory [default=%s]"
+#: src/lang.c:925
+msgid	"Your server does not support the NNTP XOVER or OVER command.\n"
 msgstr	""
 
-#: src/lang.c:1092
-#, c-format
-msgid	"\n"
-	"Mail bug reports/comments to %s"
+#: src/lang.c:926
+msgid	"Connection to news server has timed out. Reconnect?"
 msgstr	""
 
-#: src/lang.c:1093
-msgid	"  -N       mail new news to your posts (batch mode)"
+#: src/lang.c:927
+#, c-format
+msgid	"Put the server name in the file %s,\n"
+	"or set the environment variable NNTPSERVER"
 msgstr	""
 
-#: src/lang.c:1094
-msgid	"  -M user  mail new news to specified user (batch mode)"
+#: src/lang.c:928
+msgid	"  -A       force authentication on connect"
 msgstr	""
 
-#: src/lang.c:1095
+#: src/lang.c:929
 #, c-format
-msgid	"  -f file  subscribed to newsgroups file [default=%s]"
+msgid	"  -g serv  read news from NNTP server serv [default=%s]"
 msgstr	""
 
-#: src/lang.c:1096
-msgid	"  -w       post an article and exit"
+#: src/lang.c:930
+#, c-format
+msgid	"  -p port  use port as NNTP port [default=%d]"
 msgstr	""
 
-#: src/lang.c:1097
-msgid	"  -o       post all postponed articles and exit"
+#: src/lang.c:931
+msgid	"  -Q       quick start. Same as -nqd"
 msgstr	""
 
-#: src/lang.c:1098
-msgid	"  -r       read news remotely from default NNTP server"
+#: src/lang.c:932
+msgid	"  -l       use only LIST instead of GROUP (-n) command"
 msgstr	""
 
-#: src/lang.c:1099
-msgid	"  -R       read news saved by -S option"
+#: src/lang.c:933
+msgid	"  -n       only read subscribed .newsrc groups from NNTP server"
 msgstr	""
 
-#: src/lang.c:1100
+#: src/lang.c:935
 #, c-format
-msgid	"  -s dir   save news directory [default=%s]"
-msgstr	""
-
-#: src/lang.c:1101
-msgid	"  -S       save new news for later reading (batch mode)"
+msgid	"%s/tcp: Unknown service.\n"
 msgstr	""
 
-#: src/lang.c:1102
-msgid	"  -z       start if any unread news"
+#: src/lang.c:938
+msgid	"\n"
+	"socket or connect problem\n"
 msgstr	""
 
-#: src/lang.c:1103
+#: src/lang.c:940
 #, c-format
-msgid	"A Usenet reader.\n"
-	"\n"
-	"Usage: %s [options] [newsgroup[,...]]"
+msgid	"\n"
+	"Connection to %s: "
 msgstr	""
 
-#: src/lang.c:1105
-msgid	"  -a       toggle color flag"
-msgstr	"  -a       toggle colour flag"
+#: src/lang.c:941
+msgid	"Giving up...\n"
+msgstr	""
 
-#: src/lang.c:1107
-msgid	"  -v       verbose output for batch mode options"
+#: src/lang.c:944
+msgid	"Your server does not have Xref: in its XOVER information.\n"
+	"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
 msgstr	""
 
-#: src/lang.c:1108
-msgid	"  -V       print version & date information"
+#: src/lang.c:947
+msgid	"Your server does not have Xref: in its XOVER information.\n"
 msgstr	""
 
-#: src/lang.c:1109
+#: src/lang.c:950
 #, c-format
-msgid	"%s only useful without batch mode operations\n"
+msgid	"Can't open %s. Try %s -r to read news via NNTP.\n"
 msgstr	""
 
-#: src/lang.c:1110
-#, c-format
-msgid	"%s only useful for batch mode operations\n"
+#: src/lang.c:953
+msgid	"  -Q       quick start. Same as -qd"
 msgstr	""
 
-#: src/lang.c:1111
-#, c-format
-msgid	"\n"
-	"%s%d out of range (0 - %d). Reset to 0"
+#: src/lang.c:954
+msgid	"  -l       read only active file instead of scanning spool (-n) command"
 msgstr	""
 
-#: src/lang.c:1112
-#, c-format
-msgid	"\n"
-	"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
-	"%-100s\n"
+#: src/lang.c:955
+msgid	"  -n       only read subscribed .newsrc groups from spool"
 msgstr	""
 
-#: src/lang.c:1113
-msgid	"\n"
-	"Warning: article unchanged after editing\n"
+#: src/lang.c:956
+msgid	"Your server does not have Xref: in its NOV-files.\n"
 msgstr	""
 
-#: src/lang.c:1114
-msgid	"\n"
-	"Warning: \"Subject:\" contains only whitespaces.\n"
+#: src/lang.c:960
+msgid	"Posting using external inews failed. Use built in inews instead?"
 msgstr	""
 
-#: src/lang.c:1116
-#, c-format
-msgid	"\n"
-	"Warning: Posting is in %s and contains characters which are not\n"
-	"         in your selected MM_NETWORK_CHARSET: %s.\n"
-	"         These characters will be replaced by '?' if you post this\n"
-	"         article unchanged. To avoid garbling your article please either\n"
-	"         edit it and remove those characters or change the setting of\n"
-	"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
-	"         M)enu option.\n"
+#: src/lang.c:961
+msgid	"It worked! Should I always use my built in inews from now on?"
 msgstr	""
 
-#: src/lang.c:1125
-msgid	"\n"
-	"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n"
+#: src/lang.c:969
+#, c-format
+msgid	"%d %s printed"
 msgstr	""
 
-#: src/lang.c:1127
-msgid	"\n"
-	"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
-	"         with \"Re: \" and does not contain \"(was:\".\n"
+#: src/lang.c:970
+msgid	"output article/thread/hot/pattern/tagged articles to printer"
 msgstr	""
 
-#: src/lang.c:1130
-msgid	"Read carefully!\n"
-	"\n"
-	"  You are about to cancel an article seemingly written by you. This will "
-	"wipe\n"
-	"  the article from most  news servers  throughout the world,  but there is "
-	"no\n"
-	"  guarantee that it will work.\n"
-	"\n"
-	"This is the article you are about to cancel:\n"
-	"\n"
+#: src/lang.c:971
+msgid	"Print"
 msgstr	""
 
-#: src/lang.c:1134
-msgid	"\n"
-	"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
-	"         quoted-printable) and an external inews program to submit your\n"
-	"         article. If a signature is appended by that inews program it will\n"
-	"         not be encoded properly.\n"
+#: src/lang.c:972
+msgid	"Printing..."
 msgstr	""
 
-#: src/lang.c:1141
-#, c-format
-msgid	"\n"
-	"Warning: The \"%s:\" line is continued in the next line.\n"
-	"         This is a very new feature and may not be accepted by all servers.\n"
-	"         To avoid trouble please write all newsgroups into a single line.\n"
+#: src/lang.c:976
+msgid	"pipe article/thread/hot/pattern/tagged articles into command"
 msgstr	""
 
-#: src/lang.c:1145
-#, c-format
-msgid	"\n"
-	"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
+#: src/lang.c:977
+msgid	"No command"
 msgstr	""
 
-#: src/lang.c:1149
-#, c-format
-msgid	"\n"
-	"\n"
-	"You are upgrading to tin %s from an earlier version.\n"
-	"Some values in your %s file have changed!\n"
-	"Read WHATSNEW, etc...\n"
+#: src/lang.c:978
+msgid	"Pipe"
 msgstr	""
 
-#: src/lang.c:1152
+#: src/lang.c:979
 #, c-format
-msgid	"\n"
-	"\n"
-	"You are downgrading to tin %s from a more recent version!\n"
-	"Some values in your %s file may be ignored, others might have changed!\n"
+msgid	"Pipe to command [%.*s]> "
 msgstr	""
 
-#: src/lang.c:1157
-#, c-format
-msgid	"Warning: tin wrote fewer groups to your\n"
-	"\t%s\n"
-	"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
-	"this session this indicates an error and you should backup your %s\n"
-	"before you start tin once again!\n"
+#: src/lang.c:980
+msgid	"Piping..."
 msgstr	""
 
-#: src/lang.c:1163
-msgid	"Read carefully!\n"
-	"\n"
-	"  You are about to cancel an article seemingly not written by you.  This "
-	"will\n"
-	"  wipe the article from lots of news servers throughout the world;\n"
-	"  Usenet's majority  considers this  rather inappropriate,  to say the "
-	"least.\n"
-	"  Only press 'd'  if you are  absolutely positive  that you are ready to "
-	"take\n"
-	"  the rap.\n"
-	"\n"
-	"This is the article you are about to cancel:\n"
-	"\n"
+#: src/lang.c:982
+msgid	"Piping not enabled."
 msgstr	""
 
-#: src/lang.c:1172
+#: src/lang.c:986
+#, c-format
 msgid	"\n"
-	"Warning: Followup-To set to more than one newsgroup!\n"
+	"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
+	"       The only allowable  space is the one  separating the colon (:)\n"
+	"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
+	"       newsgroup names.\n"
 msgstr	""
 
-#: src/lang.c:1173
+#: src/lang.c:991
 #, c-format
 msgid	"\n"
-	"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
+	"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
+	"       the line  may not  contain  whitespace,  this is  not allowed.\n"
+	"       Please write all newsgroups into a single line.\n"
 msgstr	""
 
-#: src/lang.c:1174
+#: src/lang.c:996
 #, c-format
 msgid	"\n"
-	"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
+	"Warning: The \"%s:\" line is continued in the next line.\n"
+	"         This is a very new feature and may not be accepted by all servers.\n"
+	"         To avoid trouble please write all newsgroups into a single line.\n"
 msgstr	""
 
-#: src/lang.c:1175
+#: src/lang.c:1000
 #, c-format
 msgid	"\n"
-	"Warning: \"%s\" is not a valid newsgroup at this site!\n"
+	"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
 msgstr	""
 
-#: src/lang.c:1179
+#: src/lang.c:1005
 msgid	"\n"
 	"  If your article contains quoted text  please take some time to pare it "
 	"down\n"
@@ -3619,700 +3570,765 @@ msgid	"\n"
 	"  likely to ignore it completely.  It's a crowded net out there.\n"
 msgstr	""
 
-#: src/lang.c:1191
-#, c-format
-msgid	"\n"
-	"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
+#: src/lang.c:1018
+msgid	"shell escape"
+msgstr	""
+
+#: src/lang.c:1019
+#, c-format
+msgid	"Shell Command (%s)"
+msgstr	""
+
+#: src/lang.c:1020
+#, c-format
+msgid	"Enter shell command [%s]> "
+msgstr	""
+
+#: src/lang.c:1024
+#, c-format
+msgid	"%s: Can't get entry for TERM\n"
+msgstr	""
+
+#: src/lang.c:1028
+#, c-format
+msgid	"Group %.*s ('q' to quit)..."
+msgstr	""
+
+#: src/lang.c:1030
+#, c-format
+msgid	"Group %.*s..."
+msgstr	""
+
+#: src/lang.c:1034
+msgid	"Server unavailable\n"
+msgstr	""
+
+#: src/lang.c:1040
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
+	"%s=post"
+msgstr	""
+
+#: src/lang.c:1041
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	""
+
+#: src/lang.c:1043
+#, c-format
+msgid	"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	""
+
+#: src/lang.c:1044
+#, c-format
+msgid	"%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	""
+
+#: src/lang.c:1048
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	""
+
+#: src/lang.c:1049
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	""
+
+#: src/lang.c:1051
+#, c-format
+msgid	"%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	""
+
+#: src/lang.c:1052
+#, c-format
+msgid	"%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	""
+
+#: src/lang.c:1058
+msgid	"Terminal does not support color"
+msgstr	"Terminal does not support colour"
+
+#: src/lang.c:1063
+#, c-format
+msgid	"Trying %s"
+msgstr	""
+
+#: src/lang.c:1077 src/lang.c:1102 src/lang.c:1118 src/refs.c:266
+msgid	"None"
+msgstr	""
+
+#: src/lang.c:1078
+msgid	"Subject"
+msgstr	""
+
+#: src/lang.c:1079
+msgid	"References"
+msgstr	""
+
+#: src/lang.c:1080
+msgid	"Both Subject and References"
+msgstr	""
+
+#: src/lang.c:1081
+msgid	"Multipart Subject"
 msgstr	""
 
-#: src/lang.c:1192
-#, c-format
-msgid	"Warning: Only %d out of %d articles were saved"
+#: src/lang.c:1093 src/lang.c:1204
+msgid	"No"
 msgstr	""
 
-#: src/lang.c:1193
-#, c-format
-msgid	"\n"
-	"Warning: Your signature  is longer than %d lines.  Since signatures usually "
-	"do\n"
-	"         not  transport any  useful information,  they should be as  short "
-	"as\n"
-	"         possible.\n"
+#: src/lang.c:1094 src/lang.c:1206
+msgid	"Yes"
 msgstr	""
 
-#: src/lang.c:1197
-#, c-format
-msgid	"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
+#: src/lang.c:1095
+msgid	"Hide All"
 msgstr	""
 
-#: src/lang.c:1198
-msgid	"\n"
-	"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
+#: src/lang.c:1103
+msgid	"Address"
 msgstr	""
 
-#: src/lang.c:1199
-msgid	"Writing attributes file..."
+#: src/lang.c:1104
+msgid	"Full Name"
 msgstr	""
 
-#: src/lang.c:1200
-#, c-format
-msgid	"%d Responses%s"
+#: src/lang.c:1105
+msgid	"Address and Name"
 msgstr	""
 
-#: src/lang.c:1201
-#, c-format
-msgid	"Added %d %s"
+#: src/lang.c:1112
+msgid	"Max"
 msgstr	""
 
-#: src/lang.c:1202
-msgid	"No unsubscribed groups to show"
+#: src/lang.c:1113
+msgid	"Sum"
 msgstr	""
 
-#: src/lang.c:1203
-msgid	"Showing subscribed to groups only"
+#: src/lang.c:1114
+msgid	"Average"
 msgstr	""
 
-#: src/lang.c:1204
-msgid	"Showing unread groups only"
+#: src/lang.c:1119
+msgid	"Lines"
 msgstr	""
 
-#: src/lang.c:1205
-msgid	"Yes "
+#: src/lang.c:1120
+msgid	"Score"
 msgstr	""
 
-#: src/lang.c:1206
-msgid	"    You have mail\n"
+#: src/lang.c:1121
+msgid	"Lines & Score"
 msgstr	""
 
-#: src/lang.c:1207
-msgid	"All groups"
+#: src/lang.c:1130
+msgid	"Black"
 msgstr	""
 
-#: src/lang.c:1208
-msgid	"Comment (optional)  : "
+#: src/lang.c:1131
+msgid	"Red"
 msgstr	""
 
-#: src/lang.c:1209
-msgid	"Apply pattern to    : "
+#: src/lang.c:1132
+msgid	"Green"
 msgstr	""
 
-#: src/lang.c:1210
-msgid	"From: line (ignore case)      "
+#: src/lang.c:1133
+msgid	"Brown"
 msgstr	""
 
-#: src/lang.c:1211
-msgid	"From: line (case sensitive)   "
+#: src/lang.c:1134
+msgid	"Blue"
 msgstr	""
 
-#: src/lang.c:1212
-msgid	"One or more lines of comment. <CR> to add a line or proceed if line is empty."
+#: src/lang.c:1135
+msgid	"Pink"
 msgstr	""
 
-#: src/lang.c:1213
-msgid	"From: line to add to filter file. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1136
+msgid	"Cyan"
 msgstr	""
 
-#: src/lang.c:1214
-msgid	"Linecount of articles to be filtered. < for less, > for more, = for equal."
+#: src/lang.c:1137
+msgid	"White"
 msgstr	""
 
-#: src/lang.c:1215
-msgid	"Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1138
+msgid	"Gray"
+msgstr	"Grey"
+
+#: src/lang.c:1139
+msgid	"Light Red"
 msgstr	""
 
-#: src/lang.c:1216
-msgid	"Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1140
+msgid	"Light Green"
 msgstr	""
 
-#: src/lang.c:1217
-msgid	"Enter text pattern to filter if Subject: & From: lines are not what you want."
+#: src/lang.c:1141
+msgid	"Yellow"
 msgstr	""
 
-#: src/lang.c:1218
-msgid	"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1142
+msgid	"Light Blue"
 msgstr	""
 
-#: src/lang.c:1219
-msgid	"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1143
+msgid	"Light Pink"
 msgstr	""
 
-#: src/lang.c:1220
-msgid	"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1144
+msgid	"Light Cyan"
 msgstr	""
 
-#: src/lang.c:1221
-msgid	"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1145
+msgid	"Light White"
 msgstr	""
 
-#: src/lang.c:1222
-#, c-format
-msgid	"Kill From:     [%-*.*s] (y/n): "
+#: src/lang.c:1153 src/lang.c:1210 src/lang.c:1224
+msgid	"Nothing"
 msgstr	""
 
-#: src/lang.c:1223
-msgid	"Kill Lines: (</>num): "
+#: src/lang.c:1154
+msgid	"Mark"
 msgstr	""
 
-#: src/lang.c:1224
-msgid	"Kill Article Menu"
+#: src/lang.c:1155
+msgid	"Space"
 msgstr	""
 
-#: src/lang.c:1225
-#, c-format
-msgid	"Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
+#: src/lang.c:1162
+msgid	"Normal"
 msgstr	""
 
-#: src/lang.c:1226
-msgid	"Kill pattern scope  : "
+#: src/lang.c:1163
+msgid	"Best highlighting"
 msgstr	""
 
-#: src/lang.c:1227
-#, c-format
-msgid	"Kill Subject:  [%-*.*s] (y/n): "
+#: src/lang.c:1164
+msgid	"Underline"
 msgstr	""
 
-#: src/lang.c:1228
-msgid	"Kill text pattern   : "
+#: src/lang.c:1165
+msgid	"Reverse video"
 msgstr	""
 
-#: src/lang.c:1229
-msgid	"Kill time in days   : "
+#: src/lang.c:1166
+msgid	"Blinking"
 msgstr	""
 
-#: src/lang.c:1230
-msgid	"Message-ID: line              "
+#: src/lang.c:1167
+msgid	"Half bright"
 msgstr	""
 
-#: src/lang.c:1231
-#, c-format
-msgid	"Select From    [%-*.*s] (y/n): "
+#: src/lang.c:1168
+msgid	"Bold"
 msgstr	""
 
-#: src/lang.c:1232
-msgid	"Select Lines: (</>num): "
+#: src/lang.c:1173
+msgid	"none"
 msgstr	""
 
-#: src/lang.c:1233
-msgid	"Auto-select Article Menu"
+#: src/lang.c:1174
+msgid	"commands"
 msgstr	""
 
-#: src/lang.c:1234
-#, c-format
-msgid	"Select Msg-Id  [%-*.*s] (f/l/o/n): "
+#: src/lang.c:1175
+msgid	"select"
 msgstr	""
 
-#: src/lang.c:1235
-msgid	"Select pattern scope: "
+#: src/lang.c:1177
+msgid	"commands & quit"
 msgstr	""
 
-#: src/lang.c:1236
-#, c-format
-msgid	"Select Subject [%-*.*s] (y/n): "
+#: src/lang.c:1178
+msgid	"commands & select"
 msgstr	""
 
-#: src/lang.c:1237
-msgid	"Select text pattern : "
+#: src/lang.c:1179
+msgid	"quit & select"
 msgstr	""
 
-#: src/lang.c:1238
-msgid	"Select time in days   : "
+#: src/lang.c:1180
+msgid	"commands & quit & select"
 msgstr	""
 
-#: src/lang.c:1239
-msgid	"Subject: line (ignore case)   "
+#: src/lang.c:1205
+msgid	"Shell archive"
 msgstr	""
 
-#: src/lang.c:1240
-msgid	"Subject: line (case sensitive)"
+#: src/lang.c:1211
+msgid	"Subject: (descending)"
 msgstr	""
 
-#: src/lang.c:1241
-#, c-format
-msgid	"%d days"
+#: src/lang.c:1212
+msgid	"Subject: (ascending)"
 msgstr	""
 
-#: src/lang.c:1242
-msgid	"Unlimited"
+#: src/lang.c:1213
+msgid	"From: (descending)"
 msgstr	""
 
-#: src/lang.c:1243
-msgid	"Full"
+#: src/lang.c:1214
+msgid	"From: (ascending)"
 msgstr	""
 
-#: src/lang.c:1244
-msgid	"Last"
+#: src/lang.c:1215
+msgid	"Date: (descending)"
 msgstr	""
 
-#: src/lang.c:1245
-msgid	"Only"
+#: src/lang.c:1216
+msgid	"Date: (ascending)"
 msgstr	""
 
-#: src/lang.c:1246
-msgid	"# Format:\n"
-	"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
-	"placed\n"
-	"#                     at the beginning of a rule, or they will be moved to "
-	"the\n"
-	"#                     next rule. '#' is not a valid keyword for a comment!\n"
-	"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
-	"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
-	"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
-	"#     score=NUM         A number (e.g. 70). Or:\n"
-	"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
-	"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
-	"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
-	"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n"
-	"#                     full references.\n"
-	"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
-	"#   msgid_only=STRING Optional. Like above, but without references.\n"
-	"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
-	"without\n"
-	"#                     Message-ID:\n"
-	"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
-	"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
-	"opt.\n"
-	"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
-	"#   time=NUM          Optional. time_t value when rule expires\n"
-	"#\n"
+#: src/lang.c:1217 src/lang.c:1225
+msgid	"Score (descending)"
 msgstr	""
 
-#: src/lang.c:1267
-#, c-format
-msgid	"Enter score for rule (default=%d): "
+#: src/lang.c:1218 src/lang.c:1226
+msgid	"Score (ascending)"
 msgstr	""
 
-#: src/lang.c:1268
-#, c-format
-msgid	"Enter the score weight (range 0 < score <= %d)"
+#: src/lang.c:1219
+msgid	"Lines: (descending)"
 msgstr	""
 
-#. SCORE_MAX
-#: src/lang.c:1270
-msgid	"Article deleted."
+#: src/lang.c:1220
+msgid	"Lines: (ascending)"
 msgstr	""
 
-#: src/lang.c:1271
-msgid	"Article undeleted."
+#: src/lang.c:1231
+msgid	"Always Keep"
 msgstr	""
 
-#: src/lang.c:1272
-msgid	"Processing mail messages marked for deletion."
+#: src/lang.c:1232
+msgid	"Always Remove"
 msgstr	""
 
-#: src/lang.c:1273
-msgid	"Processing saved articles marked for deletion."
+#: src/lang.c:1233
+msgid	"Mark with D on selection screen"
 msgstr	""
 
-#: src/lang.c:1276
-#, c-format
-msgid	"Environment variable %s not found. Set and retry..."
+#: src/lang.c:1238
+msgid	"Kill only unread arts"
 msgstr	""
 
-#: src/lang.c:1277
-msgid	"  -B       BBS mode. File operations limited to home directories."
+#: src/lang.c:1239
+msgid	"Kill all arts & show with K"
 msgstr	""
 
-#: src/lang.c:1281
-msgid	"\n"
-	"Error: Followup-To set to more than one newsgroup!\n"
+#. TODO: s/K/art_marked_killed/
+#: src/lang.c:1240
+msgid	"Kill all arts and never show"
 msgstr	""
 
-#: src/lang.c:1282
-#, c-format
-msgid	"\n"
-	"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
+#: src/lang.c:1245
+msgid	"Nothing special"
 msgstr	""
 
-#: src/lang.c:1283
-#, c-format
-msgid	"\n"
-	"Error: \"%s\" is not a valid newsgroup!\n"
+#: src/lang.c:1246
+msgid	"Compress quotes"
 msgstr	""
 
-#: src/lang.c:1287
-msgid	"Your server does not have Xref: in its XOVER information.\n"
-	"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
+#: src/lang.c:1247
+msgid	"Quote signatures"
 msgstr	""
 
-#: src/lang.c:1290
-msgid	"Your server does not have Xref: in its XOVER information.\n"
+#: src/lang.c:1248
+msgid	"Compress quotes, quote sigs"
+msgstr	""
+
+#: src/lang.c:1249
+msgid	"Quote empty lines"
+msgstr	""
+
+#: src/lang.c:1250
+msgid	"Compress quotes, quote empty lines"
+msgstr	""
+
+#: src/lang.c:1251
+msgid	"Quote sigs & empty lines"
+msgstr	""
+
+#: src/lang.c:1252
+msgid	"Comp. q., quote sigs & empty lines"
 msgstr	""
 
-#: src/lang.c:1295
+#: src/lang.c:1290
 msgid	"Display Options"
 msgstr	""
 
-#: src/lang.c:1301
+#: src/lang.c:1296
 msgid	"Color Options"
 msgstr	"Colour Options"
 
-#: src/lang.c:1307
+#: src/lang.c:1302
 msgid	"Article-Limiting Options"
 msgstr	""
 
-#: src/lang.c:1313
+#: src/lang.c:1308
 msgid	"Posting/Mailing Options"
 msgstr	""
 
-#: src/lang.c:1319
+#: src/lang.c:1314
 msgid	"Saving/Printing Options"
 msgstr	""
 
-#: src/lang.c:1325
+#: src/lang.c:1320
 msgid	"Expert Options"
 msgstr	""
 
-#: src/lang.c:1331
+#: src/lang.c:1326
 msgid	"Filtering Options"
 msgstr	""
 
-#: src/lang.c:1336 src/lang.c:1362 src/lang.c:1368 src/lang.c:1375 src/lang.c:1407
-#: src/lang.c:1413 src/lang.c:1421 src/lang.c:1441 src/lang.c:1516 src/lang.c:1678
-#: src/lang.c:1684 src/lang.c:1690 src/lang.c:1702 src/lang.c:1709 src/lang.c:1760
-#: src/lang.c:1769 src/lang.c:1775 src/lang.c:1781 src/lang.c:1787 src/lang.c:1793
-#: src/lang.c:1799 src/lang.c:1805 src/lang.c:1811 src/lang.c:1817 src/lang.c:1823
-#: src/lang.c:1829 src/lang.c:1835 src/lang.c:1841 src/lang.c:1847 src/lang.c:1853
-#: src/lang.c:1859 src/lang.c:1865 src/lang.c:1871 src/lang.c:1877 src/lang.c:1883
-#: src/lang.c:1890 src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1920
-#: src/lang.c:1926 src/lang.c:1932 src/lang.c:1938 src/lang.c:1944 src/lang.c:1958
-#: src/lang.c:1970 src/lang.c:2004 src/lang.c:2056 src/lang.c:2063 src/lang.c:2069
-#: src/lang.c:2094 src/lang.c:2111 src/lang.c:2164 src/lang.c:2197 src/lang.c:2217
-#: src/lang.c:2252 src/lang.c:2260 src/lang.c:2285 src/lang.c:2297
+#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 src/lang.c:1402
+#: src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 src/lang.c:1511 src/lang.c:1673
+#: src/lang.c:1679 src/lang.c:1685 src/lang.c:1697 src/lang.c:1704 src/lang.c:1755
+#: src/lang.c:1764 src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788
+#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 src/lang.c:1818
+#: src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 src/lang.c:1842 src/lang.c:1848
+#: src/lang.c:1854 src/lang.c:1860 src/lang.c:1866 src/lang.c:1872 src/lang.c:1878
+#: src/lang.c:1885 src/lang.c:1891 src/lang.c:1897 src/lang.c:1904 src/lang.c:1915
+#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 src/lang.c:1953
+#: src/lang.c:1965 src/lang.c:1999 src/lang.c:2051 src/lang.c:2058 src/lang.c:2064
+#: src/lang.c:2089 src/lang.c:2106 src/lang.c:2159 src/lang.c:2192 src/lang.c:2212
+#: src/lang.c:2247 src/lang.c:2255 src/lang.c:2280 src/lang.c:2292
 msgid	"<SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1337
+#: src/lang.c:1332
 msgid	"Show mini menu & posting etiquette :"
 msgstr	""
 
-#: src/lang.c:1338
+#: src/lang.c:1333
 msgid	"# If ON show a mini menu of useful commands at each level\n"
 	"# and posting etiquette after composing an article\n"
 msgstr	""
 
-#: src/lang.c:1343
+#: src/lang.c:1338
 msgid	"Show short description for each newsgroup. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1344
+#: src/lang.c:1339
 msgid	"Show description of each newsgroup :"
 msgstr	""
 
-#: src/lang.c:1345
+#: src/lang.c:1340
 msgid	"# If ON show group description text after newsgroup name at\n"
 	"# group selection level\n"
 msgstr	""
 
-#: src/lang.c:1350
+#: src/lang.c:1345
 msgid	"Show Subject & From (author) fields in group menu. <SPACE> toggles & <CR> "
 	"sets."
 msgstr	""
 
-#: src/lang.c:1351
+#: src/lang.c:1346
 msgid	"In group menu, show author by      :"
 msgstr	""
 
-#: src/lang.c:1352
+#: src/lang.c:1347
 msgid	"# Part of from field to display 0) none 1) address 2) full name 3) both\n"
 msgstr	""
 
-#: src/lang.c:1356
+#: src/lang.c:1351
 msgid	"Draw -> or highlighted bar for selection. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1357
+#: src/lang.c:1352
 msgid	"Draw -> instead of highlighted bar :"
 msgstr	""
 
-#: src/lang.c:1358
+#: src/lang.c:1353
 msgid	"# If ON use -> otherwise highlighted bar for selection\n"
 msgstr	""
 
-#: src/lang.c:1363
+#: src/lang.c:1358
 msgid	"Use inverse video for page headers :"
 msgstr	""
 
-#: src/lang.c:1364
+#: src/lang.c:1359
 msgid	"# If ON use inverse video for page headers at different levels\n"
 msgstr	""
 
-#: src/lang.c:1369
+#: src/lang.c:1364
 msgid	"Thread articles by                 :"
 msgstr	""
 
-#: src/lang.c:1370
+#: src/lang.c:1365
 msgid	"# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n"
 	"# 4=(Multipart Subject).\n"
 msgstr	""
 
-#: src/lang.c:1376
+#: src/lang.c:1371
 msgid	"Score of a thread                  :"
 msgstr	""
 
-#: src/lang.c:1377
+#: src/lang.c:1372
 msgid	"# Thread score 0=(Max) 1=(Sum) 2=(Average)\n"
 msgstr	""
 
-#: src/lang.c:1381
+#: src/lang.c:1376
 msgid	"Sort articles by Subject, From, Date or Score. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1382
+#: src/lang.c:1377
 msgid	"Sort articles by                   :"
 msgstr	""
 
-#: src/lang.c:1383
+#: src/lang.c:1378
 msgid	"# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n"
 	"# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n"
 	"# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n"
 msgstr	""
 
-#: src/lang.c:1389
+#: src/lang.c:1384
 msgid	"Sort threads by Nothing or Score. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1390
+#: src/lang.c:1385
 msgid	"Sort threads by                    :"
 msgstr	""
 
-#: src/lang.c:1391
+#: src/lang.c:1386
 msgid	"# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n"
 msgstr	""
 
-#: src/lang.c:1395
+#: src/lang.c:1390
 msgid	"Put cursor at first/last unread art in groups. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1396
+#: src/lang.c:1391
 msgid	"Goto first unread article in group :"
 msgstr	""
 
-#: src/lang.c:1397
+#: src/lang.c:1392
 msgid	"# If ON put cursor at first unread art in group otherwise last art\n"
 msgstr	""
 
-#: src/lang.c:1401
+#: src/lang.c:1396
 msgid	"Show all articles or only unread articles. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1402
+#: src/lang.c:1397
 msgid	"Show only unread articles          :"
 msgstr	""
 
-#: src/lang.c:1403
+#: src/lang.c:1398
 msgid	"# If ON show only new/unread articles otherwise show all.\n"
 msgstr	""
 
-#: src/lang.c:1408
+#: src/lang.c:1403
 msgid	"Show only groups with unread arts  :"
 msgstr	""
 
-#: src/lang.c:1409
+#: src/lang.c:1404
 msgid	"# If ON show only subscribed to groups that contain unread articles.\n"
 msgstr	""
 
-#: src/lang.c:1414
+#: src/lang.c:1409
 msgid	"Filter which articles              :"
 msgstr	""
 
-#: src/lang.c:1415
+#: src/lang.c:1410
 msgid	"# 0=(Only kill unread articles)\n"
 	"# 1=(Kill all articles and show in threads marked with K)\n"
 	"# 2=(Kill all articles and never show them).\n"
 msgstr	""
 
-#: src/lang.c:1422
+#: src/lang.c:1417
 msgid	"Tab goes to next unread article    :"
 msgstr	""
 
-#: src/lang.c:1423
+#: src/lang.c:1418
 msgid	"# If ON the TAB command will go to next unread article at article viewer "
 	"level\n"
 msgstr	""
 
-#: src/lang.c:1427
+#: src/lang.c:1422
 msgid	"Scrolling with <SPACE> past the end of an art. jumps to the next unread one."
 msgstr	""
 
-#: src/lang.c:1428
+#: src/lang.c:1423
 msgid	"Space goes to next unread article  :"
 msgstr	""
 
-#: src/lang.c:1429
+#: src/lang.c:1424
 msgid	"# If ON the SPACE command will go to next unread article at article viewer\n"
 	"# level when the end of the article is reached (rn-style pager)\n"
 msgstr	""
 
-#: src/lang.c:1434
+#: src/lang.c:1429
 msgid	"Scrolling with <PGDN>/<DOWN> past the end of an art. jumps to the unread one."
 msgstr	""
 
-#: src/lang.c:1435
+#: src/lang.c:1430
 msgid	"PgDn goes to next unread article   :"
 msgstr	""
 
-#: src/lang.c:1436
+#: src/lang.c:1431
 msgid	"# If ON the PGDN or DOWN command will go to next unread article when\n"
 	"# pressed at end of message\n"
 msgstr	""
 
-#: src/lang.c:1442
+#: src/lang.c:1437
 msgid	"List thread using right arrow key  :"
 msgstr	""
 
-#: src/lang.c:1443
+#: src/lang.c:1438
 msgid	"# If ON automatically list thread when entering it using right arrow key.\n"
 msgstr	""
 
-#: src/lang.c:1447
+#: src/lang.c:1442
 msgid	"Enter character to indicate deleted articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1448
+#: src/lang.c:1443
 msgid	"Character to show deleted articles :"
 msgstr	""
 
-#: src/lang.c:1449
+#: src/lang.c:1444
 msgid	"# Character used to show that an art was deleted (default 'D')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1454
+#: src/lang.c:1449
 msgid	"Enter character to indicate articles in a range. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1455
+#: src/lang.c:1450
 msgid	"Character to show inrange articles :"
 msgstr	""
 
-#: src/lang.c:1456
+#: src/lang.c:1451
 msgid	"# Character used to show that an art is in a range (default '#')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1461
+#: src/lang.c:1456
 msgid	"Enter character to indicate that article will return. <CR> sets, <ESC> "
 	"cancels."
 msgstr	""
 
-#: src/lang.c:1462
+#: src/lang.c:1457
 msgid	"Character to show returning arts   :"
 msgstr	""
 
-#: src/lang.c:1463
+#: src/lang.c:1458
 msgid	"# Character used to show that an art will return (default '-')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1468
+#: src/lang.c:1463
 msgid	"Enter character to indicate selected articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1469
+#: src/lang.c:1464
 msgid	"Character to show selected articles:"
 msgstr	""
 
-#: src/lang.c:1470
+#: src/lang.c:1465
 msgid	"# Character used to show that an art was auto-selected (default '*')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1475
+#: src/lang.c:1470
 msgid	"Enter character to indicate recent articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1476
+#: src/lang.c:1471
 msgid	"Character to show recent articles  :"
 msgstr	""
 
-#: src/lang.c:1477
+#: src/lang.c:1472
 msgid	"# Character used to show that an art is recent (default 'o')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1482
+#: src/lang.c:1477
 msgid	"Enter character to indicate unread articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1483
+#: src/lang.c:1478
 msgid	"Character to show unread articles  :"
 msgstr	""
 
-#: src/lang.c:1484
+#: src/lang.c:1479
 msgid	"# Character used to show that an art is unread (default '+')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1489
+#: src/lang.c:1484
 msgid	"Enter character to indicate read articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1490
+#: src/lang.c:1485
 msgid	"Character to show read articles    :"
 msgstr	""
 
-#: src/lang.c:1491
+#: src/lang.c:1486
 msgid	"# Character used to show that an art was read (default ' ')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1496
+#: src/lang.c:1491
 msgid	"Enter character to indicate killed articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1497
+#: src/lang.c:1492
 msgid	"Character to show killed articles  :"
 msgstr	""
 
-#: src/lang.c:1498
+#: src/lang.c:1493
 msgid	"# Character used to show that an art was killed (default 'K')\n"
 	"# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1503
+#: src/lang.c:1498
 msgid	"Enter character to indicate read selected articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1504
+#: src/lang.c:1499
 msgid	"Character to show readselected arts:"
 msgstr	""
 
-#: src/lang.c:1505
+#: src/lang.c:1500
 msgid	"# Character used to show that an art was selected before read (default ':')\n"
 	"# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1510
+#: src/lang.c:1505
 msgid	"Enter maximum length of newsgroup names displayed. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1511
+#: src/lang.c:1506
 msgid	"Max. length of group names shown   :"
 msgstr	""
 
-#: src/lang.c:1512
+#: src/lang.c:1507
 msgid	"# Maximum length of the names of newsgroups displayed\n"
 msgstr	""
 
-#: src/lang.c:1517
+#: src/lang.c:1512
 msgid	"Show lines/score in listings       :"
 msgstr	""
 
-#: src/lang.c:1518
+#: src/lang.c:1513
 msgid	"# What informations should be displayed in article/thread listing\n"
 	"# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n"
 msgstr	""
 
-#: src/lang.c:1523
+#: src/lang.c:1518
 msgid	"0 = full page scrolling, -1 = show previous last line as first on next page, "
 	"-2 = half page"
 msgstr	""
 
-#: src/lang.c:1524
+#: src/lang.c:1519
 msgid	"Number of lines to scroll in pager :"
 msgstr	""
 
-#: src/lang.c:1525
+#: src/lang.c:1520
 msgid	"# Number of lines that cursor-up/down will scroll in article pager\n"
 	"# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n"
 	"# -1 = the top/bottom line is carried over onto the next page,\n"
@@ -4322,27 +4338,27 @@ msgstr	"# Number of lines that cursor-up
 	"# -1 = the top/bottom line is carried over onto the next page,\n"
 	"# -2 = half-page scrolling\n"
 
-#: src/lang.c:1532
+#: src/lang.c:1527
 msgid	"Display signatures. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1533
+#: src/lang.c:1528
 msgid	"Display signatures                 :"
 msgstr	""
 
-#: src/lang.c:1534
+#: src/lang.c:1529
 msgid	"# If OFF don't show signatures when displaying articles\n"
 msgstr	""
 
-#: src/lang.c:1538
+#: src/lang.c:1533
 msgid	"Display uuencoded data as tagged attachments. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1539
+#: src/lang.c:1534
 msgid	"Display uue data as an attachment  :"
 msgstr	""
 
-#: src/lang.c:1540
+#: src/lang.c:1535
 msgid	"# Handling of uuencoded data in the pager\n"
 	"# 0 = display raw uuencoded data\n"
 	"# 1 = uuencoded data will be condensed to a single tag line showing\n"
@@ -4351,28 +4367,28 @@ msgid	"# Handling of uuencoded data in t
 	"#     into a tag line.\n"
 msgstr	""
 
-#: src/lang.c:1549
+#: src/lang.c:1544
 msgid	"Decode German style TeX umlaut codes to ISO. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1550
+#: src/lang.c:1545
 msgid	"Display \"a as Umlaut-a             :"
 msgstr	""
 
-#: src/lang.c:1551
+#: src/lang.c:1546
 msgid	"# If ON decode German style TeX umlaut codes to ISO and\n"
 	"# show \"a as Umlaut-a, etc.\n"
 msgstr	""
 
-#: src/lang.c:1556 src/lang.c:1566
+#: src/lang.c:1551 src/lang.c:1561
 msgid	"Space separated list of header fields"
 msgstr	""
 
-#: src/lang.c:1557
+#: src/lang.c:1552
 msgid	"Display these header fields (or *) :"
 msgstr	""
 
-#: src/lang.c:1558
+#: src/lang.c:1553
 msgid	"# Which news headers you wish to see. If you want to see _all_ the headers,\n"
 	"# place an '*' as this value. This is the only way a wildcard can be used.\n"
 	"# If you enter 'X-' as the value, you will see all headers beginning with\n"
@@ -4381,11 +4397,11 @@ msgid	"# Which news headers you wish to 
 	"# spaces. Not defining anything turns off this option.\n"
 msgstr	""
 
-#: src/lang.c:1567
+#: src/lang.c:1562
 msgid	"Do not display these header fields :"
 msgstr	""
 
-#: src/lang.c:1568
+#: src/lang.c:1563
 msgid	"# Same as 'news_headers_to_display' except it denotes the opposite.\n"
 	"# An example of using both options might be if you thought X- headers were\n"
 	"# A Good Thing(tm), but thought Alan and Pape were miscreants...well then "
@@ -4396,504 +4412,504 @@ msgid	"# Same as 'news_headers_to_displa
 	"# Not defining anything turns off this option.\n"
 msgstr	""
 
-#: src/lang.c:1578
+#: src/lang.c:1573
 msgid	"Do you want to enable automatic handling of multipart/alternative articles?"
 msgstr	""
 
-#: src/lang.c:1579
+#: src/lang.c:1574
 msgid	"Skip multipart/alternative parts   :"
 msgstr	""
 
-#: src/lang.c:1580
+#: src/lang.c:1575
 msgid	"# If ON strip multipart/alternative messages automatically\n"
 msgstr	""
 
-#: src/lang.c:1585
+#: src/lang.c:1580
 msgid	"A regex used to decide which lines to show in col_quote."
 msgstr	""
 
-#: src/lang.c:1586
+#: src/lang.c:1581
 msgid	"Regex used to show quoted lines    :"
 msgstr	""
 
-#: src/lang.c:1587
+#: src/lang.c:1582
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted when viewing articles. Quoted lines are shown in col_quote.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1593
+#: src/lang.c:1588
 msgid	"A regex used to decide which lines to show in col_quote2."
 msgstr	""
 
-#: src/lang.c:1594
+#: src/lang.c:1589
 msgid	"Regex used to show twice quoted l. :"
 msgstr	""
 
-#: src/lang.c:1595
+#: src/lang.c:1590
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted twice. Twice quoted lines are shown in col_quote2.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1601
+#: src/lang.c:1596
 msgid	"A regex used to decide which lines to show in col_quote3."
 msgstr	""
 
-#: src/lang.c:1602
+#: src/lang.c:1597
 msgid	"Regex used to show >= 3 times q.l. :"
 msgstr	""
 
-#: src/lang.c:1603
+#: src/lang.c:1598
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1610
+#: src/lang.c:1605
 msgid	"A regex used to decide which words to show in col_markslashes."
 msgstr	""
 
-#: src/lang.c:1611
+#: src/lang.c:1606
 msgid	"Regex used to highlight /slashes/  :"
 msgstr	""
 
-#: src/lang.c:1612
+#: src/lang.c:1607
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '/' are to be shown in col_markslashes.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1618
+#: src/lang.c:1613
 msgid	"A regex used to decide which words to show in col_markstars."
 msgstr	""
 
-#: src/lang.c:1619
+#: src/lang.c:1614
 msgid	"Regex used to highlight *stars*    :"
 msgstr	""
 
-#: src/lang.c:1620
+#: src/lang.c:1615
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '*' are to be shown in col_markstars.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1626
+#: src/lang.c:1621
 msgid	"A regex used to decide which words to show in col_markstroke."
 msgstr	""
 
-#: src/lang.c:1627
+#: src/lang.c:1622
 msgid	"Regex used to highlight -strokes-  :"
 msgstr	""
 
-#: src/lang.c:1628
+#: src/lang.c:1623
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '-' are to be shown in col_markstroke.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1634
+#: src/lang.c:1629
 msgid	"A regex used to decide which words to show in col_markdash."
 msgstr	""
 
-#: src/lang.c:1635
+#: src/lang.c:1630
 msgid	"Regex used to highlight _underline_:"
 msgstr	""
 
-#: src/lang.c:1636
+#: src/lang.c:1631
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '_' are to be shown in col_markdash.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1642
+#: src/lang.c:1637
 msgid	"A regex used to find Subject prefixes to remove.  Use '|' as separator."
 msgstr	""
 
-#: src/lang.c:1643
+#: src/lang.c:1638
 msgid	"Regex with Subject prefixes        :"
 msgstr	""
 
-#: src/lang.c:1644
+#: src/lang.c:1639
 msgid	"# A regular expression that tin will use to find Subject prefixes\n"
 	"# which will be removed before showing the header.\n"
 msgstr	""
 
-#: src/lang.c:1649
+#: src/lang.c:1644
 msgid	"A regex used to find Subject suffixes to remove.  Use '|' as separator."
 msgstr	""
 
-#: src/lang.c:1650
+#: src/lang.c:1645
 msgid	"Regex with Subject suffixes        :"
 msgstr	""
 
-#: src/lang.c:1651
+#: src/lang.c:1646
 msgid	"# A regular expression that tin will use to find Subject suffixes\n"
 	"# which will be removed when replying or posting followup.\n"
 msgstr	""
 
-#: src/lang.c:1656
+#: src/lang.c:1651
 msgid	"Enter name and options for external MIME viewer, --internal for built-in "
 	"viewer"
 msgstr	""
 
-#: src/lang.c:1657
+#: src/lang.c:1652
 msgid	"MIME binary content viewer         :"
 msgstr	""
 
-#: src/lang.c:1658
+#: src/lang.c:1653
 msgid	"# If --internal automatically use the built in MIME viewer for non-text\n"
 	"# parts of articles.\n"
 	"# Otherwise specify an external viewer program (eg, metamail) or leave blank\n"
 	"# for no automatic viewing\n"
 msgstr	""
 
-#: src/lang.c:1665
+#: src/lang.c:1660
 msgid	"Confirm before starting non-text viewing program"
 msgstr	""
 
-#: src/lang.c:1666
+#: src/lang.c:1661
 msgid	"Ask before using MIME viewer       :"
 msgstr	""
 
-#: src/lang.c:1667
+#: src/lang.c:1662
 msgid	"# If ON tin will ask before using metamail to display MIME messages\n"
 	"# this only happens if metamail_prog is set to something\n"
 msgstr	""
 
-#: src/lang.c:1672
+#: src/lang.c:1667
 msgid	"Ask to mark groups read when quitting. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1673
+#: src/lang.c:1668
 msgid	"Catchup read groups when quitting  :"
 msgstr	""
 
-#: src/lang.c:1674
+#: src/lang.c:1669
 msgid	"# If ON ask user if read groups should all be marked read\n"
 msgstr	""
 
-#: src/lang.c:1679
+#: src/lang.c:1674
 msgid	"Catchup group using left key       :"
 msgstr	""
 
-#: src/lang.c:1680
+#: src/lang.c:1675
 msgid	"# If ON catchup group/thread when leaving with the left arrow key.\n"
 msgstr	""
 
-#: src/lang.c:1685
+#: src/lang.c:1680
 msgid	"Catchup thread by using left key   :"
 msgstr	""
 
-#: src/lang.c:1691
+#: src/lang.c:1686
 msgid	"Which actions require confirmation :"
 msgstr	""
 
-#: src/lang.c:1692
+#: src/lang.c:1687
 msgid	"# What should we ask confirmation for.\n"
 msgstr	""
 
-#: src/lang.c:1696
+#: src/lang.c:1691
 msgid	"Program to run to open URL's, <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1697
+#: src/lang.c:1692
 msgid	"Program that opens URL's           :"
 msgstr	""
 
-#: src/lang.c:1698
+#: src/lang.c:1693
 msgid	"# The program used to open URL's. The actual URL will be appended\n"
 msgstr	""
 
-#: src/lang.c:1703
+#: src/lang.c:1698
 msgid	"Use mouse in xterm                 :"
 msgstr	""
 
-#: src/lang.c:1704
+#: src/lang.c:1699
 msgid	"# If ON enable mouse key support on xterm terminals\n"
 msgstr	""
 
-#: src/lang.c:1710
+#: src/lang.c:1705
 msgid	"Use scroll keys on keypad          :"
 msgstr	""
 
-#: src/lang.c:1711
+#: src/lang.c:1706
 msgid	"# If ON enable scroll keys on terminals that support it\n"
 msgstr	""
 
-#: src/lang.c:1716
+#: src/lang.c:1711
 msgid	"Enter maximum number of article to get. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1717
+#: src/lang.c:1712
 msgid	"Number of articles to get          :"
 msgstr	""
 
-#: src/lang.c:1718
+#: src/lang.c:1713
 msgid	"# Number of articles to get (0=no limit), if negative sets maximum number\n"
 	"# of already read articles to be read before first unread one\n"
 msgstr	""
 
-#: src/lang.c:1723
+#: src/lang.c:1718
 msgid	"Enter number of days article is considered recent. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1724
+#: src/lang.c:1719
 msgid	"Article recentness time limit      :"
 msgstr	""
 
-#: src/lang.c:1725
+#: src/lang.c:1720
 msgid	"# Number of days in which article is considered recent, (0=OFF)\n"
 msgstr	""
 
-#: src/lang.c:1729
+#: src/lang.c:1724
 msgid	"WILDMAT for normal wildcards, REGEX for full regular expression matching."
 msgstr	""
 
-#: src/lang.c:1730
+#: src/lang.c:1725
 msgid	"Wildcard matching                  :"
 msgstr	""
 
-#: src/lang.c:1731
+#: src/lang.c:1726
 msgid	"# Wildcard matching 0=(wildmat) 1=(regex)\n"
 msgstr	""
 
-#: src/lang.c:1735
+#: src/lang.c:1730
 msgid	"Enter minimal score before an article is marked killed. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1736
+#: src/lang.c:1731
 msgid	"Score limit (kill)                 :"
 msgstr	""
 
-#: src/lang.c:1737
+#: src/lang.c:1732
 msgid	"# Score limit before an article is marked killed\n"
 msgstr	""
 
-#: src/lang.c:1741
+#: src/lang.c:1736
 msgid	"Enter default score to kill articles. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1742
+#: src/lang.c:1737
 msgid	"Default score to kill articles     :"
 msgstr	""
 
-#: src/lang.c:1743
+#: src/lang.c:1738
 msgid	"# Default score to kill articles\n"
 msgstr	""
 
-#: src/lang.c:1747
+#: src/lang.c:1742
 msgid	"Enter minimal score before an article is marked hot. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1748
+#: src/lang.c:1743
 msgid	"Score limit (select)               :"
 msgstr	""
 
-#: src/lang.c:1749
+#: src/lang.c:1744
 msgid	"# Score limit before an article is marked hot\n"
 msgstr	""
 
-#: src/lang.c:1753
+#: src/lang.c:1748
 msgid	"Enter default score to select articles. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1754
+#: src/lang.c:1749
 msgid	"Default score to select articles   :"
 msgstr	""
 
-#: src/lang.c:1755
+#: src/lang.c:1750
 msgid	"# Default score to select articles\n"
 msgstr	""
 
-#: src/lang.c:1761
+#: src/lang.c:1756
 msgid	"Use slrnface to show ''X-Face:''s  :"
 msgstr	""
 
-#: src/lang.c:1762
+#: src/lang.c:1757
 msgid	"# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n"
 	"# Only useful when running in an xterm.\n"
 msgstr	""
 
-#: src/lang.c:1770
+#: src/lang.c:1765
 msgid	"Use ANSI color                     :"
 msgstr	"Use ANSI colour                    :"
 
-#: src/lang.c:1771
+#: src/lang.c:1766
 msgid	"# If ON using ANSI-color\n"
 msgstr	"# If ON using ANSI-colour\n"
 
-#: src/lang.c:1776
+#: src/lang.c:1771
 msgid	"Standard foreground color          :"
 msgstr	"Standard foreground colour         :"
 
-#: src/lang.c:1777
+#: src/lang.c:1772
 msgid	"# Standard foreground color\n"
 msgstr	"# Standard foreground colour\n"
 
-#: src/lang.c:1782
+#: src/lang.c:1777
 msgid	"Standard background color          :"
 msgstr	"Standard background colour         :"
 
-#: src/lang.c:1783
+#: src/lang.c:1778
 msgid	"# Standard-Background-Color\n"
 msgstr	"# Standard-Background-Colour\n"
 
-#: src/lang.c:1788
+#: src/lang.c:1783
 msgid	"Color for inverse text (background):"
 msgstr	"Colour for inverse text (bg)       :"
 
-#: src/lang.c:1789
+#: src/lang.c:1784
 msgid	"# Color of background for inverse text\n"
 msgstr	"# Colour of background for inverse text\n"
 
-#: src/lang.c:1794
+#: src/lang.c:1789
 msgid	"Color for inverse text (foreground):"
 msgstr	"Colour for inverse text (fg)       :"
 
-#: src/lang.c:1795
+#: src/lang.c:1790
 msgid	"# Color of foreground for inverse text\n"
 msgstr	"# Colour of foreground for inverse text\n"
 
-#: src/lang.c:1800
+#: src/lang.c:1795
 msgid	"Color of text lines                :"
 msgstr	"Colour of text lines               :"
 
-#: src/lang.c:1801
+#: src/lang.c:1796
 msgid	"# Color of text-lines\n"
 msgstr	"# Colour of text-lines\n"
 
-#: src/lang.c:1806
+#: src/lang.c:1801
 msgid	"Color of mini help menu            :"
 msgstr	"Colour of mini help menu           :"
 
-#: src/lang.c:1807
+#: src/lang.c:1802
 msgid	"# Color of mini help menu\n"
 msgstr	"# Colour of mini help menu\n"
 
-#: src/lang.c:1812
+#: src/lang.c:1807
 msgid	"Color of help text                 :"
 msgstr	"Colour of help text                :"
 
-#: src/lang.c:1813
+#: src/lang.c:1808
 msgid	"# Color of help pages\n"
 msgstr	"# Colour of help pages\n"
 
-#: src/lang.c:1818
+#: src/lang.c:1813
 msgid	"Color of status messages           :"
 msgstr	"Colour of status messages          :"
 
-#: src/lang.c:1819
+#: src/lang.c:1814
 msgid	"# Color of messages in last line\n"
 msgstr	"# Colour of messages in last line\n"
 
-#: src/lang.c:1824
+#: src/lang.c:1819
 msgid	"Color of quoted lines              :"
 msgstr	"Colour of quoted lines             :"
 
-#: src/lang.c:1825
+#: src/lang.c:1820
 msgid	"# Color of quote-lines\n"
 msgstr	"# Colour of quote-lines\n"
 
-#: src/lang.c:1830
+#: src/lang.c:1825
 msgid	"Color of twice quoted line         :"
 msgstr	"Colour of twice quoted line        :"
 
-#: src/lang.c:1831
+#: src/lang.c:1826
 msgid	"# Color of twice quoted lines\n"
 msgstr	"# Colour of twice quoted lines\n"
 
-#: src/lang.c:1836
+#: src/lang.c:1831
 msgid	"Color of =>3 times quoted line     :"
 msgstr	"Colour of =>3 times quoted line    :"
 
-#: src/lang.c:1837
+#: src/lang.c:1832
 msgid	"# Color of >=3 times quoted lines\n"
 msgstr	"# Colour of >=3 times quoted lines\n"
 
-#: src/lang.c:1842
+#: src/lang.c:1837
 msgid	"Color of article header lines      :"
 msgstr	"Colour of article header lines     :"
 
-#: src/lang.c:1843
+#: src/lang.c:1838
 msgid	"# Color of header-lines\n"
 msgstr	"# Colour of header-lines\n"
 
-#: src/lang.c:1848
+#: src/lang.c:1843
 msgid	"Color of actual news header fields :"
 msgstr	"Colour of actual news header fields:"
 
-#: src/lang.c:1849
+#: src/lang.c:1844
 msgid	"# Color of actual news header fields\n"
 msgstr	"# Colour of actual news header fields\n"
 
-#: src/lang.c:1854
+#: src/lang.c:1849
 msgid	"Color of article subject lines     :"
 msgstr	"Colour of article subject lines    :"
 
-#: src/lang.c:1855
+#: src/lang.c:1850
 msgid	"# Color of article subject\n"
 msgstr	"# Colour of article subject\n"
 
-#: src/lang.c:1860
+#: src/lang.c:1855
 msgid	"Color of response counter          :"
 msgstr	"Colour of response counter         :"
 
-#: src/lang.c:1861
+#: src/lang.c:1856
 msgid	"# Color of response counter\n"
 msgstr	"# Colour of response counter\n"
 
-#: src/lang.c:1866
+#: src/lang.c:1861
 msgid	"Color of sender (From:)            :"
 msgstr	"Colour of sender (From:)           :"
 
-#: src/lang.c:1867
+#: src/lang.c:1862
 msgid	"# Color of sender (From:)\n"
 msgstr	"# Colour of sender (From:)\n"
 
-#: src/lang.c:1872
+#: src/lang.c:1867
 msgid	"Color of help/mail sign            :"
 msgstr	"Colour of help/mail sign           :"
 
-#: src/lang.c:1873
+#: src/lang.c:1868
 msgid	"# Color of Help/Mail-Sign\n"
 msgstr	"# Colour of Help/Mail-Sign\n"
 
-#: src/lang.c:1878
+#: src/lang.c:1873
 msgid	"Color of signatures                :"
 msgstr	"Colour of signatures               :"
 
-#: src/lang.c:1879
+#: src/lang.c:1874
 msgid	"# Color of signature\n"
 msgstr	"# Colour of signature\n"
 
-#: src/lang.c:1884
+#: src/lang.c:1879
 msgid	"Color of highlighting with *stars* :"
 msgstr	"Colour of highlighting with *stars*:"
 
-#: src/lang.c:1885
+#: src/lang.c:1880
 msgid	"# Color of word highlighting. There are four possibilities\n"
 	"# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n"
 msgstr	"# Colour of word highlighting. There are four possibilities\n"
 	"# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n"
 
-#: src/lang.c:1891
+#: src/lang.c:1886
 msgid	"Color of highlighting with _dash_  :"
 msgstr	"Colour of highlighting with _dash_ :"
 
-#: src/lang.c:1897
+#: src/lang.c:1892
 msgid	"Color of highlighting with /slash/ :"
 msgstr	"Colour of highlighting with /slash/:"
 
-#: src/lang.c:1903
+#: src/lang.c:1898
 msgid	"Color of highlighting with -stroke-:"
 msgstr	"Colour of highlighting w. -stroke- :"
 
-#: src/lang.c:1910
+#: src/lang.c:1905
 msgid	"Attr. of highlighting with *stars* :"
 msgstr	""
 
-#: src/lang.c:1911
+#: src/lang.c:1906
 msgid	"# Attribute of word highlighting on mono terminals.\n"
 	"# There are four possibilities in articles:\n"
 	"# *stars*, /slashes/, _underdashes_ and -strokes-.\n"
@@ -4902,85 +4918,85 @@ msgid	"# Attribute of word highlighting 
 	"# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n"
 msgstr	""
 
-#: src/lang.c:1921
+#: src/lang.c:1916
 msgid	"Attr. of highlighting with _dash_  :"
 msgstr	""
 
-#: src/lang.c:1927
+#: src/lang.c:1922
 msgid	"Attr. of highlighting with /slash/ :"
 msgstr	""
 
-#: src/lang.c:1933
+#: src/lang.c:1928
 msgid	"Attr. of highlighting with -stroke-:"
 msgstr	""
 
-#: src/lang.c:1939
+#: src/lang.c:1934
 msgid	"Word highlighting in message body  :"
 msgstr	""
 
-#: src/lang.c:1940
+#: src/lang.c:1935
 msgid	"# Enable word highlighting?\n"
 msgstr	""
 
-#: src/lang.c:1945
+#: src/lang.c:1940
 msgid	"What to display instead of mark    :"
 msgstr	""
 
-#: src/lang.c:1946
+#: src/lang.c:1941
 msgid	"# Should the leading and ending stars and dashes also be displayed,\n"
 	"# even when they are highlighting marks?\n"
 	"# 0 - no    1 - yes, display mark    2 - print a space instead\n"
 msgstr	""
 
-#: src/lang.c:1952
+#: src/lang.c:1947
 msgid	"Enter column number to wrap article lines to in the pager. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1953
+#: src/lang.c:1948
 msgid	"Page line wrap column              :"
 msgstr	""
 
-#: src/lang.c:1954
+#: src/lang.c:1949
 msgid	"# Wrap article lines at column\n"
 msgstr	""
 
-#: src/lang.c:1959
+#: src/lang.c:1954
 msgid	"Wrap around threads on next unread :"
 msgstr	""
 
-#: src/lang.c:1960
+#: src/lang.c:1955
 msgid	"# If ON wrap around threads on searching next unread article\n"
 msgstr	""
 
-#: src/lang.c:1964
+#: src/lang.c:1959
 msgid	"Enter default mail address (and fullname). <CR> sets."
 msgstr	""
 
-#: src/lang.c:1965
+#: src/lang.c:1960
 msgid	"Mail address (and fullname)        :"
 msgstr	""
 
-#: src/lang.c:1966
+#: src/lang.c:1961
 msgid	"# User's mail address (and fullname), if not username@host (fullname)\n"
 msgstr	""
 
-#: src/lang.c:1971
+#: src/lang.c:1966
 msgid	"Show empty Followup-To in editor   :"
 msgstr	""
 
-#: src/lang.c:1972
+#: src/lang.c:1967
 msgid	"# If ON show empty Followup-To header when editing an article\n"
 msgstr	""
 
-#: src/lang.c:1976
+#: src/lang.c:1971
 msgid	"Enter path/! command/--none to create your default signature. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1977
+#: src/lang.c:1972
 msgid	"Create signature from path/command :"
 msgstr	""
 
-#: src/lang.c:1978
+#: src/lang.c:1973
 msgid	"# Signature path (random sigs)/file to be used when posting/replying\n"
 	"# default_sigfile=file       appends file as signature\n"
 	"# default_sigfile=!command   executes external command to generate a "
@@ -4988,48 +5004,48 @@ msgid	"# Signature path (random sigs)/fi
 	"# default_sigfile=--none     don't append a signature\n"
 msgstr	""
 
-#: src/lang.c:1985
+#: src/lang.c:1980
 msgid	"Prepend signature with \"-- \" on own line. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1986
+#: src/lang.c:1981
 msgid	"Prepend signature with \"-- \"       :"
 msgstr	""
 
-#: src/lang.c:1987
+#: src/lang.c:1982
 msgid	"# If ON prepend the signature with dashes '\\n-- \\n'\n"
 msgstr	""
 
-#: src/lang.c:1991
+#: src/lang.c:1986
 msgid	"Add signature when reposting articles. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1992
+#: src/lang.c:1987
 msgid	"Add signature when reposting       :"
 msgstr	""
 
-#: src/lang.c:1993
+#: src/lang.c:1988
 msgid	"# If ON add signature to reposted articles\n"
 msgstr	""
 
-#: src/lang.c:1997
+#: src/lang.c:1992
 msgid	"Enter quotation marks, %s or %S for author's initials."
 msgstr	""
 
-#: src/lang.c:1998
+#: src/lang.c:1993
 msgid	"Characters used as quote-marks     :"
 msgstr	""
 
-#: src/lang.c:1999
+#: src/lang.c:1994
 msgid	"# Characters used in quoting to followups and replies.\n"
 	"# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n"
 msgstr	""
 
-#: src/lang.c:2005
+#: src/lang.c:2000
 msgid	"Quoting behavior                   :"
 msgstr	"Quoting behaviour                  :"
 
-#: src/lang.c:2006
+#: src/lang.c:2001
 msgid	"# How quoting should be handled when following up or replying.\n"
 	"# 0 = Nothing special\n"
 	"# 1 = Compress quotes\n"
@@ -5041,49 +5057,49 @@ msgid	"# How quoting should be handled w
 	"# 7 = Compress quotes, quote signatures, quote empty lines\n"
 msgstr	""
 
-#: src/lang.c:2018 src/lang.c:2026 src/lang.c:2032
+#: src/lang.c:2013 src/lang.c:2021 src/lang.c:2027
 msgid	"%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name"
 msgstr	""
 
-#: src/lang.c:2019
+#: src/lang.c:2014
 msgid	"Quote line when following up       :"
 msgstr	""
 
-#: src/lang.c:2020
+#: src/lang.c:2015
 msgid	"# Format of quote line when mailing/posting/following-up an article\n"
 	"# %%A Address    %%D Date   %%F Addr+Name   %%G Groupname   %%M Message-ID\n"
 	"# %%N Full Name  %%C First Name   %%I Initials\n"
 msgstr	""
 
-#: src/lang.c:2027
+#: src/lang.c:2022
 msgid	"Quote line when cross-posting      :"
 msgstr	""
 
-#: src/lang.c:2033
+#: src/lang.c:2028
 msgid	"Quote line when mailing            :"
 msgstr	""
 
-#: src/lang.c:2038
+#: src/lang.c:2033
 msgid	"If ON, include User-Agent: header. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2039
+#: src/lang.c:2034
 msgid	"Insert 'User-Agent:'-header        :"
 msgstr	""
 
-#: src/lang.c:2040
+#: src/lang.c:2035
 msgid	"# If ON include advertising User-Agent: header\n"
 msgstr	""
 
-#: src/lang.c:2044
+#: src/lang.c:2039
 msgid	"Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), <CR> to set."
 msgstr	""
 
-#: src/lang.c:2045
+#: src/lang.c:2040
 msgid	"MM_CHARSET                         :"
 msgstr	""
 
-#: src/lang.c:2046
+#: src/lang.c:2041
 msgid	"# Charset supported locally which is also used for MIME header and\n"
 	"# Content-Type header.\n"
 	"# If not set, the value of the environment variable MM_CHARSET is used.\n"
@@ -5092,27 +5108,27 @@ msgid	"# Charset supported locally which
 	"# mm_charset is considered not displayable and represented as '?'.\n"
 msgstr	""
 
-#: src/lang.c:2057
+#: src/lang.c:2052
 msgid	"MM_NETWORK_CHARSET                 :"
 msgstr	""
 
-#: src/lang.c:2058
+#: src/lang.c:2053
 msgid	"# Charset used for MIME (Content-Type) header in postings.\n"
 msgstr	""
 
-#: src/lang.c:2064
+#: src/lang.c:2059
 msgid	"Mailbox format                     :"
 msgstr	""
 
-#: src/lang.c:2065
+#: src/lang.c:2060
 msgid	"# Format of the mailbox.\n"
 msgstr	""
 
-#: src/lang.c:2070
+#: src/lang.c:2065
 msgid	"MIME encoding in news messages     :"
 msgstr	""
 
-#: src/lang.c:2071
+#: src/lang.c:2066
 msgid	"# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n"
 	"# for mails and posts, if necessary. QP is efficient for most European\n"
 	"# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n"
@@ -5120,42 +5136,42 @@ msgid	"# MIME encoding (8bit, base64, qu
 	"# Russian charsets with a lot of 8bit characters.\n"
 msgstr	""
 
-#: src/lang.c:2079 src/lang.c:2100
+#: src/lang.c:2074 src/lang.c:2095
 msgid	"Don't change unless you know what you are doing. <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:2080
+#: src/lang.c:2075
 msgid	"Use 8bit characters in news headers:"
 msgstr	""
 
-#: src/lang.c:2081
+#: src/lang.c:2076
 msgid	"# If ON, 8bit characters in news headers are NOT encoded.\n"
 	"# default is OFF. Thus 8bit characters are encoded by default.\n"
 	"# 8bit chars in header are encoded regardless of the value of this\n"
 	"# parameter unless post_mime_encoding is 8bit as well.\n"
 msgstr	""
 
-#: src/lang.c:2088
+#: src/lang.c:2083
 msgid	"Auto-view post-processed files <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:2089
+#: src/lang.c:2084
 msgid	"View post-processed files          :"
 msgstr	""
 
-#: src/lang.c:2090
+#: src/lang.c:2085
 msgid	"# If set, post processed files will be opened in a viewer\n"
 msgstr	""
 
-#: src/lang.c:2095
+#: src/lang.c:2090
 msgid	"MIME encoding in mail messages     :"
 msgstr	""
 
-#: src/lang.c:2101
+#: src/lang.c:2096
 msgid	"Use 8bit characters in mail headers:"
 msgstr	""
 
-#: src/lang.c:2102
+#: src/lang.c:2097
 msgid	"# If ON, 8bit characters in mail headers are NOT encoded.\n"
 	"# default is OFF. Thus 8bit characters are encoded by default.\n"
 	"# 8bit chars in headers are encoded regardless of the value of this "
@@ -5165,600 +5181,600 @@ msgid	"# If ON, 8bit characters in mail 
 	"# turn it ON unless you have some compelling reason.\n"
 msgstr	""
 
-#: src/lang.c:2112
+#: src/lang.c:2107
 msgid	"Strip blanks of end of lines       :"
 msgstr	""
 
-#: src/lang.c:2113
+#: src/lang.c:2108
 msgid	"# If ON strip blanks from end of lines to speedup display on slow terminals\n"
 msgstr	""
 
-#: src/lang.c:2118
+#: src/lang.c:2113
 msgid	"If ON, use transliteration. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2119
+#: src/lang.c:2114
 msgid	"Transliteration                    :"
 msgstr	""
 
-#: src/lang.c:2120
+#: src/lang.c:2115
 msgid	"# If ON, use //TRANSLIT extension. This means that when a character cannot\n"
 	"# be represented in the in the target character set, it can be approximated\n"
 	"# through one or several similarly looking characters.\n"
 msgstr	""
 
-#: src/lang.c:2127
+#: src/lang.c:2122
 msgid	"Send you a carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2128
+#: src/lang.c:2123
 msgid	"Send you a cc automatically        :"
 msgstr	""
 
-#: src/lang.c:2129
+#: src/lang.c:2124
 msgid	"# If ON automatically put your name in the Cc: field when mailing an article\n"
 msgstr	""
 
-#: src/lang.c:2133
+#: src/lang.c:2128
 msgid	"Send you a blind carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2134
+#: src/lang.c:2129
 msgid	"Send you a blind cc automatically  :"
 msgstr	""
 
-#: src/lang.c:2135
+#: src/lang.c:2130
 msgid	"# If ON automatically put your name in the Bcc: field when mailing an "
 	"article\n"
 msgstr	""
 
-#: src/lang.c:2139
+#: src/lang.c:2134
 msgid	"Enter address elements about which you want to be warned. <CR> sets."
 msgstr	""
 
-#: src/lang.c:2140
+#: src/lang.c:2135
 msgid	"Spamtrap warning address parts     :"
 msgstr	""
 
-#: src/lang.c:2141
+#: src/lang.c:2136
 msgid	"# A comma-delimited list of address-parts you want to be warned\n"
 	"# about when trying to reply by email.\n"
 msgstr	""
 
-#: src/lang.c:2146
+#: src/lang.c:2141
 msgid	"Enter default number of days a filter entry will be valid. <CR> sets."
 msgstr	""
 
-#: src/lang.c:2147
+#: src/lang.c:2142
 msgid	"No. of days a filter entry is valid:"
 msgstr	""
 
-#: src/lang.c:2148
+#: src/lang.c:2143
 msgid	"# Number of days a short term filter will be active\n"
 msgstr	""
 
-#: src/lang.c:2152
+#: src/lang.c:2147
 msgid	"Add posted articles to filter. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2153
+#: src/lang.c:2148
 msgid	"Add posted articles to filter      :"
 msgstr	""
 
-#: src/lang.c:2154
+#: src/lang.c:2149
 msgid	"# If ON add posted articles which start a new thread to filter for\n"
 	"# highlighting follow-ups\n"
 msgstr	""
 
-#: src/lang.c:2158
+#: src/lang.c:2153
 msgid	"The directory where articles/threads are to be saved in mailbox format."
 msgstr	""
 
-#: src/lang.c:2159
+#: src/lang.c:2154
 msgid	"Mail directory                     :"
 msgstr	""
 
-#: src/lang.c:2160
+#: src/lang.c:2155
 msgid	"# (-m) directory where articles/threads are saved in mailbox format\n"
 msgstr	""
 
-#: src/lang.c:2165
+#: src/lang.c:2160
 msgid	"Save articles in batch mode (-S)   :"
 msgstr	""
 
-#: src/lang.c:2166
+#: src/lang.c:2161
 msgid	"# If ON articles/threads will be saved in batch mode when save -S\n"
 	"# or mail (-M/-N) is specified on the command line\n"
 msgstr	""
 
-#: src/lang.c:2171
+#: src/lang.c:2166
 msgid	"The directory where you want articles/threads saved."
 msgstr	""
 
-#: src/lang.c:2172
+#: src/lang.c:2167
 msgid	"Directory to save arts/threads in  :"
 msgstr	""
 
-#: src/lang.c:2173
+#: src/lang.c:2168
 msgid	"# Directory where articles/threads are saved\n"
 msgstr	""
 
-#: src/lang.c:2177
+#: src/lang.c:2172
 msgid	"Auto save article/thread by Archive-name: header. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2178
+#: src/lang.c:2173
 msgid	"Use Archive-name: header for save  :"
 msgstr	""
 
-#: src/lang.c:2179
+#: src/lang.c:2174
 msgid	"# If ON articles/threads with Archive-name: in mail header will\n"
 	"# be automatically saved with the Archive-name & part/patch no.\n"
 msgstr	""
 
-#: src/lang.c:2184
+#: src/lang.c:2179
 msgid	"Mark saved articles/threads as read. <SPACE> toggles, <CR> sets, <ESC> "
 	"cancels."
 msgstr	""
 
-#: src/lang.c:2185
+#: src/lang.c:2180
 msgid	"Mark saved articles/threads as read:"
 msgstr	""
 
-#: src/lang.c:2186
+#: src/lang.c:2181
 msgid	"# If ON mark articles that are saved as read\n"
 msgstr	""
 
-#: src/lang.c:2190
+#: src/lang.c:2185
 msgid	"Do post processing (eg. extract attachments) for saved articles."
 msgstr	""
 
-#: src/lang.c:2191
+#: src/lang.c:2186
 msgid	"Post process saved articles        :"
 msgstr	""
 
-#: src/lang.c:2192
+#: src/lang.c:2187
 msgid	"# Perform post processing (saving binary attachments) from saved articles.\n"
 	"# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n"
 msgstr	""
 
-#: src/lang.c:2198
+#: src/lang.c:2193
 msgid	"Process only unread articles       :"
 msgstr	""
 
-#: src/lang.c:2199
+#: src/lang.c:2194
 msgid	"# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n"
 msgstr	""
 
-#: src/lang.c:2204
+#: src/lang.c:2199
 msgid	"Print all or just part of header. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2205
+#: src/lang.c:2200
 msgid	"Print all headers when printing    :"
 msgstr	""
 
-#: src/lang.c:2206
+#: src/lang.c:2201
 msgid	"# If ON print all of article header otherwise just the important lines\n"
 msgstr	""
 
-#: src/lang.c:2210
+#: src/lang.c:2205
 msgid	"The printer program with options that is to be used to print articles/threads."
 msgstr	""
 
-#: src/lang.c:2211
+#: src/lang.c:2206
 msgid	"Printer program with options       :"
 msgstr	""
 
-#: src/lang.c:2212
+#: src/lang.c:2207
 msgid	"# Print program with parameters used to print articles/threads\n"
 msgstr	""
 
-#: src/lang.c:2218
+#: src/lang.c:2213
 msgid	"Force redraw after certain commands:"
 msgstr	""
 
-#: src/lang.c:2219
+#: src/lang.c:2214
 msgid	"# If ON a screen redraw will always be done after certain external commands\n"
 msgstr	""
 
-#: src/lang.c:2223
+#: src/lang.c:2218
 msgid	"Start editor with line offset. <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:2224
+#: src/lang.c:2219
 msgid	"Start editor with line offset      :"
 msgstr	""
 
-#: src/lang.c:2225
+#: src/lang.c:2220
 msgid	"# If ON editor will be started with cursor offset into the file\n"
 	"# otherwise the cursor will be positioned at the first line\n"
 msgstr	""
 
-#: src/lang.c:2230
+#: src/lang.c:2225
 msgid	"Enter %E for editor, %F for filename, %N for line-number, <CR> to set."
 msgstr	""
 
-#: src/lang.c:2231
+#: src/lang.c:2226
 msgid	"Invocation of your editor          :"
 msgstr	""
 
-#: src/lang.c:2232
+#: src/lang.c:2227
 msgid	"# Format of editor line including parameters\n"
 	"# %%E Editor  %%F Filename  %%N Linenumber\n"
 msgstr	""
 
-#: src/lang.c:2237
+#: src/lang.c:2232
 msgid	"Enter name and options for external-inews, --internal for internal inews"
 msgstr	""
 
-#: src/lang.c:2238
+#: src/lang.c:2233
 msgid	"External inews                     :"
 msgstr	""
 
-#: src/lang.c:2239
+#: src/lang.c:2234
 msgid	"# If --internal use the built in mini inews for posting via NNTP\n"
 	"# otherwise use an external inews program\n"
 msgstr	""
 
-#: src/lang.c:2243
+#: src/lang.c:2238
 msgid	"Enter %M for mailer, %S for subject, %T for to, %F for filename, <CR> to set."
 msgstr	""
 
-#: src/lang.c:2244
+#: src/lang.c:2239
 msgid	"Invocation of your mail command    :"
 msgstr	""
 
-#: src/lang.c:2245
+#: src/lang.c:2240
 msgid	"# Format of mailer line including parameters\n"
 	"# %%M Mailer  %%S Subject  %%T To  %%F Filename  %%U User (AmigaDOS)\n"
 	"# ie. to use elm as your mailer:    elm -s \"%%S\" \"%%T\" < %%F\n"
 	"# ie. elm interactive          :    elm -i %%F -s \"%%S\" \"%%T\"\n"
 msgstr	""
 
-#: src/lang.c:2253
+#: src/lang.c:2248
 msgid	"Use interactive mail reader        :"
 msgstr	""
 
-#: src/lang.c:2254
+#: src/lang.c:2249
 msgid	"# Interactive mailreader: if ON mailreader will be invoked earlier for\n"
 	"# reply so you can use more of its features (eg. MIME, pgp, ...)\n"
 	"# this option has to suit default_mailer_format\n"
 msgstr	""
 
-#: src/lang.c:2261
+#: src/lang.c:2256
 msgid	"Remove ~/.article after posting    :"
 msgstr	""
 
-#: src/lang.c:2262
+#: src/lang.c:2257
 msgid	"# If ON remove ~/.article after posting.\n"
 msgstr	""
 
-#: src/lang.c:2266
+#: src/lang.c:2261
 msgid	"Filename for all posted articles, <CR> sets, no filename=do not save."
 msgstr	""
 
-#: src/lang.c:2267
+#: src/lang.c:2262
 msgid	"Filename for posted articles       :"
 msgstr	""
 
-#: src/lang.c:2268
+#: src/lang.c:2263
 msgid	"# Filename where to keep all postings (default posted)\n"
 	"# If no filename is set then postings will not be saved\n"
 msgstr	""
 
-#: src/lang.c:2273
+#: src/lang.c:2268
 msgid	"Keep all failed articles in ~/dead.articles. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2274
+#: src/lang.c:2269
 msgid	"Keep failed arts in ~/dead.articles:"
 msgstr	""
 
-#: src/lang.c:2275
+#: src/lang.c:2270
 msgid	"# If ON keep all failed postings in ~/dead.articles\n"
 msgstr	""
 
-#: src/lang.c:2279
+#: src/lang.c:2274
 msgid	"Do you want to strip unsubscribed groups from .newsrc"
 msgstr	""
 
-#: src/lang.c:2280
+#: src/lang.c:2275
 msgid	"No unsubscribed groups in newsrc   :"
 msgstr	""
 
-#: src/lang.c:2281
+#: src/lang.c:2276
 msgid	"# If ON strip unsubscribed groups from newsrc\n"
 msgstr	""
 
-#: src/lang.c:2286
+#: src/lang.c:2281
 msgid	"Remove bogus groups from newsrc    :"
 msgstr	""
 
-#: src/lang.c:2287
+#: src/lang.c:2282
 msgid	"# What to do with bogus groups in newsrc file\n"
 	"# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n"
 msgstr	""
 
-#: src/lang.c:2291
+#: src/lang.c:2286
 msgid	"Enter number of seconds until active file will be reread. <CR> sets."
 msgstr	""
 
-#: src/lang.c:2292
+#: src/lang.c:2287
 msgid	"Interval in secs to reread active  :"
 msgstr	""
 
-#: src/lang.c:2293
+#: src/lang.c:2288
 msgid	"# Time interval in seconds between rereading the active file (0=never)\n"
 msgstr	""
 
-#: src/lang.c:2298
+#: src/lang.c:2293
 msgid	"Reconnect to server automatically  :"
 msgstr	""
 
-#: src/lang.c:2299
+#: src/lang.c:2294
 msgid	"# If ON automatically reconnect to NNTP server if the connection is broken\n"
 msgstr	""
 
-#: src/lang.c:2303
+#: src/lang.c:2298
 msgid	"Create local copies of NNTP overview files. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2304
+#: src/lang.c:2299
 msgid	"Cache NNTP overview files locally  :"
 msgstr	""
 
-#: src/lang.c:2305
+#: src/lang.c:2300
 msgid	"# If ON, create local copies of NNTP overview files.\n"
 msgstr	""
 
-#: src/main.c:627
+#: src/main.c:619
 #, c-format
 msgid	"Version: %s release %s (\"%s\") %s %s"
 msgstr	""
 
-#: src/main.c:630
+#: src/main.c:622
 #, c-format
 msgid	"Version: %s release %s (\"%s\")"
 msgstr	""
 
-#: src/nntplib.c:795
+#: src/nntplib.c:804
 #, c-format
 msgid	"\n"
 	"Server timed out, trying reconnect # %d\n"
 msgstr	""
 
-#: src/nntplib.c:813
+#: src/nntplib.c:822
 msgid	"Rejoin current group\n"
 msgstr	""
 
-#: src/nntplib.c:820
+#: src/nntplib.c:829
 #, c-format
 msgid	"Read (%s)\n"
 msgstr	""
 
-#: src/nntplib.c:822
+#: src/nntplib.c:831
 #, c-format
 msgid	"Resend last command (%s)\n"
 msgstr	""
 
-#: src/nntplib.c:942
+#: src/nntplib.c:951
 msgid	"100  Help text on way"
 msgstr	""
 
-#: src/nntplib.c:946
+#: src/nntplib.c:955
 msgid	"180  Authorization capabilities"
 msgstr	"180  Authorisation capabilities"
 
-#: src/nntplib.c:950
+#: src/nntplib.c:959
 msgid	"199  Debug output"
 msgstr	""
 
-#: src/nntplib.c:954
+#: src/nntplib.c:963
 msgid	"200  Hello; you can post"
 msgstr	""
 
-#: src/nntplib.c:958
+#: src/nntplib.c:967
 msgid	"201  Hello; you can't post"
 msgstr	""
 
-#: src/nntplib.c:962
+#: src/nntplib.c:971
 msgid	"202  Slave status noted"
 msgstr	""
 
-#: src/nntplib.c:970
+#: src/nntplib.c:979
 msgid	"211  Group selected"
 msgstr	""
 
-#: src/nntplib.c:975
+#: src/nntplib.c:984
 msgid	"215  Newsgroups follow"
 msgstr	""
 
-#: src/nntplib.c:980
+#: src/nntplib.c:989
 msgid	"218  Group index file follows"
 msgstr	""
 
-#: src/nntplib.c:985
+#: src/nntplib.c:994
 msgid	"220  Article (head & body) follows"
 msgstr	""
 
-#: src/nntplib.c:989
+#: src/nntplib.c:998
 msgid	"221  Head follows"
 msgstr	""
 
-#: src/nntplib.c:993
+#: src/nntplib.c:1002
 msgid	"222  Body follows"
 msgstr	""
 
-#: src/nntplib.c:997
+#: src/nntplib.c:1006
 msgid	"223  No text sent -- stat, next, last"
 msgstr	""
 
-#: src/nntplib.c:1001
+#: src/nntplib.c:1010
 msgid	"230  New articles by message-id follow"
 msgstr	""
 
-#: src/nntplib.c:1005
+#: src/nntplib.c:1014
 msgid	"231  New newsgroups follow"
 msgstr	""
 
-#: src/nntplib.c:1009
+#: src/nntplib.c:1018
 msgid	"235  Article transferred successfully"
 msgstr	""
 
-#: src/nntplib.c:1013
+#: src/nntplib.c:1022
 msgid	"240  Article posted successfully"
 msgstr	""
 
-#: src/nntplib.c:1017
+#: src/nntplib.c:1026
 msgid	"280  Authorization system ok"
 msgstr	"280  Authorisation system ok"
 
-#: src/nntplib.c:1021
+#: src/nntplib.c:1030
 msgid	"281  Authorization (user/pass) ok"
 msgstr	"281  Authorisation (user/pass) ok"
 
-#: src/nntplib.c:1025
+#: src/nntplib.c:1034
 msgid	"282  binary data follows"
 msgstr	""
 
-#: src/nntplib.c:1029
+#: src/nntplib.c:1038
 msgid	"283  spooldir list follows"
 msgstr	""
 
-#: src/nntplib.c:1033
+#: src/nntplib.c:1042
 msgid	"284  Switching to a different spooldir"
 msgstr	""
 
-#: src/nntplib.c:1037
+#: src/nntplib.c:1046
 msgid	"285  Still using same spooldir"
 msgstr	""
 
-#: src/nntplib.c:1041
+#: src/nntplib.c:1050
 msgid	"286  Current spooldir"
 msgstr	""
 
-#: src/nntplib.c:1045
+#: src/nntplib.c:1054
 msgid	"287  Available spooldir"
 msgstr	""
 
-#: src/nntplib.c:1049
+#: src/nntplib.c:1058
 msgid	"288  Unavailable spooldir or invalid entry"
 msgstr	""
 
-#: src/nntplib.c:1053
+#: src/nntplib.c:1062
 msgid	"335  Continue to send article"
 msgstr	""
 
-#: src/nntplib.c:1057
+#: src/nntplib.c:1066
 msgid	"340  Continue to post article"
 msgstr	""
 
-#: src/nntplib.c:1061
+#: src/nntplib.c:1070
 msgid	"380  authorization is required"
 msgstr	"380  authorisation is required"
 
-#: src/nntplib.c:1065
+#: src/nntplib.c:1074
 msgid	"381  <type> authorization data required"
 msgstr	"381  <type> authorisation data required"
 
-#: src/nntplib.c:1069
+#: src/nntplib.c:1078
 msgid	"400  Have to hang up for some reason"
 msgstr	""
 
-#: src/nntplib.c:1073
+#: src/nntplib.c:1082
 msgid	"411  No such newsgroup"
 msgstr	""
 
-#: src/nntplib.c:1077
+#: src/nntplib.c:1086
 msgid	"412  Not currently in newsgroup"
 msgstr	""
 
-#: src/nntplib.c:1081
+#: src/nntplib.c:1090
 msgid	"418  No index file for this group"
 msgstr	""
 
-#: src/nntplib.c:1085
+#: src/nntplib.c:1094
 msgid	"420  No current article selected"
 msgstr	""
 
-#: src/nntplib.c:1089
+#: src/nntplib.c:1098
 msgid	"421  No next article in this group"
 msgstr	""
 
-#: src/nntplib.c:1093
+#: src/nntplib.c:1102
 msgid	"422  No previous article in this group"
 msgstr	""
 
-#: src/nntplib.c:1097
+#: src/nntplib.c:1106
 msgid	"423  No such article in this group"
 msgstr	""
 
-#: src/nntplib.c:1101
+#: src/nntplib.c:1110
 msgid	"430  No such article at all"
 msgstr	""
 
-#: src/nntplib.c:1105
+#: src/nntplib.c:1114
 msgid	"435  Already got that article, don't send"
 msgstr	""
 
-#: src/nntplib.c:1109
+#: src/nntplib.c:1118
 msgid	"436  Transfer failed"
 msgstr	""
 
-#: src/nntplib.c:1113
+#: src/nntplib.c:1122
 msgid	"437  Article rejected, don't resend"
 msgstr	""
 
-#: src/nntplib.c:1117
+#: src/nntplib.c:1126
 msgid	"440  Posting not allowed"
 msgstr	""
 
-#: src/nntplib.c:1121
+#: src/nntplib.c:1130
 msgid	"441  Posting failed"
 msgstr	""
 
-#: src/nntplib.c:1125
+#: src/nntplib.c:1134
 msgid	"480  authorization required for command"
 msgstr	"480  authorisation required for command"
 
-#: src/nntplib.c:1129
+#: src/nntplib.c:1138
 msgid	"481  Authorization system invalid"
 msgstr	"481  Authorisation system invalid"
 
-#: src/nntplib.c:1133
+#: src/nntplib.c:1142
 msgid	"482  Authorization data rejected"
 msgstr	"482  Authorisation data rejected"
 
-#: src/nntplib.c:1137
+#: src/nntplib.c:1146
 msgid	"483  Invalid alias on spooldir cmd"
 msgstr	""
 
-#: src/nntplib.c:1141
+#: src/nntplib.c:1150
 msgid	"484  No spooldir file found"
 msgstr	""
 
-#: src/nntplib.c:1145
+#: src/nntplib.c:1154
 msgid	"500  Command not recognized"
 msgstr	"500  Command not recognised"
 
-#: src/nntplib.c:1149
+#: src/nntplib.c:1158
 msgid	"501  Command syntax error"
 msgstr	""
 
-#: src/nntplib.c:1153
+#: src/nntplib.c:1162
 msgid	"502  Access to server denied"
 msgstr	""
 
-#: src/nntplib.c:1158
+#: src/nntplib.c:1167
 msgid	"503  Program fault, command not performed"
 msgstr	""
 
-#: src/nntplib.c:1162
+#: src/nntplib.c:1171
 msgid	"580  Authorization Failed"
 msgstr	"580  Authorisation Failed"
 
-#: src/nntplib.c:1166
+#: src/nntplib.c:1175
 msgid	"Unknown NNTP response code"
 msgstr	""
 
@@ -5767,22 +5783,22 @@ msgstr	""
 msgid	"couldn't expand %s\n"
 msgstr	""
 
-#: src/open.c:1103
+#: src/open.c:1040
 msgid	"Unreachable?\n"
 msgstr	""
 
-#: src/post.c:1712
+#: src/post.c:1749
 #, c-format
 msgid	"%s is bogus"
 msgstr	""
 
-#: src/post.c:1903
+#: src/post.c:1940
 #, c-format
 msgid	"Posting: %.*s ..."
 msgstr	""
 
 #. TODO: -> lang.c
-#: src/post.c:4012
+#: src/post.c:4037
 #, c-format
 msgid	"Rereading %s..."
 msgstr	""
@@ -5854,12 +5870,12 @@ msgstr	""
 msgid	"Can't run slrnface: couldn't construct fifo name."
 msgstr	""
 
-#: src/xface.c:151
+#: src/xface.c:162
 #, c-format
 msgid	"Slrnface abnormally exited, code %d."
 msgstr	""
 
-#: src/xface.c:195
+#: src/xface.c:206
 #, c-format
 msgid	"Slrnface failed: %s."
 msgstr	""
Binary files tin-1.5.18/po/et.gmo and tin-1.6.0/po/et.gmo differ
diff -Nurp tin-1.5.18/po/et.po tin-1.6.0/po/et.po
--- tin-1.5.18/po/et.po	Mon Jun  2 14:54:29 2003
+++ tin-1.6.0/po/et.po	Mon Jul 14 17:48:19 2003
@@ -4,8 +4,8 @@
 #
 msgid	""
 msgstr	"Project-Id-Version: tin 1.5.18\n"
-	"POT-Creation-Date: 2003-06-02 14:53+0200\n"
-	"PO-Revision-Date: 2003-05-15 20:54+0300\n"
+	"POT-Creation-Date: 2003-07-14 17:23+0200\n"
+	"PO-Revision-Date: 2003-06-13 14:15+0200\n"
 	"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 	"Language-Team: Estonian <et@li.org>\n"
 	"MIME-Version: 1.0\n"
@@ -229,31 +229,39 @@ msgstr	"Eelmisest reeglist eemaldatud: "
 msgid	"1 Response%s"
 msgstr	"1 Vastus%s"
 
-#: src/lang.c:45
+#: src/lang.c:46
 #, c-format
 msgid	"\n"
 	"%s contains no newsgroups. Exiting."
 msgstr	"\n"
 	"%s ei sisalda ühtki gruppi. Lõpetan töö."
 
-#: src/lang.c:46
-#, c-format
-msgid	"File %s exists. %s=append, %s=overwrite, %s=quit: "
-msgstr	"Fail %s on olemas. %s=jätka, %s=kirjuta üle, %s=välju: "
-
 #: src/lang.c:47
 msgid	"all "
 msgstr	"kõik "
 
 #: src/lang.c:48
+msgid	"All groups"
+msgstr	"Kõik grupid"
+
+#: src/lang.c:49
+#, c-format
+msgid	"File %s exists. %s=append, %s=overwrite, %s=quit: "
+msgstr	"Fail %s on olemas. %s=jätka, %s=kirjuta üle, %s=välju: "
+
+#: src/lang.c:50
 msgid	"Article cancelled (deleted)."
 msgstr	"Artikkel on katkestatud (kustutatud)."
 
-#: src/lang.c:49
+#: src/lang.c:51
 msgid	"Article cannot be cancelled (deleted)."
 msgstr	"Artiklit ei saa katkestada (kustutada)."
 
-#: src/lang.c:50
+#: src/lang.c:52
+msgid	"Article deleted."
+msgstr	"Artikkel kustutatud."
+
+#: src/lang.c:53
 #, c-format
 msgid	"\n"
 	"Your article:\n"
@@ -264,578 +272,539 @@ msgstr	"\n"
 	"  \"%s\"\n"
 	"postitatakse %s:\n"
 
-#: src/lang.c:51
+#: src/lang.c:54
 msgid	"Article not posted!"
 msgstr	"Artiklit ei postitatud!"
 
-#: src/lang.c:52
+#: src/lang.c:55
 msgid	"Article not saved"
 msgstr	"Artiklit ei salvestatud"
 
-#: src/lang.c:53
+#: src/lang.c:56
 msgid	"Article Level Commands"
 msgstr	"Artiklitaseme käsud"
 
-#: src/lang.c:54
+#: src/lang.c:57
+msgid	"Article has no parent"
+msgstr	"Artiklil pole eelnevat"
+
+#: src/lang.c:58
+msgid	"Parent article has been killed"
+msgstr	"Eelnev artikkel on hävitatud"
+
+#: src/lang.c:59
+msgid	"Parent article is unavailable"
+msgstr	"Eelnev artikkel pole kättesaadav"
+
+#: src/lang.c:60
 #, c-format
 msgid	"Article posted: %s"
 msgstr	"Artikkel on postitatud: %s"
 
-#: src/lang.c:55
+#: src/lang.c:61
 #, c-format
 msgid	"Article rejected (saved to %s)"
 msgstr	"Artikkel lükati tagasi (salvestasin faili %s)"
 
-#: src/lang.c:56
+#: src/lang.c:62
 #, c-format
 msgid	"%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: "
 msgstr	"%s=artikkel, %s=teema, %s=kuum, %s=muster, %s=märgitud artiklid, %s=välju: "
 
-#: src/lang.c:57
+#: src/lang.c:63
 msgid	"Article unavailable"
 msgstr	"Artiklit pole"
 
-#: src/lang.c:58
-msgid	"Article has no parent"
-msgstr	"Artiklil pole eelnevat"
-
-#: src/lang.c:59
-msgid	"Parent article has been killed"
-msgstr	"Eelnev artikkel on hävitatud"
-
-#: src/lang.c:60
-msgid	"Parent article is unavailable"
-msgstr	"Eelnev artikkel pole kättesaadav"
+#: src/lang.c:64
+msgid	"Article undeleted."
+msgstr	"Artikkel taastatud."
 
-#: src/lang.c:62
+#: src/lang.c:66
 msgid	"articles"
 msgstr	"artiklit"
 
-#: src/lang.c:63
+#: src/lang.c:67
 msgid	"This is a repost of the following article:"
 msgstr	"See on järgneva artikli uuesti postitamine:"
 
-#: src/lang.c:64
+#: src/lang.c:68
 msgid	"article"
 msgstr	"artikkel"
 
-#: src/lang.c:65
+#: src/lang.c:69
 msgid	"Article"
 msgstr	"Artikkel"
 
-#: src/lang.c:66
+#: src/lang.c:70
 #, c-format
 msgid	"-- %d %s mailed --"
 msgstr	"-- %d %s saadetud --"
 
-#: src/lang.c:68
+#: src/lang.c:71
 #, c-format
-msgid	"%d %s printed"
-msgstr	"%d %s trükitud"
+msgid	" at %s"
+msgstr	" o: %s"
 
-#: src/lang.c:70
+#: src/lang.c:72
 #, c-format
 msgid	"%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n"
 msgstr	"%*s[-- %s/%s, kodeerin %s%s%s, %d rida%s%s --]\n"
 
-#: src/lang.c:71
+#: src/lang.c:73
 msgid	", charset: "
 msgstr	", kooditabel: "
 
-#: src/lang.c:72
+#: src/lang.c:74
 #, c-format
 msgid	"%*s[-- Description: %s --]\n"
 msgstr	"%*s[-- Kirjeldus: %s --]\n"
 
-#: src/lang.c:73
-#, c-format
-msgid	"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
-	"\n"
-msgstr	"%*s[-- %s/%s, %suuenkodeeritud fail, %d rida, nimi: %s --]\n"
-	"\n"
-
-#: src/lang.c:74
+#: src/lang.c:75
 #, c-format
 msgid	"%d Authentication failed"
 msgstr	"%d Autentimine ebaõnnestus"
 
-#: src/lang.c:75
+#: src/lang.c:76
 msgid	"Server expects authentication.\n"
 msgstr	"Server eeldab autentimist.\n"
 
-#: src/lang.c:76
+#: src/lang.c:77
 msgid	"    Please enter password: "
 msgstr	"    Palun sisestage parool: "
 
-#: src/lang.c:77
+#: src/lang.c:78
 msgid	"    Please enter username: "
 msgstr	"    Palun sisestage kasutajanimi: "
 
-#: src/lang.c:78
+#: src/lang.c:79
 #, c-format
 msgid	"Author search backwards [%s]> "
 msgstr	"Autori tagaspidi otsimine [%s]> "
 
-#: src/lang.c:79
+#: src/lang.c:80
 #, c-format
 msgid	"Author search forwards [%s]> "
 msgstr	"Autori edaspidi otsimine [%s]> "
 
-#: src/lang.c:80
+#: src/lang.c:81
 #, c-format
 msgid	"Authorized for user: %s\n"
 msgstr	"Autoriseeritud kasutaja: %s\n"
 
-#: src/lang.c:81
+#: src/lang.c:82
 #, c-format
 msgid	"Authorization failed for user: %s\n"
 msgstr	"Autoriseerimine ebaõnnestus. Kasutaja: %s\n"
 
-#: src/lang.c:82
+#: src/lang.c:83
 #, c-format
 msgid	"\n"
 	"Autosubscribed to %s"
 msgstr	"\n"
 	"%s tellitud"
 
-#: src/lang.c:83
+#: src/lang.c:84
 msgid	"Autosubscribing groups...\n"
 msgstr	"Tellin grupid...\n"
 
-#: src/lang.c:84
+#: src/lang.c:85
 #, c-format
 msgid	"Autoselecting articles (use '%s' to see all unread) ..."
 msgstr	"Valin artiklid (kõikide lugemata artiklite vaatamiseks '%s') ..."
 
-#: src/lang.c:85
+#: src/lang.c:87
 #, c-format
 msgid	"Active file corrupt - %s"
 msgstr	"Aktiivsete artiklite fail on vigane - %s"
 
-#: src/lang.c:86
+#: src/lang.c:88
 #, c-format
 msgid	"Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: "
 msgstr	"Postitatav artikkel sai vigu või hoiatusi. %s=välju, %s=menüü, %s=toimeta: "
 
-#: src/lang.c:87
+#: src/lang.c:89
 #, c-format
 msgid	"Unrecognized attribute: %s"
 msgstr	"Tundmatu atribuut: %s"
 
-#: src/lang.c:88
+#: src/lang.c:90
 #, c-format
 msgid	"Bad command. Type '%s' for help."
 msgstr	"Vigane käsk. Abiinfo saamiseks vajutage '%s'."
 
-#: src/lang.c:90
+#: src/lang.c:92
 msgid	"Base article"
 msgstr	"Baasartikkel"
 
-#: src/lang.c:91
+#: src/lang.c:93
 msgid	"Base article range"
 msgstr	"Baasartiklite vahemik"
 
-#: src/lang.c:92
+#: src/lang.c:94
 #, c-format
 msgid	"%s: Updating of index files not supported\n"
 msgstr	"%s: indeks failide uuendamist ei toetata\n"
 
-#: src/lang.c:93
+#: src/lang.c:95
 msgid	"*** Beginning of article ***"
 msgstr	"*** Artikli algus ***"
 
-#: src/lang.c:94
+#: src/lang.c:97
 msgid	"Cancel (delete) or supersede (overwrite) article [%%.*s]? (%s/%s/%s): "
 msgstr	"Katkestada (kustutada) või asendada artikkel [%%.*s]? (%s/%s/%s): "
 
-#: src/lang.c:95
+#: src/lang.c:98
 msgid	"Cancelling article..."
 msgstr	"Katkestan artiklit...."
 
-#: src/lang.c:97
+#: src/lang.c:100
 #, c-format
 msgid	"Cannot create %s"
 msgstr	"%s ei õnnestu luua"
 
-#: src/lang.c:98
+#: src/lang.c:101
 #, c-format
 msgid	"Can't find base article %d"
 msgstr	"Ei leis baasartiklit %d"
 
-#: src/lang.c:99
-msgid	"Cannot find NNTP server name"
-msgstr	"Ei leia NNTP serveri nime"
-
-#: src/lang.c:101
-#, c-format
-msgid	"%s: Can't get entry for TERM\n"
-msgstr	"%s: Ei saa TERM kirjet\n"
-
-#: src/lang.c:103
+#: src/lang.c:102
 #, c-format
 msgid	"Can't open %s"
 msgstr	"%s ei saa avada"
 
-#: src/lang.c:105
-#, c-format
-msgid	"Can't open %s. Try %s -r to read news via NNTP.\n"
-msgstr	"%s ei saa avada. Proovige %s -r, et lugeda uudiseid üle NNTP.\n"
-
-#: src/lang.c:107
+#: src/lang.c:103
 #, c-format
 msgid	"Couldn't open %s for saving"
 msgstr	"%s ei saa salvestamiseks avada"
 
-#: src/lang.c:108
+#: src/lang.c:104
 msgid	"*** Posting not allowed ***"
 msgstr	"*** Postitamine ei ole lubatud ***"
 
-#: src/lang.c:109
+#: src/lang.c:105
 #, c-format
 msgid	"Posting is not allowed to %s"
 msgstr	"%s ei luba postitada"
 
-#: src/lang.c:110
+#: src/lang.c:106
 #, c-format
 msgid	"Can't retrieve %s"
 msgstr	"%s ei õnnestu laadida"
 
-#: src/lang.c:111
-#, c-format
-msgid	"Can't write index %s"
-msgstr	"Indeksit %s ei saa kirjutada"
-
-#: src/lang.c:112
+#: src/lang.c:107
 #, c-format
 msgid	"%s is a directory"
 msgstr	"%s on kataloog"
 
-#: src/lang.c:113
+#: src/lang.c:108
 msgid	"Catchup"
 msgstr	"Märgin loetuks"
 
-#: src/lang.c:114
+#: src/lang.c:109
 #, c-format
 msgid	"Catchup %s..."
 msgstr	"Märgin %s loetuks..."
 
-#: src/lang.c:115
+#: src/lang.c:110
 msgid	"Catchup all groups entered during this session?"
 msgstr	"Märgi loetuks kõik grupid, millesse on sessiooni jooksul sisenetud?"
 
-#: src/lang.c:116
+#: src/lang.c:111
 msgid	"You have tagged articles in this group - catchup anyway?"
 msgstr	"Teil on siin grupis märgitud teateid - märgin loetuks?"
 
-#: src/lang.c:117
+#: src/lang.c:112
 #, c-format
 msgid	"%s %d %s in %lu seconds\n"
 msgstr	"%s %d %s %lu sekundiga\n"
 
-#: src/lang.c:118
+#: src/lang.c:113
 msgid	"Caughtup"
 msgstr	"Loetud"
 
-#: src/lang.c:119
+#: src/lang.c:114
 msgid	"Check Prepared Article"
 msgstr	"Kontrollin valminud artiklit"
 
-#: src/lang.c:120
+#: src/lang.c:115
 msgid	"Checking for new groups... "
 msgstr	"Otsin uusi gruppe... "
 
-#: src/lang.c:121
+#: src/lang.c:116
 msgid	"Checking for news..."
 msgstr	"Otsin uudiseid..."
 
-#: src/lang.c:123
-#, c-format
-msgid	"\tChecksum of %s (%ld %s)"
-msgstr	"\t%s kontrollsumma (%ld %s)"
-
-#: src/lang.c:125
+#: src/lang.c:117
 #, c-format
 msgid	"Post-process %s=no, %s=yes, %s=shar, %s=quit: "
 msgstr	"Järeltöötle %s=ei, %s=jah, %s=shar, %s=välju: "
 
-#: src/lang.c:126
+#: src/lang.c:118
 msgid	"ANSI color disabled"
 msgstr	"ANSI värvid on keelatud"
 
-#: src/lang.c:127
+#: src/lang.c:119
 msgid	"ANSI color enabled"
 msgstr	"ANSI värvid on lubatud"
 
-#: src/lang.c:128
+#: src/lang.c:120
 #, c-format
 msgid	"Command failed: %s"
 msgstr	"Käsk ebaõnnestus: %s"
 
-#: src/lang.c:129
+#: src/lang.c:121
 msgid	"Mark not selected articles read?"
 msgstr	"Märgin valimata artiklid loetuks?"
 
-#: src/lang.c:130
+#: src/lang.c:122
 #, c-format
 msgid	"Connecting to %s..."
 msgstr	"Loon ühendust serveriga %s..."
 
-#: src/lang.c:131
-#, c-format
-msgid	"Connecting to %s:%d..."
-msgstr	"Loon ühendust serveriga %s:%d..."
-
-#: src/lang.c:132
-#, c-format
-msgid	"\n"
-	"Connection to %s: "
-msgstr	"\n"
-	"Loon ühendust serveriga %s: "
-
-#: src/lang.c:146
+#: src/lang.c:123
 msgid	"<CR>"
 msgstr	"<CR>"
 
-#: src/lang.c:147
+#: src/lang.c:124
 msgid	"Creating active file for saved groups...\n"
 msgstr	"Loon salvestatud gruppidele active faili...\n"
 
-#: src/lang.c:148
+#: src/lang.c:125
 msgid	"Creating newsrc file...\n"
 msgstr	"Loon newsrc faili...\n"
 
-#: src/lang.c:149
+#: src/lang.c:127 src/lang.c:1129
+msgid	"Default"
+msgstr	"Vaikimisi"
+
+#: src/lang.c:128
 msgid	"Delete saved files that have been post processed?"
 msgstr	"Kas kustutada salvestatud ja töödeldud failid?"
 
-#: src/lang.c:150
+#: src/lang.c:129
 msgid	"Deleting temporary files..."
 msgstr	"Kustutan ajutisi faile..."
 
-#: src/lang.c:151
-msgid	"Disconnecting from server...\n"
-msgstr	"Lõpetan ühenduse...\n"
-
-#: src/lang.c:152
+#: src/lang.c:131
 msgid	"*** End of article ***"
 msgstr	"*** Artiklid on otsas ***"
 
-#: src/lang.c:153
+#: src/lang.c:132
 msgid	"*** End of articles ***"
 msgstr	"*** Artiklid on otsas ***"
 
-#: src/lang.c:154
+#: src/lang.c:133
 msgid	"*** End of groups ***"
 msgstr	"*** Grupid on otsas ***"
 
-#: src/lang.c:155
+#: src/lang.c:134
 msgid	"*** End of thread ***"
 msgstr	"*** Teema on otsas ***"
 
-#: src/lang.c:156
+#: src/lang.c:135
 msgid	"Enter limit of articles to get> "
 msgstr	"Sisestage leatavate artiklite piirang> "
 
-#: src/lang.c:157
+#: src/lang.c:136
 msgid	"Enter Message-ID to go to> "
 msgstr	"Sisestage Message-ID> "
 
-#: src/lang.c:158
+#: src/lang.c:137
 msgid	" and enter next unread thread"
 msgstr	" ja siseneda järgmisse lugemata teemasse"
 
-#: src/lang.c:159
+#: src/lang.c:138
 msgid	" and enter next unread group"
 msgstr	" ja siseneda järgmisse lugemata teemasse"
 
-#: src/lang.c:160
+#: src/lang.c:139
 msgid	"Enter option number> "
 msgstr	"Sisestage omaduse number> "
 
-#: src/lang.c:161
+#: src/lang.c:140
 #, c-format
 msgid	"Enter range [%s]> "
 msgstr	"Sisestage vahemik [%s]> "
 
-#: src/lang.c:162
+#: src/lang.c:141
 msgid	"\n"
 	"Warning: Approved: header used.\n"
 msgstr	"\n"
 	"Hoiatus: Kasutati päiserida Approved:.\n"
 
-#: src/lang.c:164
+#: src/lang.c:143
 msgid	"\n"
 	"Error: Bad address in Approved: header.\n"
 msgstr	"\n"
 	"Viga: Vigane aadress Approved: real.\n"
 
-#: src/lang.c:165
+#: src/lang.c:144
 msgid	"\n"
 	"Error: Bad address in From: header.\n"
 msgstr	"\n"
 	"Viga: Vigane aadress From: real.\n"
 
-#: src/lang.c:166
+#: src/lang.c:145
 msgid	"\n"
 	"Error: Bad address in Reply-To: header.\n"
 msgstr	"\n"
 	"Viga: Vigane aadress Reply-To: real.\n"
 
-#: src/lang.c:167
+#: src/lang.c:146
 msgid	"\n"
 	"Error: Bad FQDN in Message-ID: header.\n"
 msgstr	"\n"
 	"Viga: Vigane FQDN Message-ID: real.\n"
 
-#: src/lang.c:168
+#: src/lang.c:147
 #, c-format
 msgid	"Can't unlock %s"
 msgstr	"%s ei saa lahti lukustada"
 
-#: src/lang.c:170
+#: src/lang.c:149
 #, c-format
 msgid	"Corrupted file %s"
 msgstr	"Vigane fail %s"
 
-#: src/lang.c:171
+#: src/lang.c:150
 #, c-format
 msgid	"Couldn't dotlock %s - article not appended!"
 msgstr	"Ei saa punkt-lukustada %s - artiklit ei lisatud!"
 
-#: src/lang.c:172
+#: src/lang.c:151
 #, c-format
 msgid	"Couldn't lock %s - article not appended!"
 msgstr	"Ei saa lukustada %s - artiklit ei lisatud!"
 
-#: src/lang.c:174
+#: src/lang.c:153
 msgid	"Internal error in GNKSA routine - send bug report.\n"
 msgstr	"Sisemine viga GNKSA protseduuris - saatke vearaport.\n"
 
-#: src/lang.c:175
+#: src/lang.c:154
 msgid	"Left angle bracket missing in route address.\n"
 msgstr	"Aadressis puudub <.\n"
 
-#: src/lang.c:176
+#: src/lang.c:155
 msgid	"Left parenthesis missing in old-style address.\n"
-msgstr	"Aadressis puudub vasak ümarsulg.\n"
+msgstr	"Vanas stiilis aadressis puudub vasak ümarsulg.\n"
 
-#: src/lang.c:177
+#: src/lang.c:156
 msgid	"Right parenthesis missing in old-style address.\n"
-msgstr	"Aadressis puudub parem ümarsulg.\n"
+msgstr	"Vanas stiilis aadressis puudub parem ümarsulg.\n"
 
-#: src/lang.c:178
+#: src/lang.c:157
 msgid	"At-sign missing in mail address.\n"
 msgstr	"Postiaadressis puudub at-märk.\n"
 
-#: src/lang.c:179
+#: src/lang.c:158
 msgid	"Single component FQDN is not allowed. Add your domain.\n"
 msgstr	"Ühekomponendiline FQDN pole lubatud. Lisage oma doomen.\n"
 
-#: src/lang.c:180
+#: src/lang.c:159
 msgid	"Invalid domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Vigane doomen. Saatke vearaport, kui teie doomen on reaalselt olemas.\n"
 	"Kasutage \"vigase\" aadressi kirjutamisel juurmise doomenina .invalid.\n"
 
-#: src/lang.c:181
+#: src/lang.c:160
 msgid	"Illegal domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Vigane doomen. Saatke vearaport, kui teie doomen on reaalselt olemas.\n"
 	"Kasutage \"vigase\" aadressi kirjutamisel juurmise doomenina .invalid.\n"
 
-#: src/lang.c:182
+#: src/lang.c:161
 msgid	"Unknown domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Vigane doomen. Saatke vearaport, kui teie doomen on reaalselt olemas.\n"
 	"Kasutage \"vigase\" aadressi kirjutamisel juurmise doomenina .invalid.\n"
 
-#: src/lang.c:183
+#: src/lang.c:162
 msgid	"Illegal character in FQDN.\n"
 msgstr	"FQDN sisaldab lubamatut sümbolit.\n"
 
-#: src/lang.c:184
+#: src/lang.c:163
 msgid	"Zero length FQDN component not allowed.\n"
 msgstr	"Null pikkusega FQDN komponent ei ole lubatud.\n"
 
-#: src/lang.c:185
+#: src/lang.c:164
 msgid	"FQDN component exceeds maximum allowed length (63 chars).\n"
 msgstr	"FQDN komponendi pikkus ületab maksimaalset lubatut (63 sümbolit).\n"
 
-#: src/lang.c:186
+#: src/lang.c:165
 msgid	"FQDN component may not start or end with hyphen.\n"
 msgstr	"FQDN komponendi alguses ega lõpus ei või olla kriips.\n"
 
-#: src/lang.c:187
+#: src/lang.c:166
 msgid	"FQDN component may not start with digit.\n"
 msgstr	"FQDN komponent ei või alata numbriga.\n"
 
-#: src/lang.c:188
+#: src/lang.c:167
 msgid	"Domain literal has impossible numeric value.\n"
 msgstr	"Doomen sisaldab võimatut numbrilist väärtust.\n"
 
-#: src/lang.c:189
+#: src/lang.c:168
 msgid	"Domain literal is for private use only and not allowed for global use.\n"
 msgstr	"Doomenit on lubatud kasutada ainult privaatvõrgus.\n"
 
-#: src/lang.c:190
+#: src/lang.c:169
 msgid	"Right bracket missing in domain literal.\n"
 msgstr	"Doomenis puudub vasak sulg.\n"
 
-#: src/lang.c:191
+#: src/lang.c:170
 msgid	"Missing localpart of mail address.\n"
 msgstr	"Aadressil puudub lokaalne osa.\n"
 
-#: src/lang.c:192
+#: src/lang.c:171
 msgid	"Illegal character in localpart of mail address.\n"
 msgstr	"Lubamatu sümbol aadressi lokaalses osas.\n"
 
-#: src/lang.c:193
+#: src/lang.c:172
 msgid	"Zero length localpart component not allowed.\n"
 msgstr	"Null pikkusega lokaalne komponent ei ole lubatud.\n"
 
-#: src/lang.c:194
+#: src/lang.c:173
 msgid	"Illegal character in realname.\n"
 	"Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n"
 msgstr	"Pärisnimes on lubamatu sümbol.\n"
 	"Kvootimata sõnad aadressides ei tohi sisaldada '!()<>@,;:\\.[]'.\n"
 
-#: src/lang.c:195
+#: src/lang.c:174
 msgid	"Illegal character in realname.\n"
 	"Quoted words may not contain '()<>\\'.\n"
 msgstr	"Pärisnimes on lubamatu sümbol.\n"
 	"Kvooditud sõnad ei või sisaldada '()<>\\'.\n"
 
-#: src/lang.c:196
+#: src/lang.c:175
 msgid	"Illegal character in realname.\n"
 	"Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n"
 msgstr	"Pärisnimes on lubamatu sümbol.\n"
 	"Kodeeritud sõnad parameetris ei või sisaldada '!()<>@,;:\"\\.[]/='.\n"
 
-#: src/lang.c:197
+#: src/lang.c:176
 msgid	"Bad syntax in encoded word used in realname.\n"
 msgstr	"Vigane reaalses nimes kasutatud kodeeritud sõna süntaks.\n"
 
-#: src/lang.c:198
+#: src/lang.c:177
 msgid	"Illegal character in realname.\n"
 	"Unquoted words may not contain '()<>\\' in old-style addresses.\n"
 msgstr	"Pärisnimes on lubamatu sümbol.\n"
-	"Kvootimata sõnad aadressides ei või sisaldada '()<>\\'.\n"
+	"Kvootimata sõnad vanas stiilis aadressides ei või sisaldada '()<>\\'.\n"
 
-#: src/lang.c:199
+#: src/lang.c:178
 msgid	"Illegal character in realname.\n"
 	"Control characters and unencoded 8bit characters > 127 are not allowed.\n"
 msgstr	"Pärisnimes on lubamatu sümbol.\n"
 	"Kontrollsümbolid ja kodeerimata 8bit sümbolid väärtusega > 127 ei ole "
 	"lubatud.\n"
 
-#: src/lang.c:200
+#: src/lang.c:179
 msgid	"\n"
 	"Error: No blank line found after header.\n"
 msgstr	"\n"
 	"Viga: peale päiseridu pole tühja rida.\n"
 
 #. TODO: fixme, US-ASCII is not the only 7bit charset we know about
-#: src/lang.c:202
+#: src/lang.c:181
 msgid	"\n"
 	"Error: Posting contains non-ASCII characters but MM_CHARSET is set to\n"
 	"       US-ASCII  - please change this setting to a suitable value for\n"
@@ -846,7 +815,7 @@ msgstr	"\n"
 	"      on US_ASCII - palun seadke MM_CHARSET väärtus oma keelele sobivaks\n"
 	"      kasutades seadete M)enüüd või toimetades tinrc faili.\n"
 
-#: src/lang.c:207
+#: src/lang.c:186
 msgid	"\n"
 	"Error: Posting contains  non-ASCII characters  but the  MIME encoding\n"
 	"       for news  messages  is set  to \"7bit\"  -  please change this\n"
@@ -860,13 +829,13 @@ msgstr	"\n"
 	"      enam levinud.  Muuta saate kasutades seadete M)enüüd või toimetades\n"
 	"      tinrc faili.\n"
 
-#: src/lang.c:213
+#: src/lang.c:192
 msgid	"\n"
 	"Error: Article starts with blank line instead of header\n"
 msgstr	"\n"
 	"Viga: Artikkel algab päise asemel tühja reaga\n"
 
-#: src/lang.c:214
+#: src/lang.c:193
 #, c-format
 msgid	"\n"
 	"Error: Header on line %d does not have a colon after the header name:\n"
@@ -875,44 +844,21 @@ msgstr	"\n"
 	"Viga: Päisereal %d puudub päise nime järel koolon:\n"
 	"%s\n"
 
-#: src/lang.c:215
+#: src/lang.c:194
 #, c-format
 msgid	"\n"
 	"Error: The \"%s:\" line is empty.\n"
 msgstr	"\n"
 	"Viga: \"%s:\" rida on tühi.\n"
 
-#: src/lang.c:217
-#, c-format
-msgid	"\n"
-	"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
-	"       The only allowable  space is the one  separating the colon (:)\n"
-	"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
-	"       newsgroup names.\n"
-msgstr	"\n"
-	"Viga: Real \"%s:\" on tühikud, mis tuleb sealt eemaldada. Ainuke lubatud\n"
-	"      tühik on see,  mis eraldab koolonit (:)  teistest komponentidest\n"
-	"      real. Gruppide eraldamiseks kasutage palun koma (,).\n"
-
-#: src/lang.c:222
-#, c-format
-msgid	"\n"
-	"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
-	"       the line  may not  contain  whitespace,  this is  not allowed.\n"
-	"       Please write all newsgroups into a single line.\n"
-msgstr	"\n"
-	"Viga: Rida \"%s\" jätkun järgneval real. Kuna see rida ei või sisaldada\n"
-	"      tühikuid, siis ei ole see lubatud.  Palun kirjutage kõik grupid\n"
-	"      ühele reale.\n"
-
-#: src/lang.c:227
+#: src/lang.c:195
 #, c-format
 msgid	"\n"
 	"Error: The \"%s:\" line is missing from the article header.\n"
 msgstr	"\n"
 	"Viga: Artikli päises puudub rida \"%s:\".\n"
 
-#: src/lang.c:228
+#: src/lang.c:196
 #, c-format
 msgid	"\n"
 	"Error: Header on line %d does not have a space after the colon:\n"
@@ -921,851 +867,921 @@ msgstr	"\n"
 	"Viga: Päisel real %d puudub kooloni järel tühik:\n"
 	"%s\n"
 
-#: src/lang.c:229
+#: src/lang.c:197
 #, c-format
 msgid	"\n"
 	"Error: There are multiple (%d) \"%s:\" lines in the header.\n"
 msgstr	"\n"
 	"Viga: Päises on mitu (%d) \"%s:\" rida.\n"
 
-#: src/lang.c:230
+#: src/lang.c:198
 #, c-format
 msgid	"Insecure permissions of %s (%o)"
 msgstr	"Ebaturvalised õigused failil %s (%o)"
 
-#: src/lang.c:231 src/open.c:1080
+#: src/lang.c:199 src/open.c:1017
 #, c-format
 msgid	"Invalid response to GROUP command, %s"
 msgstr	"Vigane vastus GROUP käsule, %s"
 
-#: src/lang.c:233
+#: src/lang.c:201
 #, c-format
 msgid	"MIME parse error: Unexpected end of %s/%s article"
 msgstr	"MIME parsimise viga: Ootamatu artikli %s/%s lõpp"
 
-#: src/lang.c:234
+#: src/lang.c:202
 msgid	"MIME parse error: Start boundary whilst reading headers"
 msgstr	"MIME parsimise viga: Algas eraldaja aga loen alles päiseid"
 
-#: src/lang.c:235
+#: src/lang.c:203
 msgid	"Can't get a (fully-qualified) domain-name!\n"
 msgstr	"Ei õnnestu saada (täis) doomeninime!\n"
 
-#: src/lang.c:236
+#: src/lang.c:204
 #, c-format
 msgid	"No permissions to go into %s\n"
 msgstr	"Puuduvad õigused siseneda %s\n"
 
-#: src/lang.c:237
+#: src/lang.c:205
 msgid	"\n"
 	"Error: From: line missing.\n"
 msgstr	"\n"
 	"Viga: From: rida puudub.\n"
 
-#: src/lang.c:238
+#: src/lang.c:206
 #, c-format
 msgid	"No read permissions for %s\n"
 msgstr	"%s lugemiseks pole õiguseid\n"
 
-#: src/lang.c:239
+#: src/lang.c:207
 #, c-format
 msgid	"File %s does not exist\n"
 msgstr	"Faili %s pole\n"
 
-#: src/lang.c:240
+#: src/lang.c:208
 #, c-format
 msgid	"No write permissions for %s\n"
 msgstr	"%s kirjutamiseks pole õiguseid\n"
 
-#: src/lang.c:241
+#: src/lang.c:209
 msgid	"Can't get user information (/etc/passwd missing?)"
 msgstr	"Ei leia kasutate kohta infot (/etc/passwd puudub?)"
 
-#: src/lang.c:242
+#: src/lang.c:210
 msgid	"errors"
 msgstr	"viga"
 
-#: src/lang.c:243
+#: src/lang.c:211
 #, c-format
 msgid	"\n"
 	"Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n"
 msgstr	"\n"
 	"Viga real %d: \"Sender:\" päiserida pole lubatud (see lisatakse teie eest)\n"
 
-#: src/lang.c:244
+#: src/lang.c:212
 #, c-format
 msgid	"Server has non of the groups listed in %s"
 msgstr	"Serveril pole failis %s näidatud gruppe"
 
-#: src/lang.c:245
+#: src/lang.c:213
 msgid	"error"
 msgstr	"viga"
 
-#: src/lang.c:247
-msgid	"\n"
-	"socket or connect problem\n"
-msgstr	"\n"
-	"Probleem pistikuga või ühendusega\n"
-
-#: src/lang.c:250
-msgid	"Server unavailable\n"
-msgstr	"Server ei vasta\n"
-
-#: src/lang.c:253
+#: src/lang.c:214
 msgid	"Unknown display level"
 msgstr	"Tundmatu ektaani tase"
 
-#: src/lang.c:254
-#, c-format
-msgid	"%s/tcp: Unknown service.\n"
-msgstr	"%s/tcp: Tundmatu teenus.\n"
-
-#: src/lang.c:255
-#, c-format
-msgid	"Wrong newsgroup name in response of GROUP command, %s for %s"
-msgstr	"Vigane vastus GROUP käsule, %s grupile %s"
-
-#: src/lang.c:256
+#: src/lang.c:215
 msgid	"<ESC>"
 msgstr	"<ESC>"
 
-#: src/lang.c:257
+#: src/lang.c:216
 msgid	"Exiting..."
 msgstr	"Lõpetan..."
 
-#: src/lang.c:258
+#: src/lang.c:217
 msgid	"leaving external mail-reader"
 msgstr	"jätan välise kirjade lugeja"
 
-#: src/lang.c:259
+#: src/lang.c:218
 #, c-format
 msgid	"Extracting %s..."
 msgstr	"Loon %s..."
 
-#: src/lang.c:260
-#, c-format
-msgid	"Failed to connect to NNTP server %s. Exiting..."
-msgstr	"NNTP serveriga %s ühenduse loomine ebaõnnestus. Lõpetan..."
-
-#: src/lang.c:261
+#: src/lang.c:220
 #, c-format
 msgid	"Error writing %s file. Filesystem full? File reset to previous state."
 msgstr	"Viga faili %s kirjutamisel. Failisüsteem on täis? Faili eelmine olek "
 	"taastatud."
 
-#: src/lang.c:262
+#: src/lang.c:221
 #, c-format
 msgid	"Error making backup of %s file. Filesystem full?"
 msgstr	"Failist %s ei õnnestu varukoopiat luua. Failisüsteem on täis?"
 
-#: src/lang.c:263
+#: src/lang.c:222
 #, c-format
 msgid	"Filtering global rules (%d/%d)..."
 msgstr	"Filtreerin globaalseid reegleid (%d/%d)..."
 
-#: src/lang.c:264
+#: src/lang.c:223
 msgid	"Rule created by: "
 msgstr	"Reegli looja: "
 
-#: src/lang.c:265
+#: src/lang.c:224
 #, c-format
 msgid	"Enter pattern [%s]> "
 msgstr	"Sisestage muster [%s]> "
 
-#: src/lang.c:266
+#: src/lang.c:225
 #, c-format
 msgid	"\n"
 	"You requested followups to your article to go to the following %s:\n"
 msgstr	"\n"
 	"Te soovisite vastused artiklile %s:\n"
 
-#: src/lang.c:267
+#: src/lang.c:226
 #, c-format
 msgid	"  %s\t Answers will be directed to you by mail.\n"
 msgstr	"  %s\t Vastused saadetakse teile kirjaga.\n"
 
-#: src/lang.c:268
+#: src/lang.c:227
+msgid	"# Format:\n"
+	"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
+	"placed\n"
+	"#                     at the beginning of a rule, or they will be moved to "
+	"the\n"
+	"#                     next rule. '#' is not a valid keyword for a comment!\n"
+	"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
+	"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
+	"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
+	"#     score=NUM         A number (e.g. 70). Or:\n"
+	"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
+	"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
+	"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
+	"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n"
+	"#                     full references.\n"
+	"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
+	"#   msgid_only=STRING Optional. Like above, but without references.\n"
+	"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
+	"without\n"
+	"#                     Message-ID:\n"
+	"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
+	"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
+	"opt.\n"
+	"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
+	"#   time=NUM          Optional. time_t value when rule expires\n"
+	"#\n"
+msgstr	"# Vorming:\n"
+	"#   comment=SÕNE      Mittekohustuslik. Lubatud on mitu rida. Kommentaarid\n"
+	"#                     peavad olema reegli alguses või nad tõstetakse "
+	"järgmise\n"
+	"#                     reegli juurde. '#' ei ole kommentaari jaoks lubatud!\n"
+	"#   group=SÕNE        Kohustuslik. Gruppide loend (n. comp.*,!*sources*).\n"
+	"#   case=NUM          Kohustuslik. Võrdle=0 / ignoreeri=1 filtreerimisel\n"
+	"#                     suur-väiketähti.\n"
+	"#   score=NUMBER|SÕNE Kohustuslik. Omistatav kaal. Kas:\n"
+	"#     score=NUMBER      number (nt. 70). Või:\n"
+	"#     score=SÕNE        üks kahest võtmesõnast: 'hot' või 'kill'.\n"
+	"#   subj=SÕNE         Mittekohustuslik. Subject: rida (n. Kuidas olla tark).\n"
+	"#   from=SÕNE         Mittekohustuslik. From: rida (n. *Jaan Tamm*)\n"
+	"#   msgid=SÕNE        Mittekohustuslik. Message-ID: rida (n. "
+	"<123@ether.net>)\n"
+	"#                     koos kõikide viidetega.\n"
+	"#   msgid_last=SÕNE   Mittekohustuslik. Nagu ülal, aga ainult viimane viide.\n"
+	"#   msgid_only=SÕNE   Mittekohustuslik. Nagu ülal, aga viideteta.\n"
+	"#   refs_only=SÕNE    Mittekohustuslik. References: rida (n. "
+	"<123@ether.net>)\n"
+	"#                     ilma Message-ID:\n"
+	"#   lines=[<>]?NUMBER Mittekohustuslik. Lines: rida. '<' või '>' pole\n"
+	"#                     kohustuslikud.\n"
+	"#   gnksa=[<>]?NUMBER Mittekohustuslik. GNKSA parse_from() tagastatud kood.\n"
+	"#                     '<' või '>' pole kohustuslikud.\n"
+	"#   xref=MUSTER       Mittekohustuslik. Surmamise muster (n. alt.flame*)\n"
+	"#   time=NUMBER       Mittekohustuslik. Reegli aegumine time_t väärtusena\n"
+	"#\n"
+
+#: src/lang.c:248
 #, c-format
-msgid	"%s%s: Unknown host.\n"
-msgstr	"%s%s: Tundmatu host.\n"
+msgid	"Enter score for rule (default=%d): "
+msgstr	"Reegli kaal        (vaikimisi=%d): "
 
-#: src/lang.c:269
-msgid	"Giving up...\n"
-msgstr	"Annan alla...\n"
+#: src/lang.c:249
+#, c-format
+msgid	"Enter the score weight (range 0 < score <= %d)"
+msgstr	"Sisestage reegli kaal (vahemik on 0 < kaal <= %d)"
 
-#: src/lang.c:270
-msgid	"global "
-msgstr	"globaalset "
+#. SCORE_MAX
+#: src/lang.c:250
+msgid	"Full"
+msgstr	"Täis"
 
-#: src/lang.c:273
-#, c-format
-msgid	"Group %.*s ('q' to quit)..."
-msgstr	"Grupp %.*s ('q' lõpetamiseks)... "
+#: src/lang.c:251
+msgid	"Comment (optional)  : "
+msgstr	"Kommentaar (vaba)   : "
 
-#: src/lang.c:275
+#: src/lang.c:252
+msgid	"Apply pattern to    : "
+msgstr	"Rakenda mustrit     : "
+
+#: src/lang.c:253
+msgid	"From: line (ignore case)      "
+msgstr	"From: rida (tõstutundetu)   "
+
+#: src/lang.c:254
+msgid	"From: line (case sensitive)   "
+msgstr	"From: rida (tõstutundlik)   "
+
+#: src/lang.c:256
 #, c-format
-msgid	"Group %.*s..."
-msgstr	"Grupp %.*s... "
+msgid	"%s%s: Unknown host.\n"
+msgstr	"%s%s: Tundmatu host.\n"
 
-#: src/lang.c:278
+#: src/lang.c:257
+msgid	"global "
+msgstr	"globaalset "
+
+#: src/lang.c:258
 #, c-format
 msgid	"Please use %.100s instead"
 msgstr	"Kasutage selle asemel palun %.100s"
 
-#: src/lang.c:279
+#: src/lang.c:259
 #, c-format
 msgid	"Group %s is moderated. Continue?"
 msgstr	"Grupp %s on modereeritav. Jätkan?"
 
-#: src/lang.c:280
+#: src/lang.c:260
 msgid	"groups"
 msgstr	"gruppi"
 
-#: src/lang.c:281
+#: src/lang.c:261
 msgid	"Top Level Commands"
 msgstr	"Ülemise taseme käsud"
 
-#: src/lang.c:282
+#: src/lang.c:262
 msgid	"Group Selection"
 msgstr	"Grupi valik"
 
-#: src/lang.c:283
+#: src/lang.c:263
 msgid	"group"
 msgstr	"grupp"
 
-#: src/lang.c:285
+# TRANSLATION TOO LONG
+#: src/lang.c:265
+msgid	"One or more lines of comment. <CR> to add a line or proceed if line is empty."
+msgstr	"Üks või enam kommentaari rida. <CR> rea lisamiseks või jätkamiseks, kui rida "
+	"on tühi."
+
+#: src/lang.c:266
+msgid	"From: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	"From: rida filtrite faili. <TÜHIK> lülitab, <CR> seab."
+
+#: src/lang.c:267
+msgid	"Linecount of articles to be filtered. < for less, > for more, = for equal."
+msgstr	"Filtraaritavate artiklite ridu. < on vähem, > on rohkem, = on võrdne."
+
+#: src/lang.c:268
+msgid	"Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	"Message-ID: rida filtri faili lisamiseks. <TÜHIK> lülitab, <CR> seab."
+
+#: src/lang.c:269
+msgid	"Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	"Subject: rida filtri faili lisamiseks. <TÜHIK> lülitab, <CR> seab."
+
+#: src/lang.c:270
+msgid	"Enter text pattern to filter if Subject: & From: lines are not what you want."
+msgstr	"Sisestage filtreerimiseks tekstimuster, kui Subject: ja From: ei ole piisav."
+
+#: src/lang.c:271
+msgid	"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
+msgstr	"Valige, kus tekstimustrit rakendada. <TÜHIK> lülitab, <CR> seab."
+
+#: src/lang.c:272
+msgid	"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
+msgstr	"Sisestatud filtri aegumisaeg päevades. <TÜHIK> lülitab, <CR> seab."
+
+#: src/lang.c:273
+msgid	"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr	"Kasuta surmamist jooksval/kõikidel gruppidel. <TÜHIK> lülitab, <CR> seab."
+
+#: src/lang.c:274
+msgid	"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr	"Kasuta valikut jooksval/kõikidel gruppidel. <TÜHIK> lülitab, <CR> seab."
+
+#: src/lang.c:275
 msgid	"kill an article via a menu"
 msgstr	"artiklite surmamise menüü"
 
-#: src/lang.c:286
+#: src/lang.c:276
 msgid	"auto-select (hot) an article via a menu"
 msgstr	"(kuuma) artikli automaatse valiku menüü"
 
-#: src/lang.c:287
+#: src/lang.c:277
 msgid	"Browse URLs in article"
 msgstr	"Brausi artiklis olevaid URLe"
 
-#: src/lang.c:288
+#: src/lang.c:278
 msgid	"0 - 9\t  display article by number in current thread"
 msgstr	"0 - 9\t  näita jooksva teema numbri järgi valitud artiklit"
 
-#: src/lang.c:289
+#: src/lang.c:279
 msgid	"cancel (delete) current article; must have been posted by you"
 msgstr	"katkesta (kustuta) jooksev artikkel; peab olema teie postitus"
 
-#: src/lang.c:290
+#: src/lang.c:280
 msgid	"edit article (mail-groups only)"
 msgstr	"toimeta artiklit (ainult kirjade-grupid)"
 
-#: src/lang.c:291
+#: src/lang.c:281
 msgid	"display first article in current thread"
 msgstr	"näita jooksva teema esimest artiklit"
 
-#: src/lang.c:292
+#: src/lang.c:282
 msgid	"display first page of article"
 msgstr	"näita artikli esimest lehekülge"
 
-#: src/lang.c:293
+#: src/lang.c:283
 msgid	"post followup to current article"
 msgstr	"postita vastus jooksvale artiklile"
 
-#: src/lang.c:294
+#: src/lang.c:284
 msgid	"post followup (don't copy text) to current article"
 msgstr	"postita vastus (kopeeri teksti) jooksvale artiklile"
 
-#: src/lang.c:295
+#: src/lang.c:285
 msgid	"post followup to current article quoting complete headers"
 msgstr	"postita vastus jooksvale artiklile, tsiteerides kõiki päiseid"
 
-#: src/lang.c:296
+#: src/lang.c:286
 msgid	"display last article in current thread"
 msgstr	"näita jooksva teema viimast artiklit"
 
-#: src/lang.c:297
+#: src/lang.c:287
 msgid	"display last page of article"
 msgstr	"näita artikli viimast lehekülge"
 
-#: src/lang.c:298
+#: src/lang.c:288
 msgid	"mark rest of thread as read and advance to next unread"
 msgstr	"märgi teema loetuks ja liigu järgmisele lugemata teemale"
 
-#: src/lang.c:299
+#: src/lang.c:289
 msgid	"display next article"
 msgstr	"näita järgmist artiklit"
 
-#: src/lang.c:300
+#: src/lang.c:290
 msgid	"display first article in next thread"
 msgstr	"näita järgmise teema esimest artiklit"
 
-#: src/lang.c:301 src/lang.c:311 src/lang.c:382 src/lang.c:383
+#: src/lang.c:291 src/lang.c:298 src/lang.c:357 src/lang.c:358
 msgid	"display next unread article"
 msgstr	"näita järgmist lugemata artiklit"
 
-#: src/lang.c:302
+#: src/lang.c:292
 msgid	"go to the article that this one followed up"
 msgstr	"mine artiklile, millele see artikkel järgneb"
 
-#: src/lang.c:304
-msgid	"perform PGP operations on article"
-msgstr	"kasuta artiklil PGP operatsioone"
-
-#: src/lang.c:306
+#: src/lang.c:293
 msgid	"display previous article"
 msgstr	"näita eelmist artiklit"
 
-#: src/lang.c:307 src/lang.c:385
+#: src/lang.c:294 src/lang.c:360
 msgid	"display previous unread article"
 msgstr	"näita eelmist lugemata artiklit"
 
-#: src/lang.c:308
+#: src/lang.c:295
 msgid	"quickly kill an article using defaults"
 msgstr	"surma kiiresti artikkel, kasutades vaikeväärtusi"
 
-#: src/lang.c:309
+#: src/lang.c:296
 msgid	"quickly auto-select (hot) an article using defaults"
 msgstr	"vali kiiresti vaikeväärtusi kasutades (kuumad) artiklid"
 
-#: src/lang.c:310
+#: src/lang.c:297
 msgid	"return to group selection level"
 msgstr	"tagasi gruppide valikusse"
 
-#: src/lang.c:312
+#: src/lang.c:299
 msgid	"reply through mail to author"
 msgstr	"vasta autorile kirjaga"
 
-#: src/lang.c:313
+#: src/lang.c:300
 msgid	"reply through mail (don't copy text) to author"
 msgstr	"vasta autorile kirjaga (teksti ei kopeerita)"
 
-#: src/lang.c:314
+#: src/lang.c:301
 msgid	"reply through mail to author quoting complete headers"
 msgstr	"vasta autorile kirjaga, tsiteerides kõiki päiseid"
 
-#: src/lang.c:315 src/lang.c:387
+#: src/lang.c:302 src/lang.c:362
 msgid	"repost chosen article to another group"
 msgstr	"postita valitud artikkel teise gruppi"
 
-#: src/lang.c:316
+#: src/lang.c:303
 msgid	"search backwards within this article"
 msgstr	"otsi artiklis tagaspidi"
 
-#: src/lang.c:317
+#: src/lang.c:304
 msgid	"search forwards within this article"
 msgstr	"otsi artiklis edaspidi"
 
-#: src/lang.c:318
+#: src/lang.c:305
 msgid	"show article in raw-mode (including all headers)"
 msgstr	"näita kogu artiklit (koos päistega)"
 
-#: src/lang.c:319
+#: src/lang.c:306
 msgid	"skip next block of included text"
 msgstr	"järgmisele tekstiblokile"
 
-#: src/lang.c:320
+#: src/lang.c:307
 msgid	"toggle display of sections hidden by a form-feed (^L) on/off"
 msgstr	"lülita lehevahetusega (^L) peidetud osade näitamist"
 
-#: src/lang.c:321
+#: src/lang.c:308
 msgid	"toggle word highlighting on/off"
 msgstr	"lülita sõnade märkimine sisse/välja"
 
-#: src/lang.c:322
+#: src/lang.c:309
 msgid	"toggle ROT-13 (basic decode) for current article"
 msgstr	"lülita jooksva artikli ROT-13 (lihtne dekodeering) kodeering"
 
-#: src/lang.c:323
+#: src/lang.c:310
 msgid	"toggle tabwidth 4 <-> 8"
 msgstr	"lülita tabulaatori laius 4 <-> 8"
 
-#: src/lang.c:324
+#: src/lang.c:311
 msgid	"toggle german TeX style decoding for current article"
 msgstr	"lülita jooksva artikli saksa TeX stiilis dekodeerimine"
 
-#: src/lang.c:325
+#: src/lang.c:312
 msgid	"toggle display of uuencoded sections"
 msgstr	"lülita uuenkodeeritud osade näitamine"
 
-#: src/lang.c:326
+#: src/lang.c:313
 msgid	"View/save multimedia attachments"
 msgstr	"Vaata/salvesta multimeedia lisasid"
 
-#: src/lang.c:327
+#: src/lang.c:314
 #, c-format
 msgid	"report bug or comment via mail to %s"
 msgstr	"saatke vearaport või kommentaar aadressile %s"
 
-#: src/lang.c:328
+#: src/lang.c:315
 msgid	"choose range of articles to be affected by next command"
 msgstr	"valige järgmise käsuga töödeldavate artiklite vahemik"
 
-#: src/lang.c:329
+#: src/lang.c:316
 msgid	"escape from command prompt"
 msgstr	"pääs käsuviibalt"
 
-#: src/lang.c:330
+#: src/lang.c:317
 msgid	"get help"
 msgstr	"anna abiinfot"
 
-#: src/lang.c:331
+#: src/lang.c:318
 msgid	"display last article viewed"
 msgstr	"näita viimasena vaadatud artiklit"
 
-#: src/lang.c:332
+#: src/lang.c:319
 msgid	"down one line"
 msgstr	"üks rida alla"
 
-#: src/lang.c:333
+#: src/lang.c:320
 msgid	"up one line"
 msgstr	"üles üks rida"
 
-#: src/lang.c:334
+#: src/lang.c:321
 msgid	"go to article chosen by Message-ID"
 msgstr	"liigu Message-ID poolt määratud artiklile"
 
-#: src/lang.c:335
+#: src/lang.c:322
 msgid	"mail article/thread/hot/pattern/tagged articles to someone"
 msgstr	"saada artikkel/teema/kuum/muster/märgitud kellelegi"
 
-#: src/lang.c:336
+#: src/lang.c:323
 msgid	"menu of configurable options"
 msgstr	"seadete menüü"
 
-#: src/lang.c:337
+#: src/lang.c:324
 msgid	"down one page"
 msgstr	"alla üks lehekülg"
 
-#: src/lang.c:338
+#: src/lang.c:325
 msgid	"up one page"
 msgstr	"üles üks lehekülg"
 
-#: src/lang.c:340
-msgid	"pipe article/thread/hot/pattern/tagged articles into command"
-msgstr	"saada artikkel/teema/kuum/muster/märgitud toruga käsule"
-
-#: src/lang.c:342
+#: src/lang.c:326
 msgid	"post (write) article to current group"
 msgstr	"postita (kirjuta) artikkel jooksvasse gruppi"
 
-#: src/lang.c:343
+#: src/lang.c:327
 msgid	"post postponed articles"
 msgstr	"postita postitusootel artiklid"
 
-#: src/lang.c:344
+#: src/lang.c:328
 msgid	"list articles posted by you (from posted file)"
 msgstr	"näita teie poolt postitatud artikleid (failist posted)"
 
-#: src/lang.c:345
+#: src/lang.c:329
 msgid	"return to previous menu"
 msgstr	"tagasi eelmisse menüüsse"
 
-#: src/lang.c:347
-msgid	"output article/thread/hot/pattern/tagged articles to printer"
-msgstr	"saada artikkel/teema/kuum/muster/märgitud trükkalile"
-
-#: src/lang.c:349
+#: src/lang.c:330
 msgid	"quit tin immediately"
 msgstr	"välju viivitamata tinist"
 
-#: src/lang.c:350
+#: src/lang.c:331
 msgid	"redraw page"
 msgstr	"värskenda lehekülge"
 
-#: src/lang.c:351
+#: src/lang.c:332
 msgid	"save article/thread/hot/pattern/tagged articles to file"
 msgstr	"salvesta artikkel/teema/kuum/muster/märgitud faili"
 
-#: src/lang.c:352
+#: src/lang.c:333
 msgid	"save marked articles automatically without user prompts"
 msgstr	"salvesta märgitud artiklid automaatselt, kasutajalt küsimata"
 
-#: src/lang.c:353
+#: src/lang.c:334
 msgid	"search for articles by author backwards"
 msgstr	"otsi artikleid autori järgi tagaspidi"
 
-#: src/lang.c:354
+#: src/lang.c:335
 msgid	"search for articles by author forwards"
 msgstr	"otsi artikleid autori järgi edaspidi"
 
-#: src/lang.c:355
+#: src/lang.c:336
 msgid	"search all articles for a given string (this may take some time)"
 msgstr	"otsi antud teksti artiklitest (see võib võtta aega)"
 
-#: src/lang.c:356
+#: src/lang.c:337
 msgid	" \t  (searches are case-insensitive and wrap around to all articles)"
 msgstr	" \t  (otsing on tõstutundetu ja käib üle kõikide artiklite)"
 
-#: src/lang.c:357
+#: src/lang.c:338
 msgid	"search for articles by Subject line backwards"
 msgstr	"otsi artiklit teema järgi tagaspidi"
 
-#: src/lang.c:358
+#: src/lang.c:339
 msgid	"search for articles by Subject line forwards"
 msgstr	"otsi artiklit teema järgi edaspidi"
 
-#: src/lang.c:359
+#: src/lang.c:340
 msgid	"repeat last search"
 msgstr	"korda eelmist otsingut"
 
-#: src/lang.c:361
-msgid	"shell escape"
-msgstr	"paojada käsureale"
-
-#: src/lang.c:363
+#: src/lang.c:341
 msgid	"tag current article for reposting/mailing/piping/printing/saving"
 msgstr	"märgi jooksev artikkel, et postitada/saata/trükkida/salvestada/torusse"
 
-#: src/lang.c:365
-msgid	"toggle color"
-msgstr	"lülita värve"
-
-#: src/lang.c:367
+#: src/lang.c:342
 msgid	"toggle info message in last line (subject/description)"
 msgstr	"lülita viimase rea infoteadet (teema/kirjeldus)"
 
-#: src/lang.c:368
+#: src/lang.c:343
 msgid	"toggle inverse video"
 msgstr	"lülita pööratud video"
 
-#: src/lang.c:369
+#: src/lang.c:344
 msgid	"toggle mini help menu display"
 msgstr	"abiinfo lülita ekraanil miniabi menüüd"
 
-#: src/lang.c:370
+#: src/lang.c:345
 msgid	"show version information"
 msgstr	"esita info versioonist"
 
-#: src/lang.c:371
+#: src/lang.c:346
 msgid	"mark all articles as read and return to group selection menu"
 msgstr	"märgi artiklid loetuks ja välju gruppide valiku menüüsse"
 
-#: src/lang.c:372
+#: src/lang.c:347
 msgid	"mark all articles as read and enter next group with unread articles"
 msgstr	"märgi artiklid loetuks, sisene järgmisse lugemata artiklitega gruppi"
 
-#: src/lang.c:373
+#: src/lang.c:348
 msgid	"choose first thread in list"
 msgstr	"vali loendist esimene teema"
 
-#: src/lang.c:374 src/lang.c:405
+#: src/lang.c:349 src/lang.c:380
 msgid	"choose group by name"
 msgstr	"vali grupp nime järgi"
 
-#: src/lang.c:375
+#: src/lang.c:350
 msgid	"choose last thread in list"
 msgstr	"vali loendist viimane teema"
 
-#: src/lang.c:376
+#: src/lang.c:351
 msgid	"list articles within current thread (bring up Thread sub-menu)"
 msgstr	"artiklite loend jooksvas teemas (esita teema alam-menüü)"
 
-#: src/lang.c:377
+#: src/lang.c:352
 msgid	"mark article as unread"
 msgstr	"märgi artikkel loetuks"
 
-#: src/lang.c:378
+#: src/lang.c:353
 msgid	"mark current thread as read"
 msgstr	"märgi jooksev teema loetuks"
 
-#: src/lang.c:379
+#: src/lang.c:354
 msgid	"mark thread as unread"
 msgstr	"märgi teema loetuks"
 
-#: src/lang.c:380
+#: src/lang.c:355
 msgid	"toggle display of all/selected articles"
 msgstr	"lülita ekraanile kõik/valitud artiklid"
 
-#: src/lang.c:381
+#: src/lang.c:356
 msgid	"display next group"
 msgstr	"näita järgmist gruppi"
 
-#: src/lang.c:384
+#: src/lang.c:359
 msgid	"display previous group"
 msgstr	"näita eelmist gruppi"
 
-#: src/lang.c:386 src/lang.c:434
+#: src/lang.c:361 src/lang.c:409
 msgid	"read chosen article"
 msgstr	"loe valitud artiklit"
 
-#: src/lang.c:388
+#: src/lang.c:363
 msgid	"toggle all selections (all articles)"
 msgstr	"lülita kõiki valikuid (kõiki artikleid)"
 
-#: src/lang.c:389
+#: src/lang.c:364
 msgid	"select group (make \"hot\")"
 msgstr	"vali grupp (muuda \"kuumaks\")"
 
-#: src/lang.c:390
+#: src/lang.c:365
 msgid	"select thread"
 msgstr	"vali teema"
 
-#: src/lang.c:391
+#: src/lang.c:366
 msgid	"select threads if at least one unread article is selected"
 msgstr	"vali teemad, kui on valitud vähemalt üks lugemata artikkel"
 
-#: src/lang.c:392
+#: src/lang.c:367
 msgid	"select threads that match user specified pattern"
 msgstr	"vali kasutaja määratud mustrile vastavad teemad"
 
-#: src/lang.c:393
+#: src/lang.c:368
 msgid	"tag all parts of current multipart-message in order"
 msgstr	"märgi jooksva mitmeosalise teate kõik osad"
 
-#: src/lang.c:394
+#: src/lang.c:369
 msgid	"0 - 9\t  choose thread by number"
 msgstr	"0 - 9\t  vali numbri järgi teema"
 
-#: src/lang.c:395
+#: src/lang.c:370
 msgid	"toggle limit number of articles to get, and reload"
 msgstr	"sea laetavate artiklite piirang ja lae uuesti"
 
-#: src/lang.c:396
+#: src/lang.c:371
 msgid	"toggle display of all/unread articles"
 msgstr	"lülita ekraanil kõik/lugemata artiklid"
 
-#: src/lang.c:397 src/lang.c:435
+#: src/lang.c:372 src/lang.c:410
 msgid	"cycle the display of authors email address, real name, both or neither"
 msgstr	"vali näitamiseks autori aadress, pärisnimi, mõlemad või mitte midagi"
 
-#: src/lang.c:398
+#: src/lang.c:373
 msgid	"toggle selection of thread"
 msgstr	"lülita teema valikut"
 
-#: src/lang.c:399
+#: src/lang.c:374
 msgid	"cycle through threading options available"
 msgstr	"erinevad teemade käsitlemise võtmed"
 
-#: src/lang.c:400
+#: src/lang.c:375
 msgid	"undo all selections (all articles)"
 msgstr	"ennista kõik valikud (kõik artiklid)"
 
-#: src/lang.c:401
+#: src/lang.c:376
 msgid	"untag all tagged threads"
 msgstr	"eemalda märgistus kõikidelt märgitud teemadelt"
 
-#: src/lang.c:402
+#: src/lang.c:377
 msgid	"mark all articles in group as read"
 msgstr	"märgi valitud grupis kõik artiklid loetuks"
 
-#: src/lang.c:403
+#: src/lang.c:378
 msgid	"mark all articles in group as read and move to next unread group"
 msgstr	"märgi grupis kõik artiklid loetuks ja liigu järgmisele lugemata grupile"
 
-#: src/lang.c:404
+#: src/lang.c:379
 msgid	"choose first group in list"
 msgstr	"vali loetelust esimene grupp"
 
-#: src/lang.c:406
+#: src/lang.c:381
 msgid	"0 - 9\t  choose group by number"
 msgstr	"0 - 9\t  vali grupp numbri järgi"
 
-#: src/lang.c:407
+#: src/lang.c:382
 msgid	"choose range of groups to be affected by next command"
 msgstr	"järgmise käsuga töödeldavate gruppide vahemik"
 
-#: src/lang.c:408
+#: src/lang.c:383
 msgid	"choose last group in list"
 msgstr	"vali loetelust viimane grupp"
 
-#: src/lang.c:409
+#: src/lang.c:384
 msgid	"mark all articles in chosen group unread"
 msgstr	"märgi valitud grupis kõik artiklid mitte-loetuks"
 
-#: src/lang.c:410
+#: src/lang.c:385
 msgid	"move chosen group within list"
 msgstr	"liiguta valitud gruppi loendis"
 
-#: src/lang.c:411
+#: src/lang.c:386
 msgid	"choose next group with unread news"
 msgstr	"vali järgmine lugemata artiklitega grupp"
 
-#: src/lang.c:412 src/lang.c:913
+#: src/lang.c:387 src/lang.c:1176
 msgid	"quit"
 msgstr	"välju"
 
-#: src/lang.c:413
+#: src/lang.c:388
 msgid	"quit without saving configuration changes"
 msgstr	"välju muudetud seadeid salvestamata"
 
-#: src/lang.c:414
+#: src/lang.c:389
 msgid	"read chosen group"
 msgstr	"loe valitud gruppi"
 
-#: src/lang.c:415
+#: src/lang.c:390
 msgid	"reset .newsrc (all available articles in groups marked unread)"
 msgstr	".newsrc faili algväärtustamine (kõik artiklid mitte-loetuks)"
 
-#: src/lang.c:416
+#: src/lang.c:391
 msgid	"search backwards for a group name"
 msgstr	"otsi grupi nime tagaspidi"
 
-#: src/lang.c:417
+#: src/lang.c:392
 msgid	" \t  (all searches are case-insensitive and wrap around)"
 msgstr	" \t  (kõik otsingud on tõstutundetud ja vajadusel alustavad algusest)"
 
-#: src/lang.c:418
+#: src/lang.c:393
 msgid	"search forwards for a group name"
 msgstr	"otsi grupi nime edaspidi"
 
-#: src/lang.c:419
+#: src/lang.c:394
 msgid	"subscribe to chosen group"
 msgstr	"telli valitud grupp"
 
-#: src/lang.c:420
+#: src/lang.c:395
 msgid	"subscribe to groups that match pattern"
 msgstr	"telli mustrile vastavaid gruppe"
 
-#: src/lang.c:421
+#: src/lang.c:396
 msgid	"reread active file to check for any new news"
 msgstr	"kontrolli aktiivsete gruppide faili - kas on uusi artikleid"
 
-#: src/lang.c:422
+#: src/lang.c:397
 msgid	"toggle display of group name only or group name plus description"
 msgstr	"vali ekraanil ainult grupi nimi või grupi nimi ja kirjeldus"
 
-#: src/lang.c:423
+#: src/lang.c:398
 msgid	"toggle display to show all/unread subscribed groups"
 msgstr	"vali ekraanile kõik/lugemata tellitud grupid"
 
-#: src/lang.c:424
+#: src/lang.c:399
 msgid	"unsubscribe from chosen group"
 msgstr	"loobu valitud grupist"
 
-#: src/lang.c:425
+#: src/lang.c:400
 msgid	"unsubscribe from groups that match pattern"
 msgstr	"loobu mustrile vastavatest gruppidest"
 
-#: src/lang.c:426
+#: src/lang.c:401
 msgid	"sort the list of groups"
 msgstr	"järjesta gruppide loend"
 
-#: src/lang.c:427
+#: src/lang.c:402
 msgid	"toggle display to show all/subscribed groups"
 msgstr	"näita ekraanil kõiki/tellitud gruppe"
 
-#: src/lang.c:428
+#: src/lang.c:403
 msgid	"0 - 9\t  choose article by number"
 msgstr	"0 - 9\t  vali numbri järgi artikkel"
 
-#: src/lang.c:429
+#: src/lang.c:404
 msgid	"mark thread as read and return to group index page"
 msgstr	"märgi teema loetuks ja välju gruppide indeksi lehele"
 
-#: src/lang.c:430
+#: src/lang.c:405
 msgid	"mark thread as read and enter next unread thread or group"
 msgstr	"märgi teema loetuks ja sisene järgmisse teemasse või gruppi"
 
-#: src/lang.c:431
+#: src/lang.c:406
 msgid	"choose first article in list"
 msgstr	"vali loendis esimene artikkel"
 
-#: src/lang.c:432
+#: src/lang.c:407
 msgid	"choose last article in list"
 msgstr	"vali loendis viimane artikkel"
 
-#: src/lang.c:433
+#: src/lang.c:408
 msgid	"mark article as read and move cursor to next unread article"
 msgstr	"märgi artikkel loetuks ja liigu edasi järgmisele lugemata artiklile"
 
-#: src/lang.c:436
+#: src/lang.c:411
 msgid	"Display properties\n"
 	"------------------"
 msgstr	"Ekraani omadused\n"
 	"----------------"
 
-#: src/lang.c:437
+#: src/lang.c:412
 msgid	"Miscellaneous\n"
 	"-------------"
 msgstr	"Muud\n"
 	"----"
 
-#: src/lang.c:438
+#: src/lang.c:413
 msgid	"Moving around\n"
 	"-------------"
 msgstr	"Liikumine\n"
 	"---------"
 
-#: src/lang.c:439
+#: src/lang.c:414
 msgid	"Group/thread/article operations\n"
 	"-------------------------------"
 msgstr	"Grupi/teema/artikli operatsioonid\n"
 	"---------------------------------"
 
-#: src/lang.c:440
+#: src/lang.c:416
 msgid	"Group Level Commands"
 msgstr	"Grupitaseme käsud"
 
-#: src/lang.c:441
+#: src/lang.c:417
 msgid	"Kill filter added"
 msgstr	"Surmamise filter lisatud"
 
-#: src/lang.c:442
+#: src/lang.c:418
 msgid	"Auto-selection filter added"
 msgstr	"Automaatse valiku filter lisatud"
 
-#: src/lang.c:443
+#: src/lang.c:419
 msgid	"All parts tagged"
 msgstr	"Kõik osad on märgitud"
 
-#: src/lang.c:444
+#: src/lang.c:420
 msgid	"Storing article for later posting"
 msgstr	"Salvestan artikli hiljem postitamiseks"
 
-#: src/lang.c:445
+#: src/lang.c:421
 msgid	"Please enter a valid character"
 msgstr	"Palun sisestage lubatud sümbol"
 
-#: src/lang.c:446
+#: src/lang.c:422
 #, c-format
 msgid	"Missing part #%d"
 msgstr	"Puudub osa nr: %d"
 
-#: src/lang.c:447
+#: src/lang.c:423
 msgid	"*** No postponed articles ***"
 msgstr	"*** Postitusootel artikleid pole ***"
 
-#: src/lang.c:448
+#: src/lang.c:424
 msgid	"Not a multi-part message"
 msgstr	"Ei ole mitmeosaline teade"
 
-#: src/lang.c:449
+#: src/lang.c:425
 msgid	"You are not subscribed to this group"
 msgstr	"Te pole seda gruppi tellinud"
 
-#: src/lang.c:450
+#: src/lang.c:426
 msgid	"No previous expression"
 msgstr	"Eelmist avaldist pole"
 
-#: src/lang.c:451
+#: src/lang.c:427
 msgid	"Operation disabled in no-overwrite mode"
 msgstr	"Operatsioon on ülekirjutamist keelavas moodis keelatud"
 
 #. TODO: replace hardcoded key-name in txt_info_postponed
-#: src/lang.c:453
+#: src/lang.c:429
 #, c-format
 msgid	"%d postponed %s, reuse with ^O...\n"
 msgstr	"%d postitusootel %s, kasutamiseks ^O...\n"
 
-#: src/lang.c:454
+#: src/lang.c:430
 msgid	"X-Conversion-Note: multipart/alternative contents have been removed.\n"
 	"  To get the whole article, turn alternative handling OFF in the Option Menu\n"
 msgstr	"X-Conversion-Note: multipart/alternative sisu on eemaldatud.\n"
 	"  Et näha tervet artiklit, lülitage alternatiivide käsitlemine välja\n"
 
-#: src/lang.c:456
+#: src/lang.c:432
 #, c-format
 msgid	"Save filename for %s/%s is a mailbox. Attachment not saved"
 msgstr	"Fail %s/%s salvestamiseks on postkast. Lisa ei salvestatud"
 
-#: src/lang.c:457
+#: src/lang.c:433
 msgid	"TeX2Iso encoded article"
 msgstr	"TeX2Iso kodeeritud artikkel"
 
-#: src/lang.c:458
+#: src/lang.c:434
 msgid	"incomplete "
 msgstr	"mittetäielik "
 
 #. TODO: replace hardcoded key-names
-#: src/lang.c:460
+#: src/lang.c:436
 #, c-format
 msgid	"\n"
 	"Welcome to %s, a full screen threaded Netnews reader. It can read news "
@@ -1823,130 +1839,129 @@ msgstr	"\n"
 	"Lisainfot leiate manualist, README, INSTALL, TODO ja FTP failidest.\n"
 	"Palun saatke vearaportid/kommentaarid 'R' käsuga aadressil %s.\n"
 
-#: src/lang.c:476
+#: src/lang.c:452
 #, c-format
 msgid	"Invalid  From: %s  line. Read the INSTALL file again."
 msgstr	"Vigane From: %s rida. Lugege uuesti faili INSTALL."
 
-#: src/lang.c:477
+#: src/lang.c:453
 #, c-format
 msgid	"Invalid  Sender:-header %s"
 msgstr	"Vigane Sender:-päis %s"
 
-#: src/lang.c:478
+#: src/lang.c:454
 msgid	"Inverse video disabled"
 msgstr	"Pööratud video keelatud"
 
-#: src/lang.c:479
+#: src/lang.c:455
 msgid	"Inverse video enabled"
 msgstr	"Pööratud video lubatud"
 
-#: src/lang.c:480
+#: src/lang.c:457
 #, c-format
 msgid	"Missing definition for %s\n"
 msgstr	"%s definitsioon puudub\n"
 
-#: src/lang.c:481
+#: src/lang.c:458
 #, c-format
 msgid	"Invalid key definition '%s'\n"
 msgstr	"Vigane klahvi definitsioon '%s'\n"
 
-#: src/lang.c:482
+#: src/lang.c:459
 #, c-format
 msgid	"Invalid keyname '%s'\n"
 msgstr	"Vigane klahvi nimi '%s'\n"
 
-#: src/lang.c:484
-#, c-format
-msgid	"Redefined key %s '%s' -> '%s'\n"
-msgstr	"Klahvi %s uus definitsioon '%s' -> '%s'\n"
-
-#: src/lang.c:485
-msgid	"  -D       debug mode 1=NNTP 2=ALL"
-msgstr	"  -D       silumismood 1=NNTP 2=KÕIK"
-
-#: src/lang.c:487
+#: src/lang.c:460
 #, c-format
 msgid	"Key '%s' is defined for both %s%s and %s%s\n"
 msgstr	"Klahv '%s' on defineeritud nii %s%s, kui ka %s%s jaoks\n"
 
-#: src/lang.c:488
-msgid	"-- Last response --"
-msgstr	"-- Viimane vastus --"
-
-#: src/lang.c:491
+#: src/lang.c:461
 #, c-format
-msgid	"%d files successfully written from %d articles. %d %s occurred."
-msgstr	"Edukalt kirjutatud %d faili %d artiklist. Esines %d viga%s."
+msgid	"Kill From:     [%-*.*s] (y/n): "
+msgstr	"Surmake From:  [%-*.*s] (j/e): "
 
-#: src/lang.c:492
-msgid	"Missing parts."
-msgstr	"Osad puuduvad."
+#: src/lang.c:462
+msgid	"Kill Lines: (</>num): "
+msgstr	"Surmake read: (</>num) : "
 
-#: src/lang.c:493
-msgid	"No beginning."
-msgstr	"Algus puudub."
+#: src/lang.c:463
+msgid	"Kill Article Menu"
+msgstr	"Artuklite surmamise menüü"
 
-#: src/lang.c:494
-msgid	"No data."
-msgstr	"Andmeid pole."
+#: src/lang.c:464
+#, c-format
+msgid	"Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
+msgstr	"Surmake Msg-Id:[%-*.*s] (f/l/o/n): "
 
-#: src/lang.c:495
-msgid	"Unknown error."
-msgstr	"Tundmatu viga."
+#: src/lang.c:465
+msgid	"Kill pattern scope  : "
+msgstr	"Surmamise mustri ulatus: "
 
-#: src/lang.c:497
+#: src/lang.c:466
 #, c-format
-msgid	"Error decoding %s : %s"
-msgstr	"Viga %s dekodeerimisel: %s"
+msgid	"Kill Subject:  [%-*.*s] (y/n): "
+msgstr	"Surmake teema: [%-*.*s] (j/e): "
 
-#: src/lang.c:498
-msgid	"No end."
-msgstr	"Lõpp puudub."
+#: src/lang.c:467
+msgid	"Kill text pattern   : "
+msgstr	"Surmake tekst mustriga : "
 
-#: src/lang.c:499
-#, c-format
-msgid	"%s successfully decoded."
-msgstr	"%s on edukalt dekodeeritud."
+#: src/lang.c:468
+msgid	"Kill time in days   : "
+msgstr	"Surmamise aeg päevades : "
 
-#: src/lang.c:501
+#: src/lang.c:470
+msgid	"Last"
+msgstr	"Viimane"
+
+#: src/lang.c:471
+msgid	"-- Last response --"
+msgstr	"-- Viimane vastus --"
+
+#: src/lang.c:472
 #, c-format
 msgid	"Lines %s  "
 msgstr	"Rida: %s  "
 
-#: src/lang.c:503
+#: src/lang.c:474
+msgid	"Message-ID: line              "
+msgstr	"Message-ID: rida            "
+
+#: src/lang.c:476
 msgid	"mailbox "
 msgstr	"postkasti "
 
-#: src/lang.c:504
+#: src/lang.c:477
 #, c-format
 msgid	"Mail article(s) to [%.*s]> "
 msgstr	"Saada artiklid aadressil [%.*s]> "
 
-#: src/lang.c:505
+#: src/lang.c:478
 #, c-format
 msgid	"Mailing log to %s\n"
 msgstr	"Saadan logi aadressil %s\n"
 
-#: src/lang.c:506
+#: src/lang.c:479
 msgid	"Mail bug report..."
 msgstr	"Saada vearaport..."
 
-#: src/lang.c:507
+#: src/lang.c:480
 #, c-format
 msgid	"Mail BUG REPORT to %s?"
 msgstr	"Saadan VEARAPORTI aadressil %s?"
 
-#: src/lang.c:508
+#: src/lang.c:481
 msgid	"Mailed"
 msgstr	"Saadetud"
 
-#: src/lang.c:509
+#: src/lang.c:482
 #, c-format
 msgid	"Mailing to %s..."
 msgstr	"Saadan aadressil %s..."
 
-#: src/lang.c:510
+#: src/lang.c:483
 msgid	"# [Mail/Save] active file. Format is like news active file:\n"
 	"#   groupname  max.artnum  min.artnum  /dir\n"
 	"# The 4th field is the basedir (ie. ~/Mail or ~/News)\n"
@@ -1956,387 +1971,288 @@ msgstr	"# [Saada/Salvesta] fail \"active
 	"# Neljas väli on baaskataloog (näiteks ~/Mail või ~/News)\n"
 	"#\n"
 
-#: src/lang.c:513
+#: src/lang.c:486
 #, c-format
 msgid	"%s marked as unread"
 msgstr	"%s märgitud loetuks"
 
-#: src/lang.c:514
+#: src/lang.c:487
 #, c-format
 msgid	"Marked %d of %d tagged %s as read"
 msgstr	"Märkisin %d (%d) märgitud %s loetuks"
 
-#: src/lang.c:515
+#: src/lang.c:488
 #, c-format
 msgid	"Mark all articles as read%s?"
 msgstr	"Märgin kõik artiklid loetuks%s?"
 
-#: src/lang.c:516
+#: src/lang.c:489
 #, c-format
 msgid	"Mark %s=tagged articles, %s=current article, %s=quit: "
 msgstr	"Märgi %s=märgitud artiklid, %s=jooksev artikkel, %s=välju: "
 
-#: src/lang.c:517
+#: src/lang.c:490
 #, c-format
 msgid	"Mark group %.*s as read?"
 msgstr	"Märgin grupi %.*s loetuks?"
 
-#: src/lang.c:518
+#: src/lang.c:491
 #, c-format
 msgid	"Mark thread as read%s?"
 msgstr	"Märgin teema loetuks%s?"
 
-#: src/lang.c:519
+#: src/lang.c:492
 #, c-format
 msgid	"Mark %s=tagged articles/threads, %s=current thread, %s=quit: "
 msgstr	"Märgi %s=märgitud artiklid/teemad, %s=jooksev teema, %s=välju: "
 
-#: src/lang.c:520
+#: src/lang.c:493
 #, c-format
 msgid	"Matching %s groups..."
 msgstr	"Otsin %s gruppe..."
 
-#: src/lang.c:521 src/lang.c:525
+#: src/lang.c:494 src/lang.c:498
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s=search pattern; %s=kill/select"
 msgstr	"<n>=n jooksvaks grupiks; %s=järgmine lugemata; %s=otsi; %s=surma/vali;"
 
-#: src/lang.c:522
+#: src/lang.c:495
 #, c-format
 msgid	"%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list "
 	"thread"
 msgstr	"%s=autori otsing; %s=loetud; %s=rida alla; %s=rida üles; %s=märgi loetuks; "
 	"%s=teema"
 
-#: src/lang.c:523
+#: src/lang.c:496
 #, c-format
 msgid	"%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom"
 msgstr	"%s=rida üles; %s=rida alla; %s=lk. üles; %s=lk. alla; %s=üles; %s=alla"
 
-#: src/lang.c:524
+#: src/lang.c:497
 #, c-format
 msgid	"%s=search forwards; %s=search backwards; %s=quit"
 msgstr	"%s=otsi edaspidi; %s=otsi tagaspidi; %s=välju"
 
-#: src/lang.c:526
+#: src/lang.c:499
 #, c-format
 msgid	"%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read"
 msgstr	"%s=autori otsing; %s=otsi sisu; %s=loetud; %s=vasta; %s=märgi loetuks"
 
-#: src/lang.c:530
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
-	"%s=post"
-msgstr	"%s=toru; %s=kiri; %s=trüki; %s=välju; %s=kõik/lugem; %s=salv; %s=märgi; "
-	"%s=postita"
-
-#: src/lang.c:531
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=toru; %s=kiri; %s=trüki; %s=välju; %s=kirjuta; %s=salv; %s=märgi; "
-	"%s=postita"
-
-#: src/lang.c:533
-#, c-format
-msgid	"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=kiri; %s=trüki; %s=välju; %s=kõik/lugem; %s=salvesta; %s=märgi; %s=postita"
-
-#: src/lang.c:534
-#, c-format
-msgid	"%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=kiri; %s=trüki; %s=välju; %s=kirjuta; %s=salvesta; %s=märgi; %s=postita"
-
-#: src/lang.c:538
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=toru; %s=kiri; %s=välju; %s=kõik/lugemata; %s=salv; %s=märgi; %s=postita"
-
-#: src/lang.c:539
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=toru; %s=kiri; %s=välju; %s=kirjuta; %s=salvesta; %s=märgi; %s=postita"
-
-#: src/lang.c:541
-#, c-format
-msgid	"%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=kiri; %s=välju; %s=kõik/lugemata; %s=salvesta; %s=märgi; %s=postita"
-
-#: src/lang.c:542
-#, c-format
-msgid	"%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=kiri; %s=välju; %s=vasta kirjaga; %s=salvesta; %s=märgi; %s=postita"
-
-#: src/lang.c:546
+#: src/lang.c:500
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup"
 msgstr	"<n>=n jooksvaks grupiks; %s=järgmine lugemata; %s,%s=otsi; %s=loetud"
 
-#: src/lang.c:547
+#: src/lang.c:501
 #, c-format
 msgid	"%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread"
 msgstr	"%s=rida alla; %s=rida üles; %s=appi; %s=tõsta; %s=välju; %s=kõik/lugemata"
 
-#: src/lang.c:548
+#: src/lang.c:502
 #, c-format
 msgid	"%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out"
 msgstr	"%s=telli; %s=telli muster; %s=loobu; %s=loobu muster; %s=kõik/tellitud"
 
-#: src/lang.c:549
+#: src/lang.c:503
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s=catchup; %s=display toggle"
 msgstr	"<n>=jooksev n; %s=järgmine lugemata; %s=loetud; %s=ekraani lülit"
 
-#: src/lang.c:550
+#: src/lang.c:504
 #, c-format
 msgid	"%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread"
 msgstr	"%s=appi; %s=rida alla; %s=rida üles; %s=välju; %s=märgi; %s=lugemata"
 
-#: src/lang.c:551
+#: src/lang.c:505
 msgid	"--More--"
 msgstr	"--Veel--"
 
-#: src/lang.c:552
+#: src/lang.c:506
 #, c-format
 msgid	"Moving %s..."
 msgstr	"Tõstan %s..."
 
-#: src/lang.c:553
+#: src/lang.c:508
 msgid	", name: "
 msgstr	", nimi: "
 
-#: src/lang.c:554
+#: src/lang.c:509
 #, c-format
 msgid	"Goto newsgroup [%s]> "
 msgstr	"Mine gruppi [%s]> "
 
-#: src/lang.c:555
+#: src/lang.c:510
 msgid	"newsgroups"
 msgstr	"gruppidesse"
 
-#: src/lang.c:556
+#: src/lang.c:511
 #, c-format
 msgid	"Position %s in group list (1,2,..,$) [%d]> "
 msgstr	"Positsioon %s gruppide nimistus (1,2,..,$) [%d]> "
 
-#: src/lang.c:557
+#: src/lang.c:512
 msgid	"newsgroup"
 msgstr	"gruppi"
 
-#: src/lang.c:558
+#: src/lang.c:513
 msgid	"Try and save newsrc file again?"
 msgstr	"Proovin newsrc faili uuesti salvestada?"
 
-#: src/lang.c:559
+#: src/lang.c:514
 msgid	"Warning: No newsgroups were written to your newsrc file. Save aborted."
 msgstr	"Hoiatus: Teie newsrc faili ei salvestatud ühtegi gruppi. Katkestasin "
 	"salvestamise."
 
-#: src/lang.c:560
+#: src/lang.c:515
 msgid	"newsrc file saved successfully.\n"
 msgstr	"newsrc fail on edukalt salvestatud.\n"
 
-#: src/lang.c:561
+#: src/lang.c:516
 msgid	"-- Next response --"
 msgstr	"- Järgmine vastus -"
 
-#: src/lang.c:562
+#: src/lang.c:517
 #, c-format
 msgid	"NNTP authorization password not found for %s"
 msgstr	"Serverile %s vastavat NNTP autoriseerimise parooli pole"
 
-#: src/lang.c:565 src/nntplib.c:966
-msgid	"205  Closing connection"
-msgstr	"205  Sulen ühendust"
-
-#: src/lang.c:566
-msgid	"  -A       force authentication on connect"
-msgstr	"  -A       sunni ühenduse loomisel autentima"
-
-#: src/lang.c:567
-#, c-format
-msgid	"  -g serv  read news from NNTP server serv [default=%s]"
-msgstr	"  -g serv  loe uudiseid NNTP serverist serv [vaikimisi=%s]"
-
-#: src/lang.c:568
-#, c-format
-msgid	"  -p port  use port as NNTP port [default=%d]"
-msgstr	"  -p port  kasuta NNTP porti [vaikimisi=%d]"
-
-#: src/lang.c:569
-msgid	"  -Q       quick start. Same as -nqd"
-msgstr	"  -Q       kiirstart. Sama kui -nqd"
-
-#: src/lang.c:570
-msgid	"  -l       use only LIST instead of GROUP (-n) command"
-msgstr	"  -l       kasuta LIST käsku GROUP (-n) käsu asemel"
-
-#: src/lang.c:571
-msgid	"  -n       only read subscribed .newsrc groups from NNTP server"
-msgstr	"  -n       loe NNTP serverist ainult tellitud .newsrc grupid"
-
-#: src/lang.c:573
-msgid	"  -Q       quick start. Same as -qd"
-msgstr	"  -Q       kiirstart. Sama kui -qd"
-
-#: src/lang.c:574
-msgid	"  -l       read only active file instead of scanning spool (-n) command"
-msgstr	"  -l       loe pooli skaneerimise (-n) asemel ainult faili active"
-
-#: src/lang.c:575
-msgid	"  -n       only read subscribed .newsrc groups from spool"
-msgstr	"  -n       loe poolist ainult tellitud .newsrc gruppe"
-
-#: src/lang.c:578
+#: src/lang.c:518
 msgid	"No  "
 msgstr	"Ei  "
 
-#: src/lang.c:579
+#: src/lang.c:519
 msgid	"*** No articles ***"
 msgstr	"*** Artikleid pole ***"
 
-#: src/lang.c:580
+#: src/lang.c:520
 msgid	"No articles have been posted"
 msgstr	"Postitatud artikleid pole"
 
-#: src/lang.c:583
-msgid	"No command"
-msgstr	"Käsku pole"
-
-#: src/lang.c:588
-msgid	"Terminal does not support color"
-msgstr	"Terminal ei toeta värve"
-
-#: src/lang.c:592
+#: src/lang.c:521
 msgid	"*** No description ***"
 msgstr	"*** Kirjeldus puudub ***"
 
-#: src/lang.c:593
+#: src/lang.c:522
 msgid	"No filename"
 msgstr	"Failil pole nime"
 
-#: src/lang.c:594
+#: src/lang.c:523
 msgid	"No group"
 msgstr	"Gruppi pole"
 
-#: src/lang.c:595
+#: src/lang.c:524
 msgid	"*** No groups ***"
 msgstr	"*** Gruppe pole ***"
 
-#: src/lang.c:596
+#: src/lang.c:525
 msgid	"No more groups to read"
 msgstr	"Lugemiseks rohkem gruppe pole"
 
-#: src/lang.c:597
+#: src/lang.c:526
 msgid	"No last message"
 msgstr	"Viimast teadet pole"
 
-#: src/lang.c:598
+#: src/lang.c:527
 msgid	"No mail address"
 msgstr	"E-posti aadressi pole"
 
-#: src/lang.c:599
+#: src/lang.c:528
 msgid	"No articles marked for saving"
 msgstr	"Salvestamiseks märgitud artikleid pole"
 
-#: src/lang.c:600
+#: src/lang.c:529
 msgid	"No match"
 msgstr	"Ei leia"
 
-#: src/lang.c:601
+#: src/lang.c:530
 msgid	"No more groups"
 msgstr	"Rohkem gruppe pole"
 
-#: src/lang.c:602
+#: src/lang.c:531
 msgid	"No newsgroups"
 msgstr	"Gruppe pole"
 
-#: src/lang.c:603
+#: src/lang.c:532
 msgid	"No next unread article"
 msgstr	"Järgmist lugemata artiklit pole"
 
-#: src/lang.c:604
+#: src/lang.c:533
 msgid	"No previous group"
 msgstr	"Eelmist gruppi pole"
 
-#: src/lang.c:605
+#: src/lang.c:534
 msgid	"No previous unread article"
 msgstr	"Eelmist lugemata artiklit pole"
 
-#: src/lang.c:606
+#: src/lang.c:535
 #, c-format
 msgid	"No responses%s"
 msgstr	"Vastuseid pole%s"
 
-#: src/lang.c:607
+#: src/lang.c:536
 msgid	"No responses"
 msgstr	"Vastuseid pole"
 
-#: src/lang.c:608
+#: src/lang.c:537
 msgid	"No responses to list in current thread"
 msgstr	"Jooksvas teemas pole vastuseid"
 
-#: src/lang.c:609
+#: src/lang.c:538
 msgid	"No search string"
 msgstr	"Otsingusõne puudub"
 
-#: src/lang.c:610
+#: src/lang.c:539
 msgid	"No subject"
 msgstr	"Teema puudub"
 
-#: src/lang.c:611
+#: src/lang.c:540
 #, c-format
 msgid	"%s: Terminal must have clear to end-of-line (ce)\n"
 msgstr	"%s: Terminalil peab olema puhasta realõpuni (ce) omadus\n"
 
-#: src/lang.c:612
+#: src/lang.c:541
 #, c-format
 msgid	"%s: Terminal must have clear to end-of-screen (cd)\n"
 msgstr	"%s: Terminalil peab olema puhasta ekraanilõpuni (cd) omadus\n"
 
-#: src/lang.c:613
+#: src/lang.c:542
 #, c-format
 msgid	"%s: Terminal must have clearscreen (cl) capability\n"
 msgstr	"%s: Terminalil peab olema ekraanipuhastamise (cl) omadus\n"
 
-#: src/lang.c:614
+#: src/lang.c:543
 #, c-format
 msgid	"%s: Terminal must have cursor motion (cm)\n"
 msgstr	"%s: Terminal peab toetama kursori liigutamist (cm)\n"
 
-#: src/lang.c:615
+#: src/lang.c:544
 #, c-format
 msgid	"%s: TERM variable must be set to use screen capabilities\n"
 msgstr	"%s: ekraani omaduste kasutamiseks peab olema seatud keskkonnamuutuja TERM\n"
 
-#: src/lang.c:616
+#: src/lang.c:545
 #, c-format
 msgid	"No viewer found for %s/%s\n"
 msgstr	"%s/%s jaoks puudub vaatur\n"
 
-#: src/lang.c:617
-msgid	"Your server does not support the NNTP XOVER or OVER command.\n"
-	"Tin will use local index files instead.\n"
-msgstr	"Teie server ei toeta NNTP XOVER või OVER käsku.\n"
-	"Tin kasutab lokaalseid indeksfaile.\n"
-
-#: src/lang.c:618
+#: src/lang.c:546
 msgid	"Newsgroup does not exist on this server"
 msgstr	"Gruppi pole sellel serveril"
 
-#: src/lang.c:619
+#: src/lang.c:547
 #, c-format
 msgid	"Group %s not found in active file"
 msgstr	"Gruppi %s pole aktiivsete gruppide failis"
 
-#: src/lang.c:620
+#: src/lang.c:548
 msgid	"c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr	"c=loo fail, a)lternatiivne nimi, d=vaikimisi .newsrc, q=välju: "
 
-#: src/lang.c:621
+#: src/lang.c:549
 msgid	"use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr	"a)lternatiivne nimi, d=vaikimisi .newsrc, q=välju: "
 
-#: src/lang.c:623
+#: src/lang.c:550
 #, c-format
 msgid	"# NNTP-server -> newsrc translation table and NNTP-server\n"
 	"# shortname list for %s %s\n"
@@ -2363,76 +2279,40 @@ msgstr	"# NNTP-server -> newsrc teisendu
 	"#   news.ka.nu    /tmp/nrc-nu      kanu    nu\n"
 	"#\n"
 
-#: src/lang.c:630
+#: src/lang.c:557
+msgid	"Only"
+msgstr	"Ainult"
+
+#: src/lang.c:558
 #, c-format
 msgid	"Option not enabled. Recompile with %s."
 msgstr	"Võti pole lubatud. Kasutage kompileerimisel %s."
 
-#: src/lang.c:631
+#: src/lang.c:559
 msgid	"Options Menu"
 msgstr	"Omaduste menüü"
 
-#: src/lang.c:634
+#: src/lang.c:562
 #, c-format
 msgid	"Error in regex: %s at pos. %d '%s'"
 msgstr	"Viga regulaaravaldises: %s positsioonil %d '%s'"
 
-#: src/lang.c:635
+#: src/lang.c:563
 #, c-format
 msgid	"Error in regex: pcre internal error %d"
 msgstr	"Viga regulaaravaldises: pcre sisemine viga %d"
 
-#: src/lang.c:636
+#: src/lang.c:564
 #, c-format
 msgid	"Error in regex: study - pcre internal error %s"
 msgstr	"Viga regulaaravaldises: uurimiseks - pcre sisemine viga %s"
 
-#: src/lang.c:639
-msgid	"Add key(s) to public keyring?"
-msgstr	"Lisan võtmed avalike võtmete hoidlasse?"
-
-#: src/lang.c:640
-#, c-format
-msgid	"%s=encrypt, %s=sign, %s=both, %s=quit: "
-msgstr	"%s=krüpti, %s=allkirjasta, %s=mõlemad, %s=välju: "
-
-#: src/lang.c:641
-#, c-format
-msgid	"%s=sign, %s=sign & include public key, %s=quit: "
-msgstr	"%s=allkirjasta, %s=allkirjasta & lisa avalik võti, %s=välju: "
-
-#: src/lang.c:642
-#, c-format
-msgid	"PGP has not been set up (can't open %s)"
-msgstr	"PGP pole seadistatud (ei saa avada %s)"
-
-#: src/lang.c:643
-msgid	"Article not signed and no public keys found"
-msgstr	"Artikkel pole allkirjastatud ja avalikke võtmeid pole"
-
-#: src/lang.c:647
-msgid	"Pipe"
-msgstr	"Toru"
-
-#: src/lang.c:648
-#, c-format
-msgid	"Pipe to command [%.*s]> "
-msgstr	"Toru käsku [%.*s]> "
-
-#: src/lang.c:649
-msgid	"Piping..."
-msgstr	"Saadan torusse..."
-
-#: src/lang.c:651
-msgid	"Piping not enabled."
-msgstr	"Toru kasutamine pole lubatud."
-
-#: src/lang.c:654
+#: src/lang.c:565
 msgid	"Post a followup..."
 msgstr	"Postita vastus..."
 
 #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone
-#: src/lang.c:656
+#: src/lang.c:567
 msgid	"An error has occurred while posting the article. If you think that this\n"
 	"error is temporary or otherwise correctable, you can postpone the article\n"
 	"and pick it up again with ^O later.\n"
@@ -2440,480 +2320,496 @@ msgstr	"Artikli postitamisel tekkis viga
 	"või muul viisil kõrvaldatav, võite artikli salvestada hiljem postitamiseks\n"
 	"ja ^O käsuga hiljem postitada.\n"
 
-#: src/lang.c:659
+#: src/lang.c:570
 msgid	"Posted articles history"
 msgstr	"Postitatud artiklite ajalugu"
 
-#: src/lang.c:660
+#: src/lang.c:571
 #, c-format
 msgid	"Post to newsgroup(s) [%s]> "
 msgstr	"Postita gruppidesse [%s]> "
 
-#: src/lang.c:661
+#: src/lang.c:572
 msgid	"-- post processing started --"
 msgstr	"-- lõpptöötlus alustas --"
 
-#: src/lang.c:662
+#: src/lang.c:573
 msgid	"-- post processing completed --"
 msgstr	"-- lõpptöötlus lõpetas --"
 
-#: src/lang.c:663
+#: src/lang.c:574
 #, c-format
 msgid	"Post subject [%s]> "
 msgstr	"Postituse teema [%s]> "
 
-#: src/lang.c:665
-msgid	"Posting using external inews failed. Use built in inews instead?"
-msgstr	"Välise inews programmiga postitamine ebaõnnestus. Proovin sisemist inewsi?"
-
-#: src/lang.c:666
-msgid	"It worked! Should I always use my built in inews from now on?"
-msgstr	"See töötas! Kas kasutan nüüd alati sisemist inews programmi?"
-
-#: src/lang.c:668
+#: src/lang.c:575
 msgid	"# Summary of mailed/posted messages viewable by 'W' command from within tin.\n"
 msgstr	"# Kokkuvõtte saadetud/postitatud teadetest saate tinis 'W' käsuga.\n"
 
-#: src/lang.c:669
+#: src/lang.c:576
 msgid	"Posting article..."
 msgstr	"Postitan artiklit..."
 
-#: src/lang.c:670
+#: src/lang.c:577
 msgid	"Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): "
 msgstr	"Postitan postitusootel artiklid [%%.*s]? (%s/%s/%s/%s/%s): "
 
-#: src/lang.c:671
+#: src/lang.c:578
 #, c-format
 msgid	"Hot %s"
 msgstr	"Kuum %s"
 
-#: src/lang.c:672
+#: src/lang.c:579
 #, c-format
 msgid	"Tagged %s"
 msgstr	"Märgitud %s"
 
-#: src/lang.c:673
+#: src/lang.c:580
+msgid	"Processing mail messages marked for deletion."
+msgstr	"Töötlen kirju, mis on kustutamiseks märgitud."
+
+#: src/lang.c:581
+msgid	"Processing saved articles marked for deletion."
+msgstr	"Töötlen salvestatud ja kustutamiseks märgitud artikleid."
+
+#: src/lang.c:582
 #, c-format
 msgid	"Accept Followup-To? %s=post, %s=ignore, %s=quit: "
 msgstr	"Aktsepteerin Followup-To? %s=postita, %s=ignoreeri, %s=välju: "
 
-#: src/lang.c:674
+#: src/lang.c:583
 msgid	"Article unchanged, abort mailing?"
 msgstr	"Artiklit ei ole muudetud, katkestan saatmise?"
 
-#: src/lang.c:675
+#: src/lang.c:584
 #, c-format
 msgid	"Do you want to see postponed articles (%d)?"
 msgstr	"Kas soovite näha postitamisootel artikleid (%d)?"
 
-#: src/lang.c:676
+#: src/lang.c:586
 msgid	"Add quick kill filter?"
 msgstr	"Lisan kiirsurmamise filtri?"
 
-#: src/lang.c:677
+#: src/lang.c:587
 msgid	"Add quick selection filter?"
 msgstr	"Lisan kiirvaliku filtri?"
 
-#: src/lang.c:678
+#: src/lang.c:588
 msgid	"Do you really want to quit?"
 msgstr	"Kas te tõesti soovite väljuda?"
 
-#: src/lang.c:679
+#: src/lang.c:589
 msgid	"%s=edit cancel message, %s=quit, %s=delete (cancel) [%%.*s]: "
 msgstr	"%s=toimeta katkestamisteadet, %s=välju, %s=kustuta (katkesta) [%%.*s]: "
 
-#: src/lang.c:680
+#: src/lang.c:590
 msgid	"You have tagged articles in this group - quit anyway?"
 msgstr	"Teil on siin grupis märgitud artikleid - väljun siiski?"
 
-#: src/lang.c:681
+#: src/lang.c:591
 #, c-format
 msgid	"%s=quit, %s=edit, %s=postpone: "
 msgstr	"%s=välju, %s=toimeta, %s=postitusootele: "
 
-#: src/lang.c:682
+#: src/lang.c:592
 #, c-format
 msgid	"%s=quit %s=edit %s=save kill description: "
 msgstr	"%s=välju %s=toimeta %s=salvesta surmamise kirjeldus: "
 
-#: src/lang.c:683
+#: src/lang.c:593
 #, c-format
 msgid	"%s=quit %s=edit %s=save select description: "
 msgstr	"%s=välju %s=toimeta %s=salvesta valiku kirjeldus: "
 
-#: src/lang.c:684
+#: src/lang.c:594
 msgid	"Do you really want to quit without saving your configuration?"
 msgstr	"Kas te tõesti soovite seadeid salvestamata väljuda?"
 
-#: src/lang.c:686
+#: src/lang.c:597
 msgid	"Invalid range - valid are '0-9.$' eg. 1-$"
 msgstr	"Vigane vahemik - lubatud on '0-9.$' näiteks 1-$"
 
-#: src/lang.c:687
+#: src/lang.c:598
 msgid	"Do you want to abort this operation?"
 msgstr	"Kas soovite seda operatsiooni katkestada?"
 
-#: src/lang.c:688
+#: src/lang.c:599
 msgid	"Do you want to exit tin immediately?"
 msgstr	"Kas soovite viivitamata tinist väljuda?"
 
-#: src/lang.c:689
+#: src/lang.c:600
 msgid	"Read response> "
 msgstr	"Loen vastust> "
 
-#: src/lang.c:690
+#: src/lang.c:601
 msgid	"Reading ('q' to quit)..."
 msgstr	"Loen ('q' katkestamiseks)..."
 
-#: src/lang.c:691
+#: src/lang.c:602
 #, c-format
 msgid	"Reading %sarticles..."
 msgstr	"Loen %sartikleid..."
 
-#: src/lang.c:692
+#: src/lang.c:603
 #, c-format
 msgid	"Reading %sattributes file...\n"
 msgstr	"Loen %satribuutide faili...\n"
 
-#: src/lang.c:693
+#: src/lang.c:604
 #, c-format
 msgid	"Reading %sconfig file...\n"
 msgstr	"Loen %sseadete faili...\n"
 
-#: src/lang.c:694
+#: src/lang.c:605
 msgid	"Reading filter file...\n"
 msgstr	"Loen filtrite faili...\n"
 
-#: src/lang.c:695
+#: src/lang.c:606
 #, c-format
 msgid	"Reading %s groups..."
 msgstr	"Loen %s gruppe..."
 
-#: src/lang.c:696
+#: src/lang.c:607
 msgid	"Reading input history file...\n"
 msgstr	"Loen sisendi ajalugu...\n"
 
-#: src/lang.c:697
+#: src/lang.c:608
 msgid	"Reading keymap file...\n"
 msgstr	"Loen klahvitabeli faili...\n"
 
-#: src/lang.c:699
-msgid	"Reading mail active file... "
-msgstr	"Loen aktiivsete kirjade kausta... "
-
-#: src/lang.c:700
-msgid	"Reading mailgroups file... "
-msgstr	"Loen kirjagruppide faili... "
-
-#: src/lang.c:702
+#: src/lang.c:609
 msgid	"Reading groups from active file... "
 msgstr	"Loen aktiivseid gruppe... "
 
-#: src/lang.c:703
+#: src/lang.c:610
 msgid	"Reading groups from newsrc file... "
 msgstr	"Loen gruppe newsrc failist... "
 
-#: src/lang.c:704
+#: src/lang.c:611
 msgid	"Reading newsgroups file... "
 msgstr	"Loen gruppide kirjeldusi... "
 
-#: src/lang.c:705
+#: src/lang.c:612
 msgid	"Reading newsrc file..."
 msgstr	"Loen newsrc faili..."
 
-#: src/lang.c:706
-msgid	"Connection to news server has timed out. Reconnect?"
-msgstr	"Ühendus uudisegruppide serveriga aegus. ühendun uuesti?"
-
-#: src/lang.c:707
+#: src/lang.c:613
 #, c-format
 msgid	"Bogus group %s removed."
 msgstr	"Vigane grupp %s on eemaldatud."
 
-#: src/lang.c:708
+#: src/lang.c:614
 #, c-format
 msgid	"Error: rename %s to %s"
 msgstr	"Viga: %s uus nimi %s"
 
-#: src/lang.c:709
+#: src/lang.c:615
 msgid	"Reply to author..."
 msgstr	"Vastan autorile..."
 
-#: src/lang.c:710
+#: src/lang.c:616
 msgid	"Repost"
 msgstr	"Uuesti postitus"
 
-#: src/lang.c:711
+#: src/lang.c:617
 msgid	"Reposting article..."
 msgstr	"Postitan artikli uuesti..."
 
-#: src/lang.c:712
+#: src/lang.c:618
 #, c-format
 msgid	"Repost article(s) to group(s) [%s]> "
 msgstr	"Postitan artikli(d) gruppi(desse) [%s]> "
 
-#: src/lang.c:713
+#: src/lang.c:619
 msgid	"Reset newsrc?"
 msgstr	"Algväärtustan newsrc?"
 
-#: src/lang.c:714
+#: src/lang.c:620
 msgid	"Responses have been directed to the following newsgroups"
 msgstr	"Vastused edastatakse järgnevatesse gruppidesse"
 
-#: src/lang.c:715
+#: src/lang.c:621
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	"Vastused edastatakse postitajale. %s=kirjuta, %s=postita, %s=välju: "
 
-#: src/lang.c:716
+#: src/lang.c:622
 #, c-format
-msgid	"RespNo %3d of %3d%s"
-msgstr	"Vastus %3d : %3d%s"
+msgid	"RespNo %4d of %4d%s"
+msgstr	"Vastus %4d : %4d%s"
 
-#: src/lang.c:717
+#: src/lang.c:623
 msgid	"Press <RETURN> to continue..."
 msgstr	"Jätkamiseks vajutage <RETURN>..."
 
-#: src/lang.c:718
+#: src/lang.c:625
+#, c-format
+msgid	"Select From    [%-*.*s] (y/n): "
+msgstr	"Valige From    [%-*.*s] (j/e): "
+
+#: src/lang.c:626
+msgid	"Select Lines: (</>num): "
+msgstr	"Valige read:  (</>num): "
+
+#: src/lang.c:627
+msgid	"Auto-select Article Menu"
+msgstr	"Automaatselt valitavate artiklite menüü"
+
+#: src/lang.c:628
+#, c-format
+msgid	"Select Msg-Id  [%-*.*s] (f/l/o/n): "
+msgstr	"Valige Msg-Id  [%-*.*s] (f/l/o/n): "
+
+#: src/lang.c:629
+msgid	"Select pattern scope: "
+msgstr	"Valige mustri ulatus: "
+
+#: src/lang.c:630
+#, c-format
+msgid	"Select Subject [%-*.*s] (y/n): "
+msgstr	"Valige teema   [%-*.*s] (j/e): "
+
+#: src/lang.c:631
+msgid	"Select text pattern : "
+msgstr	"Valige tekstimuster : "
+
+#: src/lang.c:632
+msgid	"Select time in days   : "
+msgstr	"Valige aeg päevades   : "
+
+# TRANSLATION MISSING
+#: src/lang.c:633
+#, c-format
+msgid	"# %s server configuration file\n"
+	"# This file was automatically saved by %s %s %s (\"%s\")\n"
+	"#\n"
+	"# Do not edit while %s is running, since all your changes to this file\n"
+	"# will be overwritten when you leave %s.\n"
+	"# Do not edit at all if you don't know what you do.\n"
+	"############################################################################\n"
+	"\n"
+msgstr	""
+
+#: src/lang.c:639
+msgid	"Showing unread groups only"
+msgstr	"Näitan ainult lugemata gruppe"
+
+#: src/lang.c:640
+msgid	"Subject: line (ignore case)   "
+msgstr	"Subject: rida (tõstutundetu)"
+
+#: src/lang.c:641
+msgid	"Subject: line (case sensitive)"
+msgstr	"Subject: rida (tõstutundlik)"
+
+#: src/lang.c:642
 msgid	"Save"
 msgstr	"Salvesta"
 
-#: src/lang.c:719
+#: src/lang.c:643
 #, c-format
 msgid	"Save '%s' (%s/%s)?"
 msgstr	"Salvestan '%s' (%s/%s)?"
 
-#: src/lang.c:720
+#: src/lang.c:644
 msgid	"Save configuration before continuing?"
 msgstr	"Salvestan seaded enne jätkamist?"
 
-#: src/lang.c:721
+#: src/lang.c:645
 msgid	"Save filename> "
 msgstr	"Fail salvestamiseks> "
 
-#: src/lang.c:722
+#: src/lang.c:646
 msgid	"Saved"
 msgstr	"Salvestatud"
 
-#: src/lang.c:723
+#: src/lang.c:647
 #, c-format
 msgid	"%4d unread (%4d hot) %s in %s\n"
 msgstr	"%4d lugemata (%4d kuuma) %s grupis %s\n"
 
-#: src/lang.c:724
+#: src/lang.c:648
 #, c-format
 msgid	"Saved %s...\n"
 msgstr	"Salvestatud %s...\n"
 
-#: src/lang.c:725
+#: src/lang.c:649
 msgid	"Nothing was saved"
 msgstr	"Midagi ei salvestatud"
 
-#: src/lang.c:726
+#: src/lang.c:650
 #, c-format
 msgid	"\n"
 	"%s %d %s from %d %s\n"
 msgstr	"\n"
 	"%s %d %s %d grupist%s\n"
 
-#: src/lang.c:727
+#: src/lang.c:651
 #, c-format
 msgid	"-- %s saved to %s%s --"
 msgstr	"-- %s salvestati %s%s --"
 
-#: src/lang.c:728
+#: src/lang.c:652
 #, c-format
 msgid	"-- %s saved to %s - %s --"
 msgstr	"-- %s salvestati %s - %s --"
 
-#: src/lang.c:729
+#: src/lang.c:653
 msgid	"Saving..."
 msgstr	"Salvestan..."
 
-#: src/lang.c:730
+#: src/lang.c:654
 #, c-format
 msgid	"%s: Screen initialization failed"
 msgstr	"%s: Ekraani initsialiseerimine ebaõnnestus"
 
-#: src/lang.c:731
+#: src/lang.c:655
 #, c-format
 msgid	"%s: screen is too small\n"
 msgstr	"%s: ekraan on liiga väike\n"
 
-#: src/lang.c:732
+#: src/lang.c:656
 #, c-format
 msgid	"screen is too small, %s is exiting\n"
 msgstr	"ekraan on liiga väike, %s lõpetab töö\n"
 
-#: src/lang.c:733
+#: src/lang.c:657
 #, c-format
 msgid	"Search backwards [%s]> "
 msgstr	"Otsin tagurpidi [%s]> "
 
-#: src/lang.c:734
+#: src/lang.c:658
 #, c-format
 msgid	"Search body [%s]> "
 msgstr	"Otsi kehast [%s]> "
 
-#: src/lang.c:735
+#: src/lang.c:659
 #, c-format
 msgid	"Search forwards [%s]> "
 msgstr	"Otsi edaspidi [%s]> "
 
-#: src/lang.c:736
+#: src/lang.c:660
 msgid	"Searching..."
 msgstr	"Otsin..."
 
-#: src/lang.c:737
+#: src/lang.c:661
 #, c-format
 msgid	"Searching article %d of %d ('q' to abort)..."
 msgstr	"Otsin artiklit %d/%d ('q' katkestamiseks)..."
 
-#: src/lang.c:738
+#: src/lang.c:662
 msgid	"Select article> "
 msgstr	"Valige artikkel> "
 
-#: src/lang.c:739
+#: src/lang.c:663
 msgid	"Select option number before text or use arrow keys and <CR>. 'q' to quit."
 msgstr	"Valige teksti eest omaduse number või kasutage nooli ja <CR>. 'q' väljumiseks."
 
-#: src/lang.c:740
+#: src/lang.c:664
 msgid	"Select group> "
 msgstr	"Valige grupp> "
 
-#: src/lang.c:741
+#: src/lang.c:665
 #, c-format
 msgid	"Enter selection pattern [%s]> "
 msgstr	"Sisestage valiku muster [%s]> "
 
-#: src/lang.c:742
+#: src/lang.c:666
 msgid	"Select thread > "
 msgstr	"Valige teema > "
 
-#: src/lang.c:743
+#: src/lang.c:667
 #, c-format
 msgid	"%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n"
 msgstr	"%s %s %s (\"%s\") [%s]: saatke palun DETAILNE vea raport aadressil %s\n"
 
-#: src/lang.c:744
-#, c-format
-msgid	"Put the server name in the file %s,\n"
-	"or set the environment variable NNTPSERVER"
-msgstr	"Kirjutage serveri nimi faili %s,\n"
-	"või seadke keskonnamuutuja NNTPSERVER"
-
-#: src/lang.c:745
+#: src/lang.c:668
 msgid	"servers active-file"
 msgstr	"serveri aktiivsete gruppide fail"
 
-#: src/lang.c:747
-#, c-format
-msgid	"Shell Command (%s)"
-msgstr	"Käsurea käsk (%s)"
-
-#: src/lang.c:748
-#, c-format
-msgid	"Enter shell command [%s]> "
-msgstr	"Sisestage käsurea käsk [%s]> "
-
-#: src/lang.c:750
+#: src/lang.c:669
 msgid	"Cannot move into new newsgroups. Subscribe first..."
 msgstr	"Uutesse gruppidesse ei saa siseneda. Tellige kõigepealt..."
 
-#: src/lang.c:751
+#: src/lang.c:670
 msgid	"<SPACE>"
 msgstr	"<TÜHIK>"
 
-#: src/lang.c:752
+#: src/lang.c:671
 #, c-format
 msgid	"Starting: (%s)"
 msgstr	"Stardin: (%s)"
 
-#: src/lang.c:753
+#: src/lang.c:672
 #, c-format
 msgid	"List Thread (%d of %d)"
 msgstr	"Teemad (%d/%d)"
 
-#: src/lang.c:754
+#: src/lang.c:673
 #, c-format
 msgid	"Thread (%.*s)"
 msgstr	"Teema (%.*s)"
 
-#: src/lang.c:755
+#: src/lang.c:674
 msgid	"Enter wildcard subscribe pattern> "
 msgstr	"Sisestage tellimise muster> "
 
-#: src/lang.c:756
+#: src/lang.c:675
 #, c-format
 msgid	"subscribed to %d groups"
 msgstr	"%d gruppi on tellitud"
 
-#: src/lang.c:757
+#: src/lang.c:676
 #, c-format
 msgid	"Subscribed to %s"
 msgstr	"%s on tellitud"
 
-#: src/lang.c:758
+#: src/lang.c:677
 msgid	"Subscribing... "
 msgstr	"Tellin... "
 
-#: src/lang.c:759
+#: src/lang.c:678
 msgid	"Repost or supersede article(s) [%%.*s]? (%s/%s/%s): "
 msgstr	"Postitan uuesti või asendan artikli(d) [%%.*s]? (%s/%s/%s): "
 
-#: src/lang.c:760
+#: src/lang.c:679
 #, c-format
 msgid	"Supersede article(s) to group(s) [%s]> "
 msgstr	"Asendan artikli(d) gruppides [%s]> "
 
-#: src/lang.c:761
+#: src/lang.c:680
 msgid	"Superseding article ..."
 msgstr	"Asendan artikli ..."
 
-#: src/lang.c:762
+#: src/lang.c:681
 #, c-format
 msgid	"\n"
 	"Stopped. Type 'fg' to restart %s\n"
 msgstr	"\n"
 	"Peatatud. %s uuesti käivitamiseks kirjutage palun 'fg'\n"
 
-#: src/lang.c:763
+#: src/lang.c:683
+#, c-format
+msgid	"%d days"
+msgstr	"%d päeva"
+
+#: src/lang.c:684
 msgid	"<TAB>"
 msgstr	"<TAB>"
 
-#: src/lang.c:764
+#: src/lang.c:685
 msgid	"Tagged article"
 msgstr	"Artikkel on märgitud"
 
-#: src/lang.c:765
+#: src/lang.c:686
 msgid	"Tagged thread"
 msgstr	"Teema on märgitud"
 
-#: src/lang.c:768
-msgid	"# For color-adjust use the following numbers\n"
-	"#  0-black       1-red         2-green        3-brown\n"
-	"#  4-blue        5-pink        6-cyan         7-white\n"
-	"# These are *only* for foreground:\n"
-	"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
-	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
-	"# A '-1' is interpreted as default (foreground normally is white, and\n"
-	"# background black)\n"
-	"\n"
-msgstr	"# Värvide seadmiseks kasutage järgnevaid koode\n"
-	"#  0-must        1-punane      2-roheline     3-pruun\n"
-	"#  4-sinine      5-roosa       6-lilla        7-valge\n"
-	"# Need on *ainult* esiplaani tarvis:\n"
-	"#  8-hall         9-helepunane 10-heleroheline 11-kollane\n"
-	"# 12-helesinine  13-heleroosa  14-helelilla    15-helevalge\n"
-	"# '-1' interpreteeritakse vaikeväärtusena (esiplaan on tavaliselt valge,\n"
-	"# taust must)\n"
-	"\n"
-
-#: src/lang.c:778
+#: src/lang.c:687
 msgid	"# Default action/prompt strings\n"
 msgstr	"# Vaikimisi aktsioonide/viipade sõned\n"
 
-#: src/lang.c:779
+#: src/lang.c:688
 msgid	"# Defaults for quick (1 key) kill & auto-selection filters\n"
 	"# header=NUM  0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n"
 	"#             5=Message-ID: & last References: entry only\n"
@@ -2930,849 +2826,948 @@ msgstr	"# Vaikeväärtused kiire (1 võtme)
 	"# case=ON/OFF    ON=filter on tõstutundlik OFF=tõstutundetu\n"
 	"# expire=ON/OFF  ON=kehtivusaeg default_filter_days OFF=ei aegu\n"
 
-#: src/lang.c:794
+#: src/lang.c:701
 msgid	"# If ON use print current subject or newsgroup description in the last line\n"
 msgstr	"# Kui on ON, trüki teema või grupikirjeldus viimasele reale\n"
 
-#: src/lang.c:795
+#: src/lang.c:702
 msgid	"# Host & time info used for detecting new groups (don't touch)\n"
 msgstr	"# Masin & aeg - kasutatakse uute gruppide leidmiseks (mitte muuta)\n"
 
-#: src/lang.c:796
-msgid	"Enter wildcard unsubscribe pattern> "
-msgstr	"Sisestage loobumise muster> "
+#: src/lang.c:703
+msgid	"There is no news\n"
+msgstr	"Uudiseid pole\n"
 
-#: src/lang.c:797
-#, c-format
-msgid	"View '%s' (%s/%s)?"
-msgstr	"Vaatan '%s' (%s/%s)?"
+#: src/lang.c:704
+msgid	"Thread"
+msgstr	"Teema"
 
-#.
-#. * Special value used to override option-list behavior
-#.
-#: src/lang.c:802 src/lang.c:866
-msgid	"Default"
-msgstr	"Vaikimisi"
+#: src/lang.c:705
+msgid	"Thread Level Commands"
+msgstr	"Teemataseme käsud"
 
-#: src/lang.c:814 src/lang.c:839 src/lang.c:855 src/refs.c:266
-msgid	"None"
-msgstr	"Pole"
+#: src/lang.c:706
+msgid	"Thread deselected"
+msgstr	"Teema pole valitud"
 
-#: src/lang.c:815
-msgid	"Subject"
-msgstr	"Teema"
+#: src/lang.c:707
+msgid	"Thread selected"
+msgstr	"Teema on valitud"
 
-#: src/lang.c:816
-msgid	"References"
-msgstr	"Viited"
+#: src/lang.c:708
+msgid	"Thread range"
+msgstr	"Teemade vahemik"
 
-#: src/lang.c:817
-msgid	"Both Subject and References"
-msgstr	"Nii teema kui viited"
+#: src/lang.c:709
+#, c-format
+msgid	"%sThread %4s of %4s"
+msgstr	"%sTeema %4s : %4s"
 
-#: src/lang.c:818
-msgid	"Multipart Subject"
-msgstr	"Mitmeosaliste teema"
+#: src/lang.c:710
+msgid	"Threading articles..."
+msgstr	"Järjestan artiklid teemade kaupa..."
 
-#: src/lang.c:830 src/lang.c:941
-msgid	"No"
-msgstr	"Ei"
+#: src/lang.c:711
+#, c-format
+msgid	"Toggled word highlighting %s"
+msgstr	"Sõnade esiletõstmine lülitatud %s"
 
-#: src/lang.c:831 src/lang.c:943
-msgid	"Yes"
-msgstr	"Jah"
+#: src/lang.c:712
+msgid	"Toggled rot13 encoding"
+msgstr	"Lülitatud rot13 kodeerimine"
 
-#: src/lang.c:832
-msgid	"Hide All"
-msgstr	"Peida kõik"
+#: src/lang.c:713
+#, c-format
+msgid	"Toggled german TeX encoding %s"
+msgstr	"Lülitatud saksa TeX kodeering %s"
 
-#: src/lang.c:840
-msgid	"Address"
-msgstr	"Aadress"
+#: src/lang.c:714
+#, c-format
+msgid	"Toggled tab-width to %d"
+msgstr	"Lülitatud tab-width väärtus %d"
 
-#: src/lang.c:841
-msgid	"Full Name"
-msgstr	"Täisnimi"
+#: src/lang.c:715
+#, c-format
+msgid	"%d Trying to dotlock %s"
+msgstr	"%d Üritan punkt-lukustada %s"
 
-#: src/lang.c:842
-msgid	"Address and Name"
-msgstr	"Aadress ja nimi"
+#: src/lang.c:716
+#, c-format
+msgid	"%d Trying to lock %s"
+msgstr	"%d Üritan lukustada %s"
 
-#: src/lang.c:849
-msgid	"Max"
-msgstr	"Maksimum"
+#: src/lang.c:717
+msgid	"           h=help\n"
+msgstr	"           h=appi\n"
 
-#: src/lang.c:850
-msgid	"Sum"
-msgstr	"Summa"
+#: src/lang.c:719
+msgid	"Unlimited"
+msgstr	"Piiramata"
 
-#: src/lang.c:851
-msgid	"Average"
-msgstr	"Keskmine"
+#: src/lang.c:720
+msgid	"Enter wildcard unsubscribe pattern> "
+msgstr	"Sisestage loobumise muster> "
 
-#: src/lang.c:856
-msgid	"Lines"
-msgstr	"Read"
+#: src/lang.c:721
+#, c-format
+msgid	"Error decoding %s : %s"
+msgstr	"Viga %s dekodeerimisel: %s"
 
-#: src/lang.c:857
-msgid	"Score"
-msgstr	"Kaal"
+#: src/lang.c:722
+msgid	"No end."
+msgstr	"Lõpp puudub."
 
-#: src/lang.c:858
-msgid	"Lines & Score"
-msgstr	"Read & kaal"
+#: src/lang.c:723
+#, c-format
+msgid	"%s successfully decoded."
+msgstr	"%s on edukalt dekodeeritud."
 
-#: src/lang.c:867
-msgid	"Black"
-msgstr	"Must"
+#: src/lang.c:724
+#, c-format
+msgid	"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
+	"\n"
+msgstr	"%*s[-- %s/%s, %suuenkodeeritud fail, %d rida, nimi: %s --]\n"
+	"\n"
 
-#: src/lang.c:868
-msgid	"Red"
-msgstr	"Punane"
+#: src/lang.c:725
+msgid	"unread "
+msgstr	"lugemata "
 
-#: src/lang.c:869
-msgid	"Green"
-msgstr	"Roheline"
+#: src/lang.c:726
+#, c-format
+msgid	"unsubscribed from %d groups"
+msgstr	"loobunud %d grupist"
 
-#: src/lang.c:870
-msgid	"Brown"
-msgstr	"Pruun"
+#: src/lang.c:727
+#, c-format
+msgid	"Unsubscribed from %s"
+msgstr	"Loobunud grupist %s"
 
-#: src/lang.c:871
-msgid	"Blue"
-msgstr	"Sinine"
+#: src/lang.c:728
+msgid	"Unsubscribing... "
+msgstr	"Loobun gruppidest... "
 
-#: src/lang.c:872
-msgid	"Pink"
-msgstr	"Roosa"
+#: src/lang.c:729
+msgid	"Untagged article"
+msgstr	"Märkimata artikkel"
 
-#: src/lang.c:873
-msgid	"Cyan"
-msgstr	"Lilla"
+#: src/lang.c:730
+msgid	"Untagged thread"
+msgstr	"Märkimata teema"
 
-#: src/lang.c:874
-msgid	"White"
-msgstr	"valge"
+#: src/lang.c:731
+msgid	"Unthreading articles..."
+msgstr	"Tükeldan teemad..."
 
-#: src/lang.c:875
-msgid	"Gray"
-msgstr	"Hall"
+#: src/lang.c:732
+msgid	"Updated"
+msgstr	"Uuendatud"
 
-#: src/lang.c:876
-msgid	"Light Red"
-msgstr	"Helepunane"
+#: src/lang.c:733
+msgid	"Updating"
+msgstr	"Uuendan"
 
-#: src/lang.c:877
-msgid	"Light Green"
-msgstr	"Heleroheline"
+#: src/lang.c:734
+#, c-format
+msgid	"Opening %s\n"
+msgstr	"Proovin %s\n"
 
-#: src/lang.c:878
-msgid	"Yellow"
-msgstr	"Kollane"
+#: src/lang.c:735
+msgid	"No more URL's in this article"
+msgstr	"Selles artiklis pole rohkem URL'e"
 
-#: src/lang.c:879
-msgid	"Light Blue"
-msgstr	"Helesinine"
+#: src/lang.c:736
+msgid	"Use MIME display program for this message?"
+msgstr	"Kasutan selle teate lugemiseks MIME näitamise programmi?"
 
-#: src/lang.c:880
-msgid	"Light Pink"
-msgstr	"Heleroosa"
+#: src/lang.c:737
+msgid	"  -c       mark all news as read in subscribed newsgroups (batch mode)"
+msgstr	"  -c       märgi tellitud gruppides kõik artiklid loetuks (pakettmood)"
 
-#: src/lang.c:881
-msgid	"Light Cyan"
-msgstr	"Helelilla"
+#: src/lang.c:738
+msgid	"  -Z       return status indicating if any unread news (batch mode)"
+msgstr	"  -Z       tagasta väärtus, mis näitab, kas on lugemata artikleid (pakettmood)"
 
-#: src/lang.c:882
-msgid	"Light White"
-msgstr	"Helevalge"
+#: src/lang.c:739
+msgid	"  -q       don't check for new newsgroups"
+msgstr	"  -q       ära otsi uusi gruppe"
 
-#: src/lang.c:890 src/lang.c:947 src/lang.c:961
-msgid	"Nothing"
-msgstr	"Ei kasuta"
+#: src/lang.c:740
+msgid	"  -X       don't save any files on quit"
+msgstr	"  -X       töö lõpetamisel ära salvesta ühtegi faili"
 
-#: src/lang.c:891
-msgid	"Mark"
-msgstr	"Märk"
+#: src/lang.c:741
+msgid	"  -d       don't show newsgroup descriptions"
+msgstr	"  -d       ära näita gruppide kirjeldusi"
 
-#: src/lang.c:892
-msgid	"Space"
-msgstr	"Tühik"
+#: src/lang.c:742
+msgid	"  -G limit get only limit articles/group"
+msgstr	"  -G num   loe aunult num artiklit/gruppi"
 
-#: src/lang.c:899
-msgid	"Normal"
-msgstr	"Tavaline"
+#: src/lang.c:743
+#, c-format
+msgid	"  -H       help information about %s"
+msgstr	"  -H       %s kasutamise abiinfo"
 
-#: src/lang.c:900
-msgid	"Best highlighting"
-msgstr	"Parim esiletõstmine"
+#: src/lang.c:744
+msgid	"  -h       this help message"
+msgstr	"  -h       see abitekst"
 
-#: src/lang.c:901
-msgid	"Underline"
-msgstr	"Allajoonitud"
+#: src/lang.c:745
+#, c-format
+msgid	"  -I dir   news index file directory [default=%s]"
+msgstr	"  -I kat   uudiste indeksfaili kataloog [vaikimisi=%s]"
 
-#: src/lang.c:902
-msgid	"Reverse video"
-msgstr	"Pööratud video"
+#: src/lang.c:746
+msgid	"  -u       update index files (batch mode)"
+msgstr	"  -u       värskenda indeksfaile (pakettmood)"
 
-#: src/lang.c:903
-msgid	"Blinking"
-msgstr	"Plinkiv"
+#: src/lang.c:747
+#, c-format
+msgid	"  -m dir   mailbox directory [default=%s]"
+msgstr	"  -m kat   kirjakaustade kataloog [vaikimisi=%s]"
 
-#: src/lang.c:904
-msgid	"Half bright"
-msgstr	"Poolhele"
+#: src/lang.c:748
+#, c-format
+msgid	"\n"
+	"Mail bug reports/comments to %s"
+msgstr	"\n"
+	"Saatke palun vea raport/kommentaarid aadressil %s"
 
-#: src/lang.c:905
-msgid	"Bold"
-msgstr	"Paks"
+#: src/lang.c:749
+msgid	"  -N       mail new news to your posts (batch mode)"
+msgstr	"  -N       saada uued vastused teie postitustele (pakettmood)"
 
-#: src/lang.c:910
-msgid	"none"
-msgstr	"pole"
+#: src/lang.c:750
+msgid	"  -M user  mail new news to specified user (batch mode)"
+msgstr	"  -M kasut saada uued artiklid näidatud kasutajale (pakettmood)"
 
-#: src/lang.c:911
-msgid	"commands"
-msgstr	"käsud"
+#: src/lang.c:751
+#, c-format
+msgid	"  -f file  subscribed to newsgroups file [default=%s]"
+msgstr	"  -f fail  tellitud gruppide fail [vaikimisi=%s]"
 
-#: src/lang.c:912
-msgid	"select"
-msgstr	"valik"
+#: src/lang.c:752
+msgid	"  -w       post an article and exit"
+msgstr	"  -w       postita artikkel ja lõpeta töö"
 
-#: src/lang.c:914
-msgid	"commands & quit"
-msgstr	"käsud & välju"
+#: src/lang.c:753
+msgid	"  -o       post all postponed articles and exit"
+msgstr	"  -o       postita kõik postitamisootel artiklid ja lõpeta töö"
 
-#: src/lang.c:915
-msgid	"commands & select"
-msgstr	"käsud & valik"
+#: src/lang.c:754
+msgid	"  -r       read news remotely from default NNTP server"
+msgstr	"  -r       loe artikleid kasutades vaikimisi NNTP serverit"
 
-#: src/lang.c:916
-msgid	"quit & select"
-msgstr	"välju & valik"
+#: src/lang.c:755
+msgid	"  -R       read news saved by -S option"
+msgstr	"  -R       loe artikleid, mis on salvestatud -S võtmega"
 
-#: src/lang.c:917
-msgid	"commands & quit & select"
-msgstr	"käsud & välju & valik"
+#: src/lang.c:756
+#, c-format
+msgid	"  -s dir   save news directory [default=%s]"
+msgstr	"  -s kat   artiklite salvestamise kataloog [vaikimisi=%s]"
 
-#: src/lang.c:942
-msgid	"Shell archive"
-msgstr	"Shelli arhiiv"
+#: src/lang.c:757
+msgid	"  -S       save new news for later reading (batch mode)"
+msgstr	"  -S       salvesta uued artiklid hilisemaks lugemiseks (pakettmood)"
 
-#: src/lang.c:948
-msgid	"Subject: (descending)"
-msgstr	"Subject: (kahanevalt)"
+#: src/lang.c:758
+msgid	"  -z       start if any unread news"
+msgstr	"  -z       alusta tööd, kui on lugemata uudiseid"
 
-#: src/lang.c:949
-msgid	"Subject: (ascending)"
-msgstr	"Subject: (kasvavalt)"
+#: src/lang.c:759
+#, c-format
+msgid	"A Usenet reader.\n"
+	"\n"
+	"Usage: %s [options] [newsgroup[,...]]"
+msgstr	"Usenet klient.\n"
+	"\n"
+	"Kasuta: %s [võtmed] [grupp[,...]]"
 
-#: src/lang.c:950
-msgid	"From: (descending)"
-msgstr	"From: (kahanevalt)"
+#: src/lang.c:760
+msgid	"  -v       verbose output for batch mode options"
+msgstr	"  -v       esita pakettmoodi käskudega detailsemat informatsiooni"
 
-#: src/lang.c:951
-msgid	"From: (ascending)"
-msgstr	"From: (kasvavalt)"
+#: src/lang.c:761
+msgid	"  -V       print version & date information"
+msgstr	"  -V       esita versiooni ja kuupäeva informatsioon"
 
-#: src/lang.c:952
-msgid	"Date: (descending)"
-msgstr	"Date: (kahanevalt)"
+#: src/lang.c:762
+#, c-format
+msgid	"%s only useful without batch mode operations\n"
+msgstr	"%s on kasutatav ainult pakettmoodi käskudeta\n"
 
-#: src/lang.c:953
-msgid	"Date: (ascending)"
-msgstr	"Date: (kasvavalt)"
+#: src/lang.c:763
+#, c-format
+msgid	"%s only useful for batch mode operations\n"
+msgstr	"%s on kasutatav ainult pakettmoodi käskudega\n"
 
-#: src/lang.c:954 src/lang.c:962
-msgid	"Score (descending)"
-msgstr	"Kaal (kahanevalt)"
+#: src/lang.c:765
+#, c-format
+msgid	"\n"
+	"%s%d out of range (0 - %d). Reset to 0"
+msgstr	"\n"
+	"%s%d piiridest väljas (0 - %d). Sean 0"
 
-#: src/lang.c:955 src/lang.c:963
-msgid	"Score (ascending)"
-msgstr	"Kaal (kasvavalt)"
+#: src/lang.c:766
+#, c-format
+msgid	"View '%s' (%s/%s)?"
+msgstr	"Vaatan '%s' (%s/%s)?"
 
-#: src/lang.c:956
-msgid	"Lines: (descending)"
-msgstr	"Lines: (kahanevalt)"
+#: src/lang.c:768
+#, c-format
+msgid	"\n"
+	"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
+	"%-100s\n"
+msgstr	"\n"
+	"Hoiatus: postitus ületab %d veergu. Esimene pikk rida on rida %d:\n"
+	"%-100s\n"
 
-#: src/lang.c:957
-msgid	"Lines: (ascending)"
-msgstr	"Lines: (kasvavalt)"
+#: src/lang.c:769
+msgid	"\n"
+	"Warning: article unchanged after editing\n"
+msgstr	"\n"
+	"Hoiatus: artiklit ei ole toimetamise käigus muudetud\n"
 
-#: src/lang.c:968
-msgid	"Always Keep"
-msgstr	"Hoia alati"
+#: src/lang.c:770
+msgid	"\n"
+	"Warning: \"Subject:\" contains only whitespaces.\n"
+msgstr	"\n"
+	"Hoiatus: \"Subject:\" real on ainult tühikud.\n"
 
-#: src/lang.c:969
-msgid	"Always Remove"
-msgstr	"Eemalda alati"
+#: src/lang.c:771
+msgid	"\n"
+	"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n"
+msgstr	"\n"
+	"Hoiatus: \"Subject:\" algab fraasiga \"Re: \", aga \"References:\" välju "
+	"pole.\n"
 
-#: src/lang.c:970
-msgid	"Mark with D on selection screen"
-msgstr	"Märgi valikuekraanil tähega D"
+#: src/lang.c:773
+msgid	"\n"
+	"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
+	"         with \"Re: \" and does not contain \"(was:\".\n"
+msgstr	"\n"
+	"Hoiatus: Artiklis on \"References:\" päis, aga \"Subject:\" ei alga fraasiga\n"
+	"         \"Re: \" ega sisalda \"(was:\".\n"
 
-#: src/lang.c:975
-msgid	"Kill only unread arts"
-msgstr	"Surma ainult lugemata artiklid"
+#: src/lang.c:776
+msgid	"Read carefully!\n"
+	"\n"
+	"  You are about to cancel an article seemingly written by you. This will "
+	"wipe\n"
+	"  the article from most  news servers  throughout the world,  but there is "
+	"no\n"
+	"  guarantee that it will work.\n"
+	"\n"
+	"This is the article you are about to cancel:\n"
+	"\n"
+msgstr	"Lugege hoolikalt!\n"
+	"\n"
+	"  Te asute kustutama artiklit, mis paistab olema teie poolt kirjutatud.\n"
+	"  Seega te eemaldate artikli paljudest uudiseserveritest  üle  maailma,\n"
+	"  kuid kustutamisel ei ole mingit garantiid.\n"
+	"\n"
+	"Siin on artikkel, mida te hakkate kustutama:\n"
+	"\n"
 
-#: src/lang.c:976
-msgid	"Kill all arts & show with K"
-msgstr	"Surma kõik artiklid & näita K tähega"
+#: src/lang.c:780
+msgid	"\n"
+	"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
+	"         quoted-printable) and an external inews program to submit your\n"
+	"         article. If a signature is appended by that inews program it will\n"
+	"         not be encoded properly.\n"
+msgstr	"\n"
+	"Hoiatus: Te kasutate keerukat kodeeringut (nagu base64 või quoted-printable)\n"
+	"         ja postitamiseks välist inews programmi.  Kui  see  inews  programm\n"
+	"         lisab artiklile signatuuri, siis on võimalik,  et seda ei kodeerita\n"
+	"         korrektselt.\n"
 
-#: src/lang.c:977
-msgid	"Kill all arts and never show"
-msgstr	"Surma kõik artiklid ja ära näita"
-
-#: src/lang.c:982
-msgid	"Nothing special"
-msgstr	"Ei midagi erilist"
-
-#: src/lang.c:983
-msgid	"Compress quotes"
-msgstr	"Tihenda tsitaadid"
-
-#: src/lang.c:984
-msgid	"Quote signatures"
-msgstr	"Tsiteeri allkirju"
-
-#: src/lang.c:985
-msgid	"Compress quotes, quote sigs"
-msgstr	"Tihenda tsitaadid, tsiteeri allkirju"
-
-#: src/lang.c:986
-msgid	"Quote empty lines"
-msgstr	"Tsiteeri tühje ridu"
+#: src/lang.c:785
+#, c-format
+msgid	"\n"
+	"\n"
+	"You are upgrading to tin %s from an earlier version.\n"
+	"Some values in your %s file have changed!\n"
+	"Read WHATSNEW, etc...\n"
+msgstr	"\n"
+	"\n"
+	"Te uuendate tini versioonile %s. Mõned\n"
+	"Väärtused failis %s on muutunud!\n"
+	"Palun lugege faile WHATSNEW, jne...\n"
 
-#: src/lang.c:987
-msgid	"Compress quotes, quote empty lines"
-msgstr	"Tihenda tsitaadid, tsiteeri tühje ridu"
+#: src/lang.c:787
+#, c-format
+msgid	"\n"
+	"\n"
+	"You are downgrading to tin %s from a more recent version!\n"
+	"Some values in your %s file may be ignored, others might have changed!\n"
+msgstr	"\n"
+	"\n"
+	"Te käivitate tin versioon %s, mis on vanem kui teie eelmises sessioonis\n"
+	"kasutatu!\n"
+	"Mõningaid väärtusi failis %s võidakse ignoreerida, mõningaid võidakse muuta!\n"
 
-#: src/lang.c:988
-msgid	"Quote sigs & empty lines"
-msgstr	"Tsiteeri allkirju ja tühje ridu"
+#: src/lang.c:790
+#, c-format
+msgid	"Warning: tin wrote fewer groups to your\n"
+	"\t%s\n"
+	"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
+	"this session this indicates an error and you should backup your %s\n"
+	"before you start tin once again!\n"
+msgstr	"Hoiatus: tin kirjutas vähem gruppe teie\n"
+	"\t%s\n"
+	"kui ta luges käivitamisel. Kui te ei loobunud sessiooni kestel %ld\n"
+	"grupist%s, tähendab see viga ja te peaksite varundama oma %s\n"
+	"enne, kui te tini uuesti käivitate!\n"
 
-#: src/lang.c:989
-msgid	"Comp. q., quote sigs & empty lines"
-msgstr	"Tihenda tsitaate, tsiteeri allkirju ja tühje ridu"
+#: src/lang.c:794
+#, c-format
+msgid	"\n"
+	"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
+msgstr	"\n"
+	"Hoiatus: Leidsin %d '-- \\n' rida, mis võib tekitada osades inimestes "
+	"segadust.\n"
 
-#: src/lang.c:1026
-msgid	"Print"
-msgstr	"Trüki"
+#: src/lang.c:795
+#, c-format
+msgid	"Warning: Only %d out of %d articles were saved"
+msgstr	"Hoiatus: Salvestati ainult %d artiklit %d artiklist"
 
-#: src/lang.c:1027
-msgid	"Printing..."
-msgstr	"Trükin..."
+#: src/lang.c:796
+#, c-format
+msgid	"\n"
+	"Warning: Your signature  is longer than %d lines.  Since signatures usually "
+	"do\n"
+	"         not  transport any  useful information,  they should be as  short "
+	"as\n"
+	"         possible.\n"
+msgstr	"\n"
+	"Hoiatus: Teie signatuur on pikem, kui %d rida. Kuna tavaliselt signatuurid "
+	"ei\n"
+	"         sisalda kasulikku informatsiooni, siis peaksid nad olema "
+	"võimalikult\n"
+	"         lühikesed.\n"
 
-#: src/lang.c:1032
+#: src/lang.c:800
 #, c-format
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=menüü, %s=postita, "
-	"%s=postitusootele: "
+msgid	"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
+msgstr	"Hoiatus: see aadress võib sisaldada rämpsposti lõksu. %s=jätkan, %s=katkestan?"
 
-#: src/lang.c:1033
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
-msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=saada [%%.*s]: "
+#: src/lang.c:801
+msgid	"\n"
+	"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
+msgstr	"\n"
+	"Hoiatus: Signatuuride alguses peaks olema '-- \\n', mitte '--\\n'.\n"
 
-#: src/lang.c:1034
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=postita, %s=postitusootele "
-	"[%%.*s]: "
+#: src/lang.c:802
+msgid	"Writing attributes file..."
+msgstr	"Kirjutan atribuutide faili..."
 
-#: src/lang.c:1036
+#: src/lang.c:804
 #, c-format
-msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=välju, %s=toimeta, %s=pgp, %s=menüü, %s=postita, %s=postitusootele: "
-
-#: src/lang.c:1037
-msgid	"%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
-msgstr	"%s=välju, %s=toimeta, %s=pgp, %s=saada [%%.*s]: "
-
-#: src/lang.c:1038
-msgid	"%s=quit, %s=edit, %s=pgp, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=välju, %s=toimeta, %s=pgp, %s=postita, %s=postitusootele [%%.*s]: "
+msgid	"%d Responses%s"
+msgstr	"%d Vastust%s"
 
-#: src/lang.c:1042
+#: src/lang.c:806
 #, c-format
-msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=menüü, %s=postita, %s=postitusootele: "
+msgid	"Added %d %s"
+msgstr	"Lisatud %d %s"
 
-#: src/lang.c:1043
-msgid	"%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
-msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=saada [%%.*s]: "
+#: src/lang.c:807
+msgid	"No unsubscribed groups to show"
+msgstr	"Tellimata gruppe pole"
 
-#: src/lang.c:1044
-msgid	"%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=postita, %s=postitusootele [%%.*s]: "
+#: src/lang.c:808
+msgid	"Showing subscribed to groups only"
+msgstr	"Näitan ainult tellitud gruppe"
 
-#: src/lang.c:1046
-#, c-format
-msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=postitusootele: "
+#: src/lang.c:809
+msgid	"Yes "
+msgstr	"Jah "
 
-#: src/lang.c:1047
-msgid	"%s=quit, %s=edit, %s=send [%%.*s]: "
-msgstr	"%s=välju, %s=toimeta, %s=saada [%%.*s]: "
+#: src/lang.c:810
+msgid	"    You have mail\n"
+msgstr	"    Teil on kiri\n"
 
-#: src/lang.c:1048
-msgid	"%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=välju, %s=toimeta, %s=postita, %s=postitusootele [%%.*s]: "
+#: src/lang.c:815
+#, c-format
+msgid	"\n"
+	"Warning: Posting is in %s and contains characters which are not\n"
+	"         in your selected MM_NETWORK_CHARSET: %s.\n"
+	"         These characters will be replaced by '?' if you post this\n"
+	"         article unchanged. To avoid garbling your article please either\n"
+	"         edit it and remove those characters or change the setting of\n"
+	"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
+	"         M)enu option.\n"
+msgstr	"\n"
+	"Hoiatus: Postitus on %s ja sisaldab sümboleid, mis puuduvad teie poolt\n"
+	"         valitud MM_NETWORK_CHARSET: %s.\n"
+	"         Kui te postitate selle artikli muutmata kujul, asendatakse\n"
+	"         need sümbolid sümboliga '?'. Et vältida sodi teie artiklis, palun\n"
+	"         seda kas muuta ja eemaldada need sümbolid või muuta seadet\n"
+	"         MM_NETWORK_CHARSET. Viimast saate teostada kasutades valikut "
+	"M)enüü.\n"
 
-#: src/lang.c:1052
+#: src/lang.c:826
 #, c-format
-msgid	" at %s"
-msgstr	" o: %s"
+msgid	"Redefined key %s '%s' -> '%s'\n"
+msgstr	"Klahvi %s uus definitsioon '%s' -> '%s'\n"
 
-#: src/lang.c:1053
-msgid	"There is no news\n"
-msgstr	"Uudiseid pole\n"
+#: src/lang.c:827
+msgid	"  -D       debug mode 1=NNTP 2=ALL"
+msgstr	"  -D       silumismood 1=NNTP 2=KÕIK"
 
-#: src/lang.c:1054
-msgid	"Thread"
-msgstr	"Teema"
+#: src/lang.c:831
+msgid	"Read carefully!\n"
+	"\n"
+	"  You are about to cancel an article seemingly not written by you.  This "
+	"will\n"
+	"  wipe the article from lots of news servers throughout the world;\n"
+	"  Usenet's majority  considers this  rather inappropriate,  to say the "
+	"least.\n"
+	"  Only press 'd'  if you are  absolutely positive  that you are ready to "
+	"take\n"
+	"  the rap.\n"
+	"\n"
+	"This is the article you are about to cancel:\n"
+	"\n"
+msgstr	"Lugege hoolikalt!\n"
+	"\n"
+	"  Te olete kustutamas artiklit, mida te ilmselt pole kirjutanud.  Seega\n"
+	"  eemaldatakse artikkle paljudest uudiseserveritest üle maailma. Useneti\n"
+	"  üldsus loeb sellist käitumist ebakohaseks.  Vajutage  'd' ainult siis,\n"
+	"  kui te olete täiesti veendunud selle sammu vajalikkuses.\n"
+	"\n"
+	"Siin on artikkel, mida te asute kustutama:\n"
+	"\n"
 
-#: src/lang.c:1055
-msgid	"Thread Level Commands"
-msgstr	"Teemataseme käsud"
+#: src/lang.c:840
+msgid	"toggle color"
+msgstr	"lülita värve"
 
-#: src/lang.c:1056
-msgid	"Thread deselected"
-msgstr	"Teema pole valitud"
+#: src/lang.c:841
+msgid	"# For color-adjust use the following numbers\n"
+	"#  0-black       1-red         2-green        3-brown\n"
+	"#  4-blue        5-pink        6-cyan         7-white\n"
+	"# These are *only* for foreground:\n"
+	"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
+	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
+	"# A '-1' is interpreted as default (foreground normally is white, and\n"
+	"# background black)\n"
+	"\n"
+msgstr	"# Värvide seadmiseks kasutage järgnevaid koode\n"
+	"#  0-must        1-punane      2-roheline     3-pruun\n"
+	"#  4-sinine      5-roosa       6-lilla        7-valge\n"
+	"# Need on *ainult* esiplaani tarvis:\n"
+	"#  8-hall         9-helepunane 10-heleroheline 11-kollane\n"
+	"# 12-helesinine  13-heleroosa  14-helelilla    15-helevalge\n"
+	"# '-1' interpreteeritakse vaikeväärtusena (esiplaan on tavaliselt valge,\n"
+	"# taust must)\n"
+	"\n"
 
-#: src/lang.c:1057
-msgid	"Thread selected"
-msgstr	"Teema on valitud"
+#: src/lang.c:849
+msgid	"  -a       toggle color flag"
+msgstr	"  -a       lülita värvide kasutamist"
 
-#: src/lang.c:1058
-msgid	"Thread range"
-msgstr	"Teemade vahemik"
+#: src/lang.c:853
+msgid	"\n"
+	"Error: Followup-To set to more than one newsgroup!\n"
+msgstr	"\n"
+	"Viga: Followup-To real on rohkem kui üks grupp!\n"
 
-#: src/lang.c:1059
+#: src/lang.c:854
 #, c-format
-msgid	"%sThread %4s of %4s"
-msgstr	"%sTeema %4s : %4s"
-
-#: src/lang.c:1060
-msgid	"Threading articles..."
-msgstr	"Järjestan artiklid teemade kaupa..."
+msgid	"\n"
+	"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
+msgstr	"\n"
+	"Viga: ristpostitus %d gruppi ja Followup-To rida puudub!\n"
 
-#: src/lang.c:1061
+#: src/lang.c:855
 #, c-format
-msgid	"Toggled word highlighting %s"
-msgstr	"Sõnade esiletõstmine lülitatud %s"
+msgid	"\n"
+	"Error: \"%s\" is not a valid newsgroup!\n"
+msgstr	"\n"
+	"Viga: \"%s\" ei ole lubatud grupp!\n"
 
-#: src/lang.c:1062
-msgid	"Toggled rot13 encoding"
-msgstr	"Lülitatud rot13 kodeerimine"
+#: src/lang.c:857
+msgid	"\n"
+	"Warning: Followup-To set to more than one newsgroup!\n"
+msgstr	"\n"
+	"Hoiatus: Followup-To on seatud rohkem, kui ühele grupile!\n"
 
-#: src/lang.c:1063
+#: src/lang.c:858
 #, c-format
-msgid	"Toggled german TeX encoding %s"
-msgstr	"Lülitatud saksa TeX kodeering %s"
+msgid	"\n"
+	"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
+msgstr	"\n"
+	"Hoiatus: ristpostitus %d uudisegruppi ja Followup-To rida puudub!\n"
 
-#: src/lang.c:1064
+#: src/lang.c:859
 #, c-format
-msgid	"Toggled tab-width to %d"
-msgstr	"Lülitatud tab-width väärtus %d"
+msgid	"\n"
+	"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
+msgstr	"\n"
+	"Hoiatus: \"%s\" puudub teie newsrc failist, see võib olla selles serveris "
+	"vigane!\n"
 
-#: src/lang.c:1065
+#: src/lang.c:860
 #, c-format
-msgid	"Trying %s"
-msgstr	"Proovin %s"
+msgid	"\n"
+	"Warning: \"%s\" is not a valid newsgroup at this site!\n"
+msgstr	"\n"
+	"Hoiatus: \"%s\" ei ole selles serveris kehtiv grupp!\n"
 
-#: src/lang.c:1066
+#: src/lang.c:864
 #, c-format
-msgid	"%d Trying to dotlock %s"
-msgstr	"%d Üritan punkt-lukustada %s"
+msgid	"%d files successfully written from %d articles. %d %s occurred."
+msgstr	"Edukalt kirjutatud %d faili %d artiklist. Esines %d viga%s."
 
-#: src/lang.c:1067
-#, c-format
-msgid	"%d Trying to lock %s"
-msgstr	"%d Üritan lukustada %s"
+#: src/lang.c:865
+msgid	"Missing parts."
+msgstr	"Osad puuduvad."
 
-#: src/lang.c:1068
-msgid	"           h=help\n"
-msgstr	"           h=appi\n"
+#: src/lang.c:866
+msgid	"No beginning."
+msgstr	"Algus puudub."
 
-#: src/lang.c:1069
-msgid	"unread "
-msgstr	"lugemata "
+#: src/lang.c:867
+msgid	"No data."
+msgstr	"Andmeid pole."
 
-#: src/lang.c:1070
-#, c-format
-msgid	"unsubscribed from %d groups"
-msgstr	"loobunud %d grupist"
+#: src/lang.c:868
+msgid	"Unknown error."
+msgstr	"Tundmatu viga."
 
-#: src/lang.c:1071
+#: src/lang.c:870
 #, c-format
-msgid	"Unsubscribed from %s"
-msgstr	"Loobunud grupist %s"
-
-#: src/lang.c:1072
-msgid	"Unsubscribing... "
-msgstr	"Loobun gruppidest... "
-
-#: src/lang.c:1073
-msgid	"Untagged article"
-msgstr	"Märkimata artikkel"
+msgid	"\tChecksum of %s (%ld %s)"
+msgstr	"\t%s kontrollsumma (%ld %s)"
 
-#: src/lang.c:1074
-msgid	"Untagged thread"
-msgstr	"Märkimata teema"
+#: src/lang.c:874
+msgid	"Reading mail active file... "
+msgstr	"Loen aktiivsete kirjade kausta... "
 
-#: src/lang.c:1075
-msgid	"Unthreading articles..."
-msgstr	"Tükeldan teemad..."
+#: src/lang.c:875
+msgid	"Reading mailgroups file... "
+msgstr	"Loen kirjagruppide faili... "
 
-#: src/lang.c:1076
-msgid	"Updated"
-msgstr	"Uuendatud"
+#: src/lang.c:879
+msgid	"perform PGP operations on article"
+msgstr	"kasuta artiklil PGP operatsioone"
 
-#: src/lang.c:1077
-msgid	"Updating"
-msgstr	"Uuendan"
+#: src/lang.c:880
+msgid	"Add key(s) to public keyring?"
+msgstr	"Lisan võtmed avalike võtmete hoidlasse?"
 
-#: src/lang.c:1078
+#: src/lang.c:881
 #, c-format
-msgid	"Opening %s\n"
-msgstr	"Proovin %s\n"
-
-#: src/lang.c:1079
-msgid	"No more URL's in this article"
-msgstr	"Selles artiklis pole rohkem URL'e"
-
-#: src/lang.c:1080
-msgid	"Use MIME display program for this message?"
-msgstr	"Kasutan selle teate lugemiseks MIME näitamise programmi?"
+msgid	"%s=encrypt, %s=sign, %s=both, %s=quit: "
+msgstr	"%s=krüpti, %s=allkirjasta, %s=mõlemad, %s=välju: "
 
-#: src/lang.c:1081
-msgid	"  -c       mark all news as read in subscribed newsgroups (batch mode)"
-msgstr	"  -c       märgi tellitud gruppides kõik artiklid loetuks (pakettmood)"
+#: src/lang.c:882
+#, c-format
+msgid	"%s=sign, %s=sign & include public key, %s=quit: "
+msgstr	"%s=allkirjasta, %s=allkirjasta & lisa avalik võti, %s=välju: "
 
-#: src/lang.c:1082
-msgid	"  -Z       return status indicating if any unread news (batch mode)"
-msgstr	"  -Z       tagasta väärtus, mis näitab, kas on lugemata artikleid (pakettmood)"
+#: src/lang.c:883
+#, c-format
+msgid	"PGP has not been set up (can't open %s)"
+msgstr	"PGP pole seadistatud (ei saa avada %s)"
 
-#: src/lang.c:1083
-msgid	"  -q       don't check for new newsgroups"
-msgstr	"  -q       ära otsi uusi gruppe"
+#: src/lang.c:884
+msgid	"Article not signed and no public keys found"
+msgstr	"Artikkel pole allkirjastatud ja avalikke võtmeid pole"
 
-#: src/lang.c:1084
-msgid	"  -X       don't save any files on quit"
-msgstr	"  -X       töö lõpetamisel ära salvesta ühtegi faili"
+#: src/lang.c:886
+#, c-format
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
+msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=menüü, %s=postita, "
+	"%s=postitusootele: "
 
-#: src/lang.c:1085
-msgid	"  -d       don't show newsgroup descriptions"
-msgstr	"  -d       ära näita gruppide kirjeldusi"
+#: src/lang.c:887
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
+msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=saada [%%.*s]: "
 
-#: src/lang.c:1086
-msgid	"  -G limit get only limit articles/group"
-msgstr	"  -G num   loe aunult num artiklit/gruppi"
+#: src/lang.c:888
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=pgp, %s=menüü, %s=postita, "
+	"%s=postitusootele [%%.*s]: "
 
-#: src/lang.c:1087
+#: src/lang.c:890
 #, c-format
-msgid	"  -H       help information about %s"
-msgstr	"  -H       %s kasutamise abiinfo"
+msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
+msgstr	"%s=välju, %s=toimeta, %s=pgp, %s=menüü, %s=postita, %s=postitusootele: "
 
-#: src/lang.c:1088
-msgid	"  -h       this help message"
-msgstr	"  -h       see abitekst"
+#: src/lang.c:891
+msgid	"%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
+msgstr	"%s=välju, %s=toimeta, %s=pgp, %s=saada [%%.*s]: "
+
+#: src/lang.c:892
+msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=välju, %s=toimeta, %s=pgp, %s=menüü, %s=postita, %s=postitusootele "
+	"[%%.*s]: "
 
-#: src/lang.c:1089
+#: src/lang.c:896
 #, c-format
-msgid	"  -I dir   news index file directory [default=%s]"
-msgstr	"  -I kat   uudiste indeksfaili kataloog [vaikimisi=%s]"
+msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
+msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=menüü, %s=postita, %s=postitusootele: "
 
-#: src/lang.c:1090
-msgid	"  -u       update index files (batch mode)"
-msgstr	"  -u       värskenda indeksfaile (pakettmood)"
+#: src/lang.c:897
+msgid	"%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
+msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=saada [%%.*s]: "
 
-#: src/lang.c:1091
-#, c-format
-msgid	"  -m dir   mailbox directory [default=%s]"
-msgstr	"  -m kat   kirjakaustade kataloog [vaikimisi=%s]"
+#: src/lang.c:898
+msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=menüü, %s=postita, %s=postitusootele "
+	"[%%.*s]: "
 
-#: src/lang.c:1092
+#: src/lang.c:900
 #, c-format
-msgid	"\n"
-	"Mail bug reports/comments to %s"
-msgstr	"\n"
-	"Saatke palun vea raport/kommentaarid aadressil %s"
+msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
+msgstr	"%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=postitusootele: "
 
-#: src/lang.c:1093
-msgid	"  -N       mail new news to your posts (batch mode)"
-msgstr	"  -N       saada uued vastused teie postitustele (pakettmood)"
+#: src/lang.c:901
+msgid	"%s=quit, %s=edit, %s=send [%%.*s]: "
+msgstr	"%s=välju, %s=toimeta, %s=saada [%%.*s]: "
 
-#: src/lang.c:1094
-msgid	"  -M user  mail new news to specified user (batch mode)"
-msgstr	"  -M kasut saada uued artiklid näidatud kasutajale (pakettmood)"
+#: src/lang.c:902
+msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=postitusootele [%%.*s]: "
 
-#: src/lang.c:1095
+#: src/lang.c:908
 #, c-format
-msgid	"  -f file  subscribed to newsgroups file [default=%s]"
-msgstr	"  -f fail  tellitud gruppide fail [vaikimisi=%s]"
+msgid	"Environment variable %s not found. Set and retry..."
+msgstr	"Keskkonnamuutujat %s pole. Looge ja proovige uuesti..."
 
-#: src/lang.c:1096
-msgid	"  -w       post an article and exit"
-msgstr	"  -w       postita artikkel ja lõpeta töö"
+#: src/lang.c:909
+msgid	"  -B       BBS mode. File operations limited to home directories."
+msgstr	"  -B       BBS mood. Failioperatsioonid on piiratud kodukataloogiga."
 
-#: src/lang.c:1097
-msgid	"  -o       post all postponed articles and exit"
-msgstr	"  -o       postita kõik postitamisootel artiklid ja lõpeta töö"
+# TRANSLATION MISSING
+#: src/lang.c:917
+msgid	"Try cache_overview_files to speed up things.\n"
+msgstr	""
 
-#: src/lang.c:1098
-msgid	"  -r       read news remotely from default NNTP server"
-msgstr	"  -r       loe artikleid kasutades vaikimisi NNTP serverit"
+#: src/lang.c:918
+msgid	"Tin will use local index files instead.\n"
+msgstr	"Tin kasutab lokaalseid indeksfaile.\n"
 
-#: src/lang.c:1099
-msgid	"  -R       read news saved by -S option"
-msgstr	"  -R       loe artikleid, mis on salvestatud -S võtmega"
+#: src/lang.c:919
+msgid	"Cannot find NNTP server name"
+msgstr	"Ei leia NNTP serveri nime"
 
-#: src/lang.c:1100
+#: src/lang.c:920
 #, c-format
-msgid	"  -s dir   save news directory [default=%s]"
-msgstr	"  -s kat   artiklite salvestamise kataloog [vaikimisi=%s]"
+msgid	"Connecting to %s:%d..."
+msgstr	"Loon ühendust serveriga %s:%d..."
 
-#: src/lang.c:1101
-msgid	"  -S       save new news for later reading (batch mode)"
-msgstr	"  -S       salvesta uued artiklid hilisemaks lugemiseks (pakettmood)"
+#: src/lang.c:921
+msgid	"Disconnecting from server...\n"
+msgstr	"Lõpetan ühenduse...\n"
 
-#: src/lang.c:1102
-msgid	"  -z       start if any unread news"
-msgstr	"  -z       alusta tööd, kui on lugemata uudiseid"
+#: src/lang.c:922
+#, c-format
+msgid	"Wrong newsgroup name in response of GROUP command, %s for %s"
+msgstr	"Vigane vastus GROUP käsule, %s grupile %s"
 
-#: src/lang.c:1103
+#: src/lang.c:923
 #, c-format
-msgid	"A Usenet reader.\n"
-	"\n"
-	"Usage: %s [options] [newsgroup[,...]]"
-msgstr	"Usenet klient.\n"
-	"\n"
-	"Kasuta: %s [võtmed] [grupp[,...]]"
+msgid	"Failed to connect to NNTP server %s. Exiting..."
+msgstr	"NNTP serveriga %s ühenduse loomine ebaõnnestus. Lõpetan..."
 
-#: src/lang.c:1105
-msgid	"  -a       toggle color flag"
-msgstr	"  -a       lülita värvide kasutamist"
+#: src/lang.c:924 src/nntplib.c:975
+msgid	"205  Closing connection"
+msgstr	"205  Sulen ühendust"
 
-#: src/lang.c:1107
-msgid	"  -v       verbose output for batch mode options"
-msgstr	"  -v       esita pakettmoodi käskudega detailsemat informatsiooni"
+#: src/lang.c:925
+msgid	"Your server does not support the NNTP XOVER or OVER command.\n"
+msgstr	"Teie server ei toeta NNTP XOVER või OVER käsku.\n"
 
-#: src/lang.c:1108
-msgid	"  -V       print version & date information"
-msgstr	"  -V       esita versiooni ja kuupäeva informatsioon"
+#: src/lang.c:926
+msgid	"Connection to news server has timed out. Reconnect?"
+msgstr	"Ühendus uudisegruppide serveriga aegus. ühendun uuesti?"
 
-#: src/lang.c:1109
+#: src/lang.c:927
 #, c-format
-msgid	"%s only useful without batch mode operations\n"
-msgstr	"%s on kasutatav ainult pakettmoodi käskudeta\n"
+msgid	"Put the server name in the file %s,\n"
+	"or set the environment variable NNTPSERVER"
+msgstr	"Kirjutage serveri nimi faili %s,\n"
+	"või seadke keskonnamuutuja NNTPSERVER"
 
-#: src/lang.c:1110
-#, c-format
-msgid	"%s only useful for batch mode operations\n"
-msgstr	"%s on kasutatav ainult pakettmoodi käskudega\n"
+#: src/lang.c:928
+msgid	"  -A       force authentication on connect"
+msgstr	"  -A       sunni ühenduse loomisel autentima"
 
-#: src/lang.c:1111
+#: src/lang.c:929
 #, c-format
-msgid	"\n"
-	"%s%d out of range (0 - %d). Reset to 0"
-msgstr	"\n"
-	"%s%d piiridest väljas (0 - %d). Sean 0"
+msgid	"  -g serv  read news from NNTP server serv [default=%s]"
+msgstr	"  -g serv  loe uudiseid NNTP serverist serv [vaikimisi=%s]"
 
-#: src/lang.c:1112
+#: src/lang.c:930
 #, c-format
-msgid	"\n"
-	"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
-	"%-100s\n"
-msgstr	"\n"
-	"Hoiatus: postitus ületab %d veergu. Esimene pikk rida on rida %d:\n"
-	"%-100s\n"
+msgid	"  -p port  use port as NNTP port [default=%d]"
+msgstr	"  -p port  kasuta NNTP porti [vaikimisi=%d]"
 
-#: src/lang.c:1113
-msgid	"\n"
-	"Warning: article unchanged after editing\n"
-msgstr	"\n"
-	"Hoiatus: artiklit ei ole toimetamise käigus muudetud\n"
+#: src/lang.c:931
+msgid	"  -Q       quick start. Same as -nqd"
+msgstr	"  -Q       kiirstart. Sama kui -nqd"
 
-#: src/lang.c:1114
+#: src/lang.c:932
+msgid	"  -l       use only LIST instead of GROUP (-n) command"
+msgstr	"  -l       kasuta LIST käsku GROUP (-n) käsu asemel"
+
+#: src/lang.c:933
+msgid	"  -n       only read subscribed .newsrc groups from NNTP server"
+msgstr	"  -n       loe NNTP serverist ainult tellitud .newsrc grupid"
+
+#: src/lang.c:935
+#, c-format
+msgid	"%s/tcp: Unknown service.\n"
+msgstr	"%s/tcp: Tundmatu teenus.\n"
+
+#: src/lang.c:938
 msgid	"\n"
-	"Warning: \"Subject:\" contains only whitespaces.\n"
+	"socket or connect problem\n"
 msgstr	"\n"
-	"Hoiatus: \"Subject:\" real on ainult tühikud.\n"
+	"Probleem pistikuga või ühendusega\n"
 
-#: src/lang.c:1116
+#: src/lang.c:940
 #, c-format
 msgid	"\n"
-	"Warning: Posting is in %s and contains characters which are not\n"
-	"         in your selected MM_NETWORK_CHARSET: %s.\n"
-	"         These characters will be replaced by '?' if you post this\n"
-	"         article unchanged. To avoid garbling your article please either\n"
-	"         edit it and remove those characters or change the setting of\n"
-	"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
-	"         M)enu option.\n"
+	"Connection to %s: "
 msgstr	"\n"
-	"Hoiatus: Postitus on %s ja sisaldab sümboleid, mis puuduvad teie poolt \n"
-	"         valitud MM_NETWORK_CHARSET: %s.\n"
-	"         Kui te postitate selle artikli muutmata kujul, asendatakse\n"
-	"         need sümbolid sümboliga '?'. Et vältida sodi teie artiklis, palun\n"
-	"         seda kas muuta ja eemaldada need sümbolid või muuta seadet\n"
-	"         MM_NETWORK_CHARSET. Viimast saate teostada kasutades valikut "
-	"M)enüü.\n"
-
-#: src/lang.c:1125
-msgid	"\n"
-	"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n"
-msgstr	"\n"
-	"Hoiatus: \"Subject:\" algab fraasiga \"Re: \", aga \"References:\" välju "
-	"pole.\n"
+	"Loon ühendust serveriga %s: "
 
-#: src/lang.c:1127
-msgid	"\n"
-	"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
-	"         with \"Re: \" and does not contain \"(was:\".\n"
-msgstr	"\n"
-	"Hoiatus: Artiklis on \"References:\" päis, aga \"Subject:\" ei alga fraasiga\n"
-	"         \"Re: \" ega sisalda \"(was:\".\n"
+#: src/lang.c:941
+msgid	"Giving up...\n"
+msgstr	"Annan alla...\n"
 
-#: src/lang.c:1130
-msgid	"Read carefully!\n"
-	"\n"
-	"  You are about to cancel an article seemingly written by you. This will "
-	"wipe\n"
-	"  the article from most  news servers  throughout the world,  but there is "
-	"no\n"
-	"  guarantee that it will work.\n"
-	"\n"
-	"This is the article you are about to cancel:\n"
-	"\n"
-msgstr	"Lugege hoolikalt!\n"
-	"\n"
-	"  Te asute kustutama artiklit, mis paistab olema teie poolt kirjutatud.\n"
-	"  Seega te eemaldate artikli paljudest uudiseserveritest  üle  maailma,\n"
-	"  kuid kustutamisel ei ole mingit garantiid.\n"
-	"\n"
-	"Siin on artikkel, mida te hakkate kustutama:\n"
-	"\n"
+#: src/lang.c:944
+msgid	"Your server does not have Xref: in its XOVER information.\n"
+	"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
+msgstr	"Teie server ei paku Xref: päiserida XOVER informatsioonis.\n"
+	"Tin üritab kasutada XHDR XREF selle asemel (võib olla mõnevõrra "
+	"aeganõudvam).\n"
 
-#: src/lang.c:1134
-msgid	"\n"
-	"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
-	"         quoted-printable) and an external inews program to submit your\n"
-	"         article. If a signature is appended by that inews program it will\n"
-	"         not be encoded properly.\n"
-msgstr	"\n"
-	"Hoiatus: Te kasutate keerukat kodeeringut (nagu base64 või quoted-printable)\n"
-	"         ja postitamiseks välist inews programmi.  Kui  see  inews  programm\n"
-	"         lisab artiklile signatuuri, siis on võimalik,  et seda ei kodeerita\n"
-	"         korrektselt.\n"
+#: src/lang.c:947
+msgid	"Your server does not have Xref: in its XOVER information.\n"
+msgstr	"Teie server ei paku Xref: päiserida XOVER informatsioonis.\n"
 
-#: src/lang.c:1141
+#: src/lang.c:950
 #, c-format
-msgid	"\n"
-	"Warning: The \"%s:\" line is continued in the next line.\n"
-	"         This is a very new feature and may not be accepted by all servers.\n"
-	"         To avoid trouble please write all newsgroups into a single line.\n"
-msgstr	"\n"
-	"Viga: Rida \"%s\" jätkub järgneval real.\n"
-	"      See on uus omadus ja kõik serverid ei pruugi seda toetada.\n"
-	"      Probleemide vältimiseks, kirjutage palun kõik grupid ühele reale.\n"
+msgid	"Can't open %s. Try %s -r to read news via NNTP.\n"
+msgstr	"%s ei saa avada. Proovige %s -r, et lugeda uudiseid üle NNTP.\n"
 
-#: src/lang.c:1145
-#, c-format
-msgid	"\n"
-	"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
-msgstr	"\n"
-	"Hoiatus: Rida \"%s:\" sisaldab tühikuid, mis TULEKS eemaldada.\n"
+#: src/lang.c:953
+msgid	"  -Q       quick start. Same as -qd"
+msgstr	"  -Q       kiirstart. Sama kui -qd"
 
-#: src/lang.c:1149
-#, c-format
-msgid	"\n"
-	"\n"
-	"You are upgrading to tin %s from an earlier version.\n"
-	"Some values in your %s file have changed!\n"
-	"Read WHATSNEW, etc...\n"
-msgstr	"\n"
-	"\n"
-	"Te uuendate tini versioonile %s. Mõned\n"
-	"Väärtused failis %s on muutunud!\n"
-	"Palun lugege faile WHATSNEW, jne...\n"
+#: src/lang.c:954
+msgid	"  -l       read only active file instead of scanning spool (-n) command"
+msgstr	"  -l       loe pooli skaneerimise (-n) asemel ainult faili active"
+
+#: src/lang.c:955
+msgid	"  -n       only read subscribed .newsrc groups from spool"
+msgstr	"  -n       loe poolist ainult tellitud .newsrc gruppe"
+
+# TRANSLATION MISSING
+#: src/lang.c:956
+msgid	"Your server does not have Xref: in its NOV-files.\n"
+msgstr	""
+
+#: src/lang.c:960
+msgid	"Posting using external inews failed. Use built in inews instead?"
+msgstr	"Välise inews programmiga postitamine ebaõnnestus. Proovin sisemist inewsi?"
 
-#: src/lang.c:1152
+#: src/lang.c:961
+msgid	"It worked! Should I always use my built in inews from now on?"
+msgstr	"See töötas! Kas kasutan nüüd alati sisemist inews programmi?"
+
+#: src/lang.c:969
 #, c-format
-msgid	"\n"
-	"\n"
-	"You are downgrading to tin %s from a more recent version!\n"
-	"Some values in your %s file may be ignored, others might have changed!\n"
-msgstr	"\n"
-	"\n"
-	"Te käivitate tin versioon %s, mis on vanem kui teie eelmises sessioonis\n"
-	"kasutatu!\n"
-	"Mõningaid väärtusi failis %s võidakse ignoreerida, mõningaid võidakse muuta!\n"
+msgid	"%d %s printed"
+msgstr	"%d %s trükitud"
+
+#: src/lang.c:970
+msgid	"output article/thread/hot/pattern/tagged articles to printer"
+msgstr	"saada artikkel/teema/kuum/muster/märgitud trükkalile"
+
+#: src/lang.c:971
+msgid	"Print"
+msgstr	"Trüki"
+
+#: src/lang.c:972
+msgid	"Printing..."
+msgstr	"Trükin..."
+
+#: src/lang.c:976
+msgid	"pipe article/thread/hot/pattern/tagged articles into command"
+msgstr	"saada artikkel/teema/kuum/muster/märgitud toruga käsule"
 
-#: src/lang.c:1157
+#: src/lang.c:977
+msgid	"No command"
+msgstr	"Käsku pole"
+
+#: src/lang.c:978
+msgid	"Pipe"
+msgstr	"Toru"
+
+#: src/lang.c:979
 #, c-format
-msgid	"Warning: tin wrote fewer groups to your\n"
-	"\t%s\n"
-	"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
-	"this session this indicates an error and you should backup your %s\n"
-	"before you start tin once again!\n"
-msgstr	"Hoiatus: tin kirjutas vähem gruppe teie\n"
-	"\t%s\n"
-	"kui ta luges käivitamisel. Kui te ei loobunud sessiooni kestel %ld\n"
-	"grupist%s, tähendab see viga ja te peaksite varundama oma %s\n"
-	"enne, kui te tini uuesti käivitate!\n"
+msgid	"Pipe to command [%.*s]> "
+msgstr	"Toru käsku [%.*s]> "
 
-#: src/lang.c:1163
-msgid	"Read carefully!\n"
-	"\n"
-	"  You are about to cancel an article seemingly not written by you.  This "
-	"will\n"
-	"  wipe the article from lots of news servers throughout the world;\n"
-	"  Usenet's majority  considers this  rather inappropriate,  to say the "
-	"least.\n"
-	"  Only press 'd'  if you are  absolutely positive  that you are ready to "
-	"take\n"
-	"  the rap.\n"
-	"\n"
-	"This is the article you are about to cancel:\n"
-	"\n"
-msgstr	"Lugege hoolikalt!\n"
-	"\n"
-	"  Te olete kustutamas artiklit, mida te ilmselt pole kirjutanud.  Seega\n"
-	"  eemaldatakse artikkle paljudest uudiseserveritest üle maailma. Useneti\n"
-	"  üldsus loeb sellist käitumist ebakohaseks.  Vajutage  'd' ainult siis,\n"
-	"  kui te olete täiesti veendunud selle sammu vajalikkuses.\n"
-	"\n"
-	"Siin on artikkel, mida te asute kustutama:\n"
-	"\n"
+#: src/lang.c:980
+msgid	"Piping..."
+msgstr	"Saadan torusse..."
+
+#: src/lang.c:982
+msgid	"Piping not enabled."
+msgstr	"Toru kasutamine pole lubatud."
 
-#: src/lang.c:1172
+#: src/lang.c:986
+#, c-format
 msgid	"\n"
-	"Warning: Followup-To set to more than one newsgroup!\n"
+	"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
+	"       The only allowable  space is the one  separating the colon (:)\n"
+	"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
+	"       newsgroup names.\n"
 msgstr	"\n"
-	"Hoiatus: Followup-To on seatud rohkem, kui ühele grupile!\n"
+	"Viga: Real \"%s:\" on tühikud, mis tuleb sealt eemaldada. Ainuke lubatud\n"
+	"      tühik on see,  mis eraldab koolonit (:)  teistest komponentidest\n"
+	"      real. Gruppide eraldamiseks kasutage palun koma (,).\n"
 
-#: src/lang.c:1173
+#: src/lang.c:991
 #, c-format
 msgid	"\n"
-	"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
+	"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
+	"       the line  may not  contain  whitespace,  this is  not allowed.\n"
+	"       Please write all newsgroups into a single line.\n"
 msgstr	"\n"
-	"Hoiatus: ristpostitus %d uudisegruppi ja Followup-To rida puudub!\n"
+	"Viga: Rida \"%s\" jätkun järgneval real. Kuna see rida ei või sisaldada\n"
+	"      tühikuid, siis ei ole see lubatud.  Palun kirjutage kõik grupid\n"
+	"      ühele reale.\n"
 
-#: src/lang.c:1174
+#: src/lang.c:996
 #, c-format
 msgid	"\n"
-	"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
+	"Warning: The \"%s:\" line is continued in the next line.\n"
+	"         This is a very new feature and may not be accepted by all servers.\n"
+	"         To avoid trouble please write all newsgroups into a single line.\n"
 msgstr	"\n"
-	"Hoiatus: \"%s\" puudub teie newsrc failist, see võib olla selles serveris "
-	"vigane!\n"
+	"Viga: Rida \"%s\" jätkub järgneval real.\n"
+	"      See on uus omadus ja kõik serverid ei pruugi seda toetada.\n"
+	"      Probleemide vältimiseks, kirjutage palun kõik grupid ühele reale.\n"
 
-#: src/lang.c:1175
+#: src/lang.c:1000
 #, c-format
 msgid	"\n"
-	"Warning: \"%s\" is not a valid newsgroup at this site!\n"
+	"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
 msgstr	"\n"
-	"Hoiatus: \"%s\" ei ole selles serveris kehtiv grupp!\n"
+	"Hoiatus: Rida \"%s:\" sisaldab tühikuid, mis TULEKS eemaldada.\n"
 
-#: src/lang.c:1179
+#: src/lang.c:1005
 msgid	"\n"
 	"  If your article contains quoted text  please take some time to pare it "
 	"down\n"
@@ -3802,497 +3797,522 @@ msgstr	"\n"
 	"  tega, siis ilmselt enamus lugejaid ignoreerib teid täiesti. Tänapäeval on\n"
 	"  võrgus palju rahvast ja infot!\n"
 
-#: src/lang.c:1191
+#: src/lang.c:1018
+msgid	"shell escape"
+msgstr	"paojada käsureale"
+
+#: src/lang.c:1019
 #, c-format
-msgid	"\n"
-	"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
-msgstr	"\n"
-	"Hoiatus: Leidsin %d '-- \\n' rida, mis võib tekitada osades inimestes "
-	"segadust.\n"
+msgid	"Shell Command (%s)"
+msgstr	"Käsurea käsk (%s)"
 
-#: src/lang.c:1192
+#: src/lang.c:1020
 #, c-format
-msgid	"Warning: Only %d out of %d articles were saved"
-msgstr	"Hoiatus: Salvestati ainult %d artiklit %d artiklist"
+msgid	"Enter shell command [%s]> "
+msgstr	"Sisestage käsurea käsk [%s]> "
 
-#: src/lang.c:1193
+#: src/lang.c:1024
 #, c-format
-msgid	"\n"
-	"Warning: Your signature  is longer than %d lines.  Since signatures usually "
-	"do\n"
-	"         not  transport any  useful information,  they should be as  short "
-	"as\n"
-	"         possible.\n"
-msgstr	"\n"
-	"Hoiatus: Teie signatuur on pikem, kui %d rida. Kuna tavaliselt signatuurid "
-	"ei\n"
-	"         sisalda kasulikku informatsiooni, siis peaksid nad olema "
-	"võimalikult\n"
-	"         lühikesed.\n"
+msgid	"%s: Can't get entry for TERM\n"
+msgstr	"%s: Ei saa TERM kirjet\n"
 
-#: src/lang.c:1197
+#: src/lang.c:1028
 #, c-format
-msgid	"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
-msgstr	"Hoiatus: see aadress võib sisaldada rämpsposti lõksu. %s=jätkan, %s=katkestan?"
+msgid	"Group %.*s ('q' to quit)..."
+msgstr	"Grupp %.*s ('q' lõpetamiseks)... "
 
-#: src/lang.c:1198
-msgid	"\n"
-	"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
-msgstr	"\n"
-	"Hoiatus: Signatuuride alguses peaks olema '-- \\n', mitte '--\\n'.\n"
+#: src/lang.c:1030
+#, c-format
+msgid	"Group %.*s..."
+msgstr	"Grupp %.*s... "
 
-#: src/lang.c:1199
-msgid	"Writing attributes file..."
-msgstr	"Kirjutan atribuutide faili..."
+#: src/lang.c:1034
+msgid	"Server unavailable\n"
+msgstr	"Server ei vasta\n"
 
-#: src/lang.c:1200
+#: src/lang.c:1040
 #, c-format
-msgid	"%d Responses%s"
-msgstr	"%d Vastust%s"
+msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
+	"%s=post"
+msgstr	"%s=toru; %s=kiri; %s=trüki; %s=välju; %s=kõik/lugem; %s=salv; %s=märgi; "
+	"%s=postita"
 
-#: src/lang.c:1201
+#: src/lang.c:1041
 #, c-format
-msgid	"Added %d %s"
-msgstr	"Lisatud %d %s"
+msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=toru; %s=kiri; %s=trüki; %s=välju; %s=kirjuta; %s=salv; %s=märgi; "
+	"%s=postita"
 
-#: src/lang.c:1202
-msgid	"No unsubscribed groups to show"
-msgstr	"Tellimata gruppe pole"
+#: src/lang.c:1043
+#, c-format
+msgid	"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=kiri; %s=trüki; %s=välju; %s=kõik/lugem; %s=salvesta; %s=märgi; %s=postita"
 
-#: src/lang.c:1203
-msgid	"Showing subscribed to groups only"
-msgstr	"Näitan ainult tellitud gruppe"
+#: src/lang.c:1044
+#, c-format
+msgid	"%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=kiri; %s=trüki; %s=välju; %s=kirjuta; %s=salvesta; %s=märgi; %s=postita"
 
-#: src/lang.c:1204
-msgid	"Showing unread groups only"
-msgstr	"Näitan ainult lugemata gruppe"
+#: src/lang.c:1048
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=toru; %s=kiri; %s=välju; %s=kõik/lugemata; %s=salv; %s=märgi; %s=postita"
 
-#: src/lang.c:1205
-msgid	"Yes "
-msgstr	"Jah "
+#: src/lang.c:1049
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=toru; %s=kiri; %s=välju; %s=kirjuta; %s=salvesta; %s=märgi; %s=postita"
 
-#: src/lang.c:1206
-msgid	"    You have mail\n"
-msgstr	"    Teil on kiri\n"
+#: src/lang.c:1051
+#, c-format
+msgid	"%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=kiri; %s=välju; %s=kõik/lugemata; %s=salvesta; %s=märgi; %s=postita"
 
-#: src/lang.c:1207
-msgid	"All groups"
-msgstr	"Kõik grupid"
+#: src/lang.c:1052
+#, c-format
+msgid	"%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=kiri; %s=välju; %s=vasta kirjaga; %s=salvesta; %s=märgi; %s=postita"
 
-#: src/lang.c:1208
-msgid	"Comment (optional)  : "
-msgstr	"Kommentaar (vaba)   : "
+#: src/lang.c:1058
+msgid	"Terminal does not support color"
+msgstr	"Terminal ei toeta värve"
 
-#: src/lang.c:1209
-msgid	"Apply pattern to    : "
-msgstr	"Rakenda mustrit     : "
+#: src/lang.c:1063
+#, c-format
+msgid	"Trying %s"
+msgstr	"Proovin %s"
+
+#: src/lang.c:1077 src/lang.c:1102 src/lang.c:1118 src/refs.c:266
+msgid	"None"
+msgstr	"Pole"
+
+#: src/lang.c:1078
+msgid	"Subject"
+msgstr	"Teema"
+
+#: src/lang.c:1079
+msgid	"References"
+msgstr	"Viited"
+
+#: src/lang.c:1080
+msgid	"Both Subject and References"
+msgstr	"Nii teema kui viited"
+
+#: src/lang.c:1081
+msgid	"Multipart Subject"
+msgstr	"Mitmeosaliste teema"
+
+#: src/lang.c:1093 src/lang.c:1204
+msgid	"No"
+msgstr	"Ei"
+
+#: src/lang.c:1094 src/lang.c:1206
+msgid	"Yes"
+msgstr	"Jah"
+
+#: src/lang.c:1095
+msgid	"Hide All"
+msgstr	"Peida kõik"
+
+#: src/lang.c:1103
+msgid	"Address"
+msgstr	"Aadress"
+
+#: src/lang.c:1104
+msgid	"Full Name"
+msgstr	"Täisnimi"
+
+#: src/lang.c:1105
+msgid	"Address and Name"
+msgstr	"Aadress ja nimi"
+
+#: src/lang.c:1112
+msgid	"Max"
+msgstr	"Maksimum"
+
+#: src/lang.c:1113
+msgid	"Sum"
+msgstr	"Summa"
+
+#: src/lang.c:1114
+msgid	"Average"
+msgstr	"Keskmine"
+
+#: src/lang.c:1119
+msgid	"Lines"
+msgstr	"Read"
+
+#: src/lang.c:1120
+msgid	"Score"
+msgstr	"Kaal"
+
+#: src/lang.c:1121
+msgid	"Lines & Score"
+msgstr	"Read & kaal"
+
+#: src/lang.c:1130
+msgid	"Black"
+msgstr	"Must"
+
+#: src/lang.c:1131
+msgid	"Red"
+msgstr	"Punane"
+
+#: src/lang.c:1132
+msgid	"Green"
+msgstr	"Roheline"
+
+#: src/lang.c:1133
+msgid	"Brown"
+msgstr	"Pruun"
+
+#: src/lang.c:1134
+msgid	"Blue"
+msgstr	"Sinine"
+
+#: src/lang.c:1135
+msgid	"Pink"
+msgstr	"Roosa"
+
+#: src/lang.c:1136
+msgid	"Cyan"
+msgstr	"Lilla"
+
+#: src/lang.c:1137
+msgid	"White"
+msgstr	"valge"
+
+#: src/lang.c:1138
+msgid	"Gray"
+msgstr	"Hall"
+
+#: src/lang.c:1139
+msgid	"Light Red"
+msgstr	"Helepunane"
+
+#: src/lang.c:1140
+msgid	"Light Green"
+msgstr	"Heleroheline"
+
+#: src/lang.c:1141
+msgid	"Yellow"
+msgstr	"Kollane"
+
+#: src/lang.c:1142
+msgid	"Light Blue"
+msgstr	"Helesinine"
+
+#: src/lang.c:1143
+msgid	"Light Pink"
+msgstr	"Heleroosa"
+
+#: src/lang.c:1144
+msgid	"Light Cyan"
+msgstr	"Helelilla"
+
+#: src/lang.c:1145
+msgid	"Light White"
+msgstr	"Helevalge"
+
+#: src/lang.c:1153 src/lang.c:1210 src/lang.c:1224
+msgid	"Nothing"
+msgstr	"Ei kasuta"
+
+#: src/lang.c:1154
+msgid	"Mark"
+msgstr	"Märk"
+
+#: src/lang.c:1155
+msgid	"Space"
+msgstr	"Tühik"
+
+#: src/lang.c:1162
+msgid	"Normal"
+msgstr	"Tavaline"
+
+#: src/lang.c:1163
+msgid	"Best highlighting"
+msgstr	"Parim esiletõstmine"
+
+#: src/lang.c:1164
+msgid	"Underline"
+msgstr	"Allajoonitud"
+
+#: src/lang.c:1165
+msgid	"Reverse video"
+msgstr	"Pööratud video"
+
+#: src/lang.c:1166
+msgid	"Blinking"
+msgstr	"Plinkiv"
+
+#: src/lang.c:1167
+msgid	"Half bright"
+msgstr	"Poolhele"
+
+#: src/lang.c:1168
+msgid	"Bold"
+msgstr	"Paks"
+
+#: src/lang.c:1173
+msgid	"none"
+msgstr	"pole"
+
+#: src/lang.c:1174
+msgid	"commands"
+msgstr	"käsud"
+
+#: src/lang.c:1175
+msgid	"select"
+msgstr	"valik"
+
+#: src/lang.c:1177
+msgid	"commands & quit"
+msgstr	"käsud & välju"
+
+#: src/lang.c:1178
+msgid	"commands & select"
+msgstr	"käsud & valik"
+
+#: src/lang.c:1179
+msgid	"quit & select"
+msgstr	"välju & valik"
+
+#: src/lang.c:1180
+msgid	"commands & quit & select"
+msgstr	"käsud & välju & valik"
 
-#: src/lang.c:1210
-msgid	"From: line (ignore case)      "
-msgstr	"From: rida (tõstutundetu)   "
+#: src/lang.c:1205
+msgid	"Shell archive"
+msgstr	"Shelli arhiiv"
 
 #: src/lang.c:1211
-msgid	"From: line (case sensitive)   "
-msgstr	"From: rida (tõstutundlik)   "
+msgid	"Subject: (descending)"
+msgstr	"Subject: (kahanevalt)"
 
-# TRANSLATION TOO LONG
 #: src/lang.c:1212
-msgid	"One or more lines of comment. <CR> to add a line or proceed if line is empty."
-msgstr	"Üks või enam kommentaari rida. <CR> rea lisamiseks või jätkamiseks, kui rida "
-	"on tühi."
+msgid	"Subject: (ascending)"
+msgstr	"Subject: (kasvavalt)"
 
 #: src/lang.c:1213
-msgid	"From: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	"From: rida filtrite faili. <TÜHIK> lülitab, <CR> seab."
+msgid	"From: (descending)"
+msgstr	"From: (kahanevalt)"
 
 #: src/lang.c:1214
-msgid	"Linecount of articles to be filtered. < for less, > for more, = for equal."
-msgstr	"Filtraaritavate artiklite ridu. < on vähem, > on rohkem, = on võrdne."
+msgid	"From: (ascending)"
+msgstr	"From: (kasvavalt)"
 
 #: src/lang.c:1215
-msgid	"Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	"Message-ID: rida filtri faili lisamiseks. <TÜHIK> lülitab, <CR> seab."
+msgid	"Date: (descending)"
+msgstr	"Date: (kahanevalt)"
 
 #: src/lang.c:1216
-msgid	"Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	"Subject: rida filtri faili lisamiseks. <TÜHIK> lülitab, <CR> seab."
+msgid	"Date: (ascending)"
+msgstr	"Date: (kasvavalt)"
 
-#: src/lang.c:1217
-msgid	"Enter text pattern to filter if Subject: & From: lines are not what you want."
-msgstr	"Sisestage filtreerimiseks tekstimuster, kui Subject: ja From: ei ole piisav."
+#: src/lang.c:1217 src/lang.c:1225
+msgid	"Score (descending)"
+msgstr	"Kaal (kahanevalt)"
 
-#: src/lang.c:1218
-msgid	"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
-msgstr	"Valige, kus tekstimustrit rakendada. <TÜHIK> lülitab, <CR> seab."
+#: src/lang.c:1218 src/lang.c:1226
+msgid	"Score (ascending)"
+msgstr	"Kaal (kasvavalt)"
 
 #: src/lang.c:1219
-msgid	"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
-msgstr	"Sisestatud filtri aegumisaeg päevades. <TÜHIK> lülitab, <CR> seab."
+msgid	"Lines: (descending)"
+msgstr	"Lines: (kahanevalt)"
 
 #: src/lang.c:1220
-msgid	"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
-msgstr	"Kasuta surmamist jooksval/kõikidel gruppidel. <TÜHIK> lülitab, <CR> seab."
-
-#: src/lang.c:1221
-msgid	"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
-msgstr	"Kasuta valikut jooksval/kõikidel gruppidel. <TÜHIK> lülitab, <CR> seab."
-
-#: src/lang.c:1222
-#, c-format
-msgid	"Kill From:     [%-*.*s] (y/n): "
-msgstr	"Surmake From:  [%-*.*s] (j/e): "
-
-#: src/lang.c:1223
-msgid	"Kill Lines: (</>num): "
-msgstr	"Surmake read: (</>num) : "
-
-#: src/lang.c:1224
-msgid	"Kill Article Menu"
-msgstr	"Artuklite surmamise menüü"
-
-#: src/lang.c:1225
-#, c-format
-msgid	"Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
-msgstr	"Surmake Msg-Id:[%-*.*s] (f/l/o/n): "
-
-#: src/lang.c:1226
-msgid	"Kill pattern scope  : "
-msgstr	"Surmamise mustri ulatus: "
-
-#: src/lang.c:1227
-#, c-format
-msgid	"Kill Subject:  [%-*.*s] (y/n): "
-msgstr	"Surmake teema: [%-*.*s] (j/e): "
-
-#: src/lang.c:1228
-msgid	"Kill text pattern   : "
-msgstr	"Surmake tekst mustriga : "
-
-#: src/lang.c:1229
-msgid	"Kill time in days   : "
-msgstr	"Surmamise aeg päevades : "
-
-#: src/lang.c:1230
-msgid	"Message-ID: line              "
-msgstr	"Message-ID: rida            "
+msgid	"Lines: (ascending)"
+msgstr	"Lines: (kasvavalt)"
 
 #: src/lang.c:1231
-#, c-format
-msgid	"Select From    [%-*.*s] (y/n): "
-msgstr	"Valige From    [%-*.*s] (j/e): "
+msgid	"Always Keep"
+msgstr	"Hoia alati"
 
 #: src/lang.c:1232
-msgid	"Select Lines: (</>num): "
-msgstr	"Valige read:  (</>num): "
+msgid	"Always Remove"
+msgstr	"Eemalda alati"
 
 #: src/lang.c:1233
-msgid	"Auto-select Article Menu"
-msgstr	"Automaatselt valitavate artiklite menüü"
-
-#: src/lang.c:1234
-#, c-format
-msgid	"Select Msg-Id  [%-*.*s] (f/l/o/n): "
-msgstr	"Valige Msg-Id  [%-*.*s] (f/l/o/n): "
-
-#: src/lang.c:1235
-msgid	"Select pattern scope: "
-msgstr	"Valige mustri ulatus: "
-
-#: src/lang.c:1236
-#, c-format
-msgid	"Select Subject [%-*.*s] (y/n): "
-msgstr	"Valige teema   [%-*.*s] (j/e): "
-
-#: src/lang.c:1237
-msgid	"Select text pattern : "
-msgstr	"Valige tekstimuster : "
+msgid	"Mark with D on selection screen"
+msgstr	"Märgi valikuekraanil tähega D"
 
 #: src/lang.c:1238
-msgid	"Select time in days   : "
-msgstr	"Valige aeg päevades   : "
+msgid	"Kill only unread arts"
+msgstr	"Surma ainult lugemata artiklid"
 
 #: src/lang.c:1239
-msgid	"Subject: line (ignore case)   "
-msgstr	"Subject: rida (tõstutundetu)"
+msgid	"Kill all arts & show with K"
+msgstr	"Surma kõik artiklid & näita K tähega"
 
+#. TODO: s/K/art_marked_killed/
 #: src/lang.c:1240
-msgid	"Subject: line (case sensitive)"
-msgstr	"Subject: rida (tõstutundlik)"
-
-#: src/lang.c:1241
-#, c-format
-msgid	"%d days"
-msgstr	"%d päeva"
-
-#: src/lang.c:1242
-msgid	"Unlimited"
-msgstr	"Piiramata"
-
-#: src/lang.c:1243
-msgid	"Full"
-msgstr	"Täis"
-
-#: src/lang.c:1244
-msgid	"Last"
-msgstr	"Viimane"
+msgid	"Kill all arts and never show"
+msgstr	"Surma kõik artiklid ja ära näita"
 
 #: src/lang.c:1245
-msgid	"Only"
-msgstr	"Ainult"
+msgid	"Nothing special"
+msgstr	"Ei midagi erilist"
 
 #: src/lang.c:1246
-msgid	"# Format:\n"
-	"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
-	"placed\n"
-	"#                     at the beginning of a rule, or they will be moved to "
-	"the\n"
-	"#                     next rule. '#' is not a valid keyword for a comment!\n"
-	"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
-	"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
-	"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
-	"#     score=NUM         A number (e.g. 70). Or:\n"
-	"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
-	"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
-	"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
-	"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n"
-	"#                     full references.\n"
-	"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
-	"#   msgid_only=STRING Optional. Like above, but without references.\n"
-	"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
-	"without\n"
-	"#                     Message-ID:\n"
-	"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
-	"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
-	"opt.\n"
-	"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
-	"#   time=NUM          Optional. time_t value when rule expires\n"
-	"#\n"
-msgstr	"# Vorming:\n"
-	"#   comment=SÕNE      Mittekohustuslik. Lubatud on mitu rida. Kommentaarid\n"
-	"#                     peavad olema reegli alguses või nad tõstetakse "
-	"järgmise\n"
-	"#                     reegli juurde. '#' ei ole kommentaari jaoks lubatud!\n"
-	"#   group=SÕNE        Kohustuslik. Gruppide loend (n. comp.*,!*sources*).\n"
-	"#   case=NUM          Kohustuslik. Võrdle=0 / ignoreeri=1 filtreerimisel\n"
-	"#                     suur-väiketähti.\n"
-	"#   score=NUMBER|SÕNE Kohustuslik. Omistatav kaal. Kas:\n"
-	"#     score=NUMBER      number (nt. 70). Või:\n"
-	"#     score=SÕNE        üks kahest võtmesõnast: 'hot' või 'kill'.\n"
-	"#   subj=SÕNE         Mittekohustuslik. Subject: rida (n. Kuidas olla tark).\n"
-	"#   from=SÕNE         Mittekohustuslik. From: rida (n. *Jaan Tamm*)\n"
-	"#   msgid=SÕNE        Mittekohustuslik. Message-ID: rida (n. "
-	"<123@ether.net>)\n"
-	"#                     koos kõikide viidetega.\n"
-	"#   msgid_last=SÕNE   Mittekohustuslik. Nagu ülal, aga ainult viimane viide.\n"
-	"#   msgid_only=SÕNE   Mittekohustuslik. Nagu ülal, aga viideteta.\n"
-	"#   refs_only=SÕNE    Mittekohustuslik. References: rida (n. "
-	"<123@ether.net>)\n"
-	"#                     ilma Message-ID:\n"
-	"#   lines=[<>]?NUMBER Mittekohustuslik. Lines: rida. '<' või '>' pole\n"
-	"#                     kohustuslikud.\n"
-	"#   gnksa=[<>]?NUMBER Mittekohustuslik. GNKSA parse_from() tagastatud kood.\n"
-	"#                     '<' või '>' pole kohustuslikud.\n"
-	"#   xref=MUSTER       Mittekohustuslik. Surmamise muster (n. alt.flame*)\n"
-	"#   time=NUMBER       Mittekohustuslik. Reegli aegumine time_t väärtusena\n"
-	"#\n"
-
-#: src/lang.c:1267
-#, c-format
-msgid	"Enter score for rule (default=%d): "
-msgstr	"Reegli kaal        (vaikimisi=%d): "
-
-#: src/lang.c:1268
-#, c-format
-msgid	"Enter the score weight (range 0 < score <= %d)"
-msgstr	"Sisestage reegli kaal (vahemik on 0 < kaal <= %d)"
-
-#. SCORE_MAX
-#: src/lang.c:1270
-msgid	"Article deleted."
-msgstr	"Artikkel kustutatud."
-
-#: src/lang.c:1271
-msgid	"Article undeleted."
-msgstr	"Artikkel taastatud."
-
-#: src/lang.c:1272
-msgid	"Processing mail messages marked for deletion."
-msgstr	"Töötlen kirju, mis on kustutamiseks märgitud."
-
-#: src/lang.c:1273
-msgid	"Processing saved articles marked for deletion."
-msgstr	"Töötlen salvestatud ja kustutamiseks märgitud artikleid."
+msgid	"Compress quotes"
+msgstr	"Tihenda tsitaadid"
 
-#: src/lang.c:1276
-#, c-format
-msgid	"Environment variable %s not found. Set and retry..."
-msgstr	"Keskkonnamuutujat %s pole. Looge ja proovige uuesti..."
+#: src/lang.c:1247
+msgid	"Quote signatures"
+msgstr	"Tsiteeri allkirju"
 
-#: src/lang.c:1277
-msgid	"  -B       BBS mode. File operations limited to home directories."
-msgstr	"  -B       BBS mood. Failioperatsioonid on piiratud kodukataloogiga."
+#: src/lang.c:1248
+msgid	"Compress quotes, quote sigs"
+msgstr	"Tihenda tsitaadid, tsiteeri allkirju"
 
-#: src/lang.c:1281
-msgid	"\n"
-	"Error: Followup-To set to more than one newsgroup!\n"
-msgstr	"\n"
-	"Viga: Followup-To real on rohkem kui üks grupp!\n"
+#: src/lang.c:1249
+msgid	"Quote empty lines"
+msgstr	"Tsiteeri tühje ridu"
 
-#: src/lang.c:1282
-#, c-format
-msgid	"\n"
-	"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
-msgstr	"\n"
-	"Viga: ristpostitus %d gruppi ja Followup-To rida puudub!\n"
+#: src/lang.c:1250
+msgid	"Compress quotes, quote empty lines"
+msgstr	"Tihenda tsitaadid, tsiteeri tühje ridu"
 
-#: src/lang.c:1283
-#, c-format
-msgid	"\n"
-	"Error: \"%s\" is not a valid newsgroup!\n"
-msgstr	"\n"
-	"Viga: \"%s\" ei ole lubatud grupp!\n"
+#: src/lang.c:1251
+msgid	"Quote sigs & empty lines"
+msgstr	"Tsiteeri allkirju ja tühje ridu"
 
-#: src/lang.c:1287
-msgid	"Your server does not have Xref: in its XOVER information.\n"
-	"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
-msgstr	"Teie server ei paku Xref: päiserida XOVER informatsioonis.\n"
-	"Tin üritab kasutada XHDR XREF selle asemel (võib olla mõnevõrra "
-	"aeganõudvam).\n"
+#: src/lang.c:1252
+msgid	"Comp. q., quote sigs & empty lines"
+msgstr	"Tihenda tsitaate, tsiteeri allkirju ja tühje ridu"
 
 #: src/lang.c:1290
-msgid	"Your server does not have Xref: in its XOVER information.\n"
-msgstr	"Teie server ei paku Xref: päiserida XOVER informatsioonis.\n"
-
-#: src/lang.c:1295
 msgid	"Display Options"
 msgstr	"Ekraani seaded"
 
-#: src/lang.c:1301
+#: src/lang.c:1296
 msgid	"Color Options"
 msgstr	"Värvide seaded"
 
-#: src/lang.c:1307
+#: src/lang.c:1302
 msgid	"Article-Limiting Options"
 msgstr	"Artikli piirangute seaded"
 
-#: src/lang.c:1313
+#: src/lang.c:1308
 msgid	"Posting/Mailing Options"
 msgstr	"Postitamise/saatmise seaded"
 
-#: src/lang.c:1319
+#: src/lang.c:1314
 msgid	"Saving/Printing Options"
 msgstr	"Salvestamise/trükkimise seaded"
 
-#: src/lang.c:1325
+#: src/lang.c:1320
 msgid	"Expert Options"
 msgstr	"Ekspertseaded"
 
-#: src/lang.c:1331
+#: src/lang.c:1326
 msgid	"Filtering Options"
 msgstr	"Filtreerimise seaded"
 
-#: src/lang.c:1336 src/lang.c:1362 src/lang.c:1368 src/lang.c:1375 src/lang.c:1407
-#: src/lang.c:1413 src/lang.c:1421 src/lang.c:1441 src/lang.c:1516 src/lang.c:1678
-#: src/lang.c:1684 src/lang.c:1690 src/lang.c:1702 src/lang.c:1709 src/lang.c:1760
-#: src/lang.c:1769 src/lang.c:1775 src/lang.c:1781 src/lang.c:1787 src/lang.c:1793
-#: src/lang.c:1799 src/lang.c:1805 src/lang.c:1811 src/lang.c:1817 src/lang.c:1823
-#: src/lang.c:1829 src/lang.c:1835 src/lang.c:1841 src/lang.c:1847 src/lang.c:1853
-#: src/lang.c:1859 src/lang.c:1865 src/lang.c:1871 src/lang.c:1877 src/lang.c:1883
-#: src/lang.c:1890 src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1920
-#: src/lang.c:1926 src/lang.c:1932 src/lang.c:1938 src/lang.c:1944 src/lang.c:1958
-#: src/lang.c:1970 src/lang.c:2004 src/lang.c:2056 src/lang.c:2063 src/lang.c:2069
-#: src/lang.c:2094 src/lang.c:2111 src/lang.c:2164 src/lang.c:2197 src/lang.c:2217
-#: src/lang.c:2252 src/lang.c:2260 src/lang.c:2285 src/lang.c:2297
+#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 src/lang.c:1402
+#: src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 src/lang.c:1511 src/lang.c:1673
+#: src/lang.c:1679 src/lang.c:1685 src/lang.c:1697 src/lang.c:1704 src/lang.c:1755
+#: src/lang.c:1764 src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788
+#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 src/lang.c:1818
+#: src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 src/lang.c:1842 src/lang.c:1848
+#: src/lang.c:1854 src/lang.c:1860 src/lang.c:1866 src/lang.c:1872 src/lang.c:1878
+#: src/lang.c:1885 src/lang.c:1891 src/lang.c:1897 src/lang.c:1904 src/lang.c:1915
+#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 src/lang.c:1953
+#: src/lang.c:1965 src/lang.c:1999 src/lang.c:2051 src/lang.c:2058 src/lang.c:2064
+#: src/lang.c:2089 src/lang.c:2106 src/lang.c:2159 src/lang.c:2192 src/lang.c:2212
+#: src/lang.c:2247 src/lang.c:2255 src/lang.c:2280 src/lang.c:2292
 msgid	"<SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	"<TÜHIK> lülitab, <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1337
+#: src/lang.c:1332
 msgid	"Show mini menu & posting etiquette :"
 msgstr	"Näita minimenüüd & post. etiketti  :"
 
-#: src/lang.c:1338
+#: src/lang.c:1333
 msgid	"# If ON show a mini menu of useful commands at each level\n"
 	"# and posting etiquette after composing an article\n"
 msgstr	"# Kui väärtus on ON, näita enimkasutatavate käskude minimenüüd\n"
 	"# ja peale artikli kirjutamist postitamise etiketti.\n"
 
-#: src/lang.c:1343
+#: src/lang.c:1338
 msgid	"Show short description for each newsgroup. <SPACE> toggles & <CR> sets."
 msgstr	"Näita gruppide lühikirjeldusi. <TÜHIK> lülitab ja <CR> seab."
 
-#: src/lang.c:1344
+#: src/lang.c:1339
 msgid	"Show description of each newsgroup :"
 msgstr	"Näita iga grupi lühikirjeldust     :"
 
-#: src/lang.c:1345
+#: src/lang.c:1340
 msgid	"# If ON show group description text after newsgroup name at\n"
 	"# group selection level\n"
 msgstr	"# Kui väärtus on ON, näita gruppide tasemel iga grupi nime\n"
 	"# järel grupi lühikirjeldust\n"
 
-#: src/lang.c:1350
+#: src/lang.c:1345
 msgid	"Show Subject & From (author) fields in group menu. <SPACE> toggles & <CR> "
 	"sets."
 msgstr	"Näita grupimenüüs teema ja From (autor) välju. <TÜHIK> lülitab ja <CR> seab."
 
-#: src/lang.c:1351
+#: src/lang.c:1346
 msgid	"In group menu, show author by      :"
 msgstr	"Näita grupimenüüs autorit          :"
 
-#: src/lang.c:1352
+#: src/lang.c:1347
 msgid	"# Part of from field to display 0) none 1) address 2) full name 3) both\n"
 msgstr	"# Millist saatja nime osa näidata 0) mitte midagi 1) aadress 2) täisnimi\n"
 	"# 3) mõlemad\n"
 
-#: src/lang.c:1356
+#: src/lang.c:1351
 msgid	"Draw -> or highlighted bar for selection. <SPACE> toggles & <CR> sets."
 msgstr	"Märgi valik -> või heleda ribaga. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:1357
+#: src/lang.c:1352
 msgid	"Draw -> instead of highlighted bar :"
 msgstr	"Joonista -> heleda riba asemel     :"
 
-#: src/lang.c:1358
+#: src/lang.c:1353
 msgid	"# If ON use -> otherwise highlighted bar for selection\n"
 msgstr	"# Kui väärtus on on, kasuta valiku märkimiseks ->, muidu riba\n"
 
-#: src/lang.c:1363
+#: src/lang.c:1358
 msgid	"Use inverse video for page headers :"
 msgstr	"Kasuta päistel pööratud videot     :"
 
-#: src/lang.c:1364
+#: src/lang.c:1359
 msgid	"# If ON use inverse video for page headers at different levels\n"
 msgstr	"# Kui väärtus on ON, kasuta erinevatel tasemetel päiste näitamisel\n"
 	"# pööratud videot\n"
 
-#: src/lang.c:1369
+#: src/lang.c:1364
 msgid	"Thread articles by                 :"
 msgstr	"Artiklite teemadesse jagamine      :"
 
-#: src/lang.c:1370
+#: src/lang.c:1365
 msgid	"# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n"
 	"# 4=(Multipart Subject).\n"
 msgstr	"# Jaga artiklid teemadesse 0=(ei jaga) 1=(teema järgi) 2=(viite järgi)\n"
 	"# 3=(mõlema järgi) 4=(Mitmeosaliste teema).\n"
 
-#: src/lang.c:1376
+#: src/lang.c:1371
 msgid	"Score of a thread                  :"
 msgstr	"Teema kaal                         :"
 
-#: src/lang.c:1377
+#: src/lang.c:1372
 msgid	"# Thread score 0=(Max) 1=(Sum) 2=(Average)\n"
 msgstr	"# Teema kaal 0=(Maksimum) 1=(Summa) 2=(Keskmine)\n"
 
-#: src/lang.c:1381
+#: src/lang.c:1376
 msgid	"Sort articles by Subject, From, Date or Score. <SPACE> toggles & <CR> sets."
 msgstr	"Järjesta artiklid Subject, From, Date, kaalu järgi. <TÜHIK> lülitab, <CR> "
 	"seab."
 
-#: src/lang.c:1382
+#: src/lang.c:1377
 msgid	"Sort articles by                   :"
 msgstr	"Artiklite järjestus                :"
 
-#: src/lang.c:1383
+#: src/lang.c:1378
 msgid	"# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n"
 	"# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n"
 	"# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n"
@@ -4300,57 +4320,57 @@ msgstr	"# Artiklite järjestamine 0=(ei j
 	"# 3=(Saatja kahanev) 4=(Saatja kasvava) 5=(Kuup. kahanev) 6=(Kuup. kasvav)\n"
 	"# 7=(Kaal kahanev) 8=(Kaal kasvav) 9=(Ridu kahanev) 10=(Ridu kasvav).\n"
 
-#: src/lang.c:1389
+#: src/lang.c:1384
 msgid	"Sort threads by Nothing or Score. <SPACE> toggles & <CR> sets."
 msgstr	"Järjesta teemad mitte millegi või kaalu järgi. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:1390
+#: src/lang.c:1385
 msgid	"Sort threads by                    :"
 msgstr	"Teemade järjestus                  :"
 
-#: src/lang.c:1391
+#: src/lang.c:1386
 msgid	"# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n"
 msgstr	"# Järjesta teema 0=(ei järjesta) 1=skoor kahanevalt, 2=skoor kasvavalt\n"
 
-#: src/lang.c:1395
+#: src/lang.c:1390
 msgid	"Put cursor at first/last unread art in groups. <SPACE> toggles & <CR> sets."
 msgstr	"Vii kursor grupis esimesele/viimasele lugemata artiklile. <TÜHIK> lülitab, "
 	"<CR> seab."
 
-#: src/lang.c:1396
+#: src/lang.c:1391
 msgid	"Goto first unread article in group :"
 msgstr	"Mine grupis esimesele lugemata art.:"
 
-#: src/lang.c:1397
+#: src/lang.c:1392
 msgid	"# If ON put cursor at first unread art in group otherwise last art\n"
 msgstr	"# Kui väärtus on ON, vii kursor grupi esimesele lugemata artiklile,\n"
 	"# muidu viimasele\n"
 
-#: src/lang.c:1401
+#: src/lang.c:1396
 msgid	"Show all articles or only unread articles. <SPACE> toggles & <CR> sets."
 msgstr	"Näita kõiki või ainult lugemata artikleid. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:1402
+#: src/lang.c:1397
 msgid	"Show only unread articles          :"
 msgstr	"Näita ainult lugemata artikleid    :"
 
-#: src/lang.c:1403
+#: src/lang.c:1398
 msgid	"# If ON show only new/unread articles otherwise show all.\n"
 msgstr	"# Kui väärtus on ON, näita ainult lugemata artikleid, muidu näita kõiki.\n"
 
-#: src/lang.c:1408
+#: src/lang.c:1403
 msgid	"Show only groups with unread arts  :"
 msgstr	"Ainult lugemata artiklitega grupid :"
 
-#: src/lang.c:1409
+#: src/lang.c:1404
 msgid	"# If ON show only subscribed to groups that contain unread articles.\n"
 msgstr	"# Näita ainult neid tellitud gruppe, kus on lugemata artikleid.\n"
 
-#: src/lang.c:1414
+#: src/lang.c:1409
 msgid	"Filter which articles              :"
 msgstr	"Filtreeri artikleid                :"
 
-#: src/lang.c:1415
+#: src/lang.c:1410
 msgid	"# 0=(Only kill unread articles)\n"
 	"# 1=(Kill all articles and show in threads marked with K)\n"
 	"# 2=(Kill all articles and never show them).\n"
@@ -4358,212 +4378,212 @@ msgstr	"# 0=(Surma ainult lugemata artik
 	"# 1=(Surma kõik artiklid ja näita teemades märgiga K)\n"
 	"# 2=(Surma kõik artiklid ja ära näita neid).\n"
 
-#: src/lang.c:1422
+#: src/lang.c:1417
 msgid	"Tab goes to next unread article    :"
 msgstr	"Tab viib järgmisele lugemata art.  :"
 
-#: src/lang.c:1423
+#: src/lang.c:1418
 msgid	"# If ON the TAB command will go to next unread article at article viewer "
 	"level\n"
 msgstr	"# Kui väärtus on ON, viib Tab käsk järgmisele lugemata artiklile\n"
 
-#: src/lang.c:1427
+#: src/lang.c:1422
 msgid	"Scrolling with <SPACE> past the end of an art. jumps to the next unread one."
 msgstr	"Tühikuga artikli lõpust edasi kerimine hüppab järgmisele lugemata artiklile."
 
-#: src/lang.c:1428
+#: src/lang.c:1423
 msgid	"Space goes to next unread article  :"
 msgstr	"Tühik viib järgmisele lugemata art.:"
 
-#: src/lang.c:1429
+#: src/lang.c:1424
 msgid	"# If ON the SPACE command will go to next unread article at article viewer\n"
 	"# level when the end of the article is reached (rn-style pager)\n"
 msgstr	"# Kui väärtus on ON, viib artikli lõpus tühiku vajutamine\n"
 	"# järgmisele lugemata artiklile (rn stiil)\n"
 
-#: src/lang.c:1434
+#: src/lang.c:1429
 msgid	"Scrolling with <PGDN>/<DOWN> past the end of an art. jumps to the unread one."
 msgstr	"<PGDN>/noolega art. lõpust edasi kerimine hüppab järgmisele lugemata art."
 
-#: src/lang.c:1435
+#: src/lang.c:1430
 msgid	"PgDn goes to next unread article   :"
 msgstr	"PgDn viib järgmisele lugemata art. :"
 
-#: src/lang.c:1436
+#: src/lang.c:1431
 msgid	"# If ON the PGDN or DOWN command will go to next unread article when\n"
 	"# pressed at end of message\n"
 msgstr	"# Kui väärtus on ON, viib artikli lõpus PGDN või nool alla vajutamine\n"
 	"# järgmisele artiklile\n"
 
-#: src/lang.c:1442
+#: src/lang.c:1437
 msgid	"List thread using right arrow key  :"
 msgstr	"Nool paremale näitab teema loendit :"
 
-#: src/lang.c:1443
+#: src/lang.c:1438
 msgid	"# If ON automatically list thread when entering it using right arrow key.\n"
 msgstr	"# Kui väärtus on ON, näita nool paremale klahvi vajutamisel teema artikleid.\n"
 
-#: src/lang.c:1447
+#: src/lang.c:1442
 msgid	"Enter character to indicate deleted articles. <CR> sets, <ESC> cancels."
 msgstr	"Sisestage sümbol kustutatud artiklite märkimiseks. <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1448
+#: src/lang.c:1443
 msgid	"Character to show deleted articles :"
 msgstr	"Kustutatud artiklite marker        :"
 
-#: src/lang.c:1449
+#: src/lang.c:1444
 msgid	"# Character used to show that an art was deleted (default 'D')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Sümbol, mis tähistab kustutatud artiklit (vaikimisi 'D')\n"
 	"# _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1454
+#: src/lang.c:1449
 msgid	"Enter character to indicate articles in a range. <CR> sets, <ESC> cancels."
 msgstr	"Sisestage sümbol, mis märgib vahemikku kuuluvaid artikleid. <CR> seab, <ESC> "
 	"katkestab."
 
-#: src/lang.c:1455
+#: src/lang.c:1450
 msgid	"Character to show inrange articles :"
 msgstr	"Artiklite vahemiku marker          :"
 
-#: src/lang.c:1456
+#: src/lang.c:1451
 msgid	"# Character used to show that an art is in a range (default '#')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Sümbol, mis märgib vahemikku kuuluvaid artikleid (vaikimisi '#')\n"
 	"# _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1461
+#: src/lang.c:1456
 msgid	"Enter character to indicate that article will return. <CR> sets, <ESC> "
 	"cancels."
 msgstr	"Sisestage tagasituleva artikli marker. <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1462
+#: src/lang.c:1457
 msgid	"Character to show returning arts   :"
 msgstr	"Tagasi tulnud artiklite marker     :"
 
-#: src/lang.c:1463
+#: src/lang.c:1458
 msgid	"# Character used to show that an art will return (default '-')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Sümbol, mis näitab, et artikkel tuleb tagasi (vaikimisi '-')\n"
 	"# _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1468
+#: src/lang.c:1463
 msgid	"Enter character to indicate selected articles. <CR> sets, <ESC> cancels."
 msgstr	"Sisestage valitud artikleid märkiv sümbol. <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1469
+#: src/lang.c:1464
 msgid	"Character to show selected articles:"
 msgstr	"Valitud artiklite marker           :"
 
-#: src/lang.c:1470
+#: src/lang.c:1465
 msgid	"# Character used to show that an art was auto-selected (default '*')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Sümbol, mis näitab, et artikkel on automaatselt valitud (vaikimisi '*')\n"
 	"# _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1475
+#: src/lang.c:1470
 msgid	"Enter character to indicate recent articles. <CR> sets, <ESC> cancels."
 msgstr	"Sisestage värskeid artikleid märkiv sümbol. <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1476
+#: src/lang.c:1471
 msgid	"Character to show recent articles  :"
 msgstr	"Värskete artiklite marker          :"
 
-#: src/lang.c:1477
+#: src/lang.c:1472
 msgid	"# Character used to show that an art is recent (default 'o')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Sümbol, mis näitab, et artikkel on värske (vaikimisi 'o')\n"
 	"# _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1482
+#: src/lang.c:1477
 msgid	"Enter character to indicate unread articles. <CR> sets, <ESC> cancels."
 msgstr	"Sisestage lugemata artikleid märkiv sümbol. <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1483
+#: src/lang.c:1478
 msgid	"Character to show unread articles  :"
 msgstr	"Lugemata artiklite marker          :"
 
-#: src/lang.c:1484
+#: src/lang.c:1479
 msgid	"# Character used to show that an art is unread (default '+')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Sümbol, mis näitab, et artikkel on lugemata (vaikimisi '+')\n"
 	"# _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1489
+#: src/lang.c:1484
 msgid	"Enter character to indicate read articles. <CR> sets, <ESC> cancels."
 msgstr	"Sisestage loetud artikleid märkiv sümbol. <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1490
+#: src/lang.c:1485
 msgid	"Character to show read articles    :"
 msgstr	"Loetud artiklite marker            :"
 
-#: src/lang.c:1491
+#: src/lang.c:1486
 msgid	"# Character used to show that an art was read (default ' ')\n"
 	"# _ is turned into ' '\n"
 msgstr	"# Sümbol, mis näitab, et artikkel on loetud (vaikimisi ' ')\n"
 	"# _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1496
+#: src/lang.c:1491
 msgid	"Enter character to indicate killed articles. <CR> sets, <ESC> cancels."
 msgstr	"Sisestage surmatud artikleid märkiv sümbol. <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1497
+#: src/lang.c:1492
 msgid	"Character to show killed articles  :"
 msgstr	"Surmatud artiklite marker          :"
 
-#: src/lang.c:1498
+#: src/lang.c:1493
 msgid	"# Character used to show that an art was killed (default 'K')\n"
 	"# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr	"# Sümbol, mis näitab, et artikkel on surmatud (vaikimisi 'K')\n"
 	"# _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1503
+#: src/lang.c:1498
 msgid	"Enter character to indicate read selected articles. <CR> sets, <ESC> cancels."
 msgstr	"Sisestage valitud artikleid märkiv sümbol. <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1504
+#: src/lang.c:1499
 msgid	"Character to show readselected arts:"
 msgstr	"Lugemiseks valitud artiklite marker:"
 
-#: src/lang.c:1505
+#: src/lang.c:1500
 msgid	"# Character used to show that an art was selected before read (default ':')\n"
 	"# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr	"# Sümbol, mis näitab, et artikkel on enne lugemist valitud (vaikimisi ':')\n"
 	"# Surmamise tase peab samuti olema määratud, _ asendatakse tühikuga ' '\n"
 
-#: src/lang.c:1510
+#: src/lang.c:1505
 msgid	"Enter maximum length of newsgroup names displayed. <CR> sets."
 msgstr	"Sisestage maksimaalne näidatav grupi nime pikkus. <CR> seab."
 
-#: src/lang.c:1511
+#: src/lang.c:1506
 msgid	"Max. length of group names shown   :"
 msgstr	"Maksimaalne grupinime pikkus       :"
 
-#: src/lang.c:1512
+#: src/lang.c:1507
 msgid	"# Maximum length of the names of newsgroups displayed\n"
 msgstr	"# Maksimaalne grupi nime pikkus, mida näidatakse ekraanil\n"
 
-#: src/lang.c:1517
+#: src/lang.c:1512
 msgid	"Show lines/score in listings       :"
 msgstr	"Näita loendis artikli kaalu/ridu   :"
 
-#: src/lang.c:1518
+#: src/lang.c:1513
 msgid	"# What informations should be displayed in article/thread listing\n"
 	"# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n"
 msgstr	"# Millist informatsiooni tuleks näidata artikli/teema loendis\n"
 	"# 0 = midagi, 1 = ridu, 2 = kaalu, 3 = ridu ja kaalu\n"
 
-#: src/lang.c:1523
+#: src/lang.c:1518
 msgid	"0 = full page scrolling, -1 = show previous last line as first on next page, "
 	"-2 = half page"
 msgstr	"0 = kerida kogu leht, -1 = näita eelmist rida järgmise lehe esimese reana, -2 "
 	"= pool lehte"
 
-#: src/lang.c:1524
+#: src/lang.c:1519
 msgid	"Number of lines to scroll in pager :"
 msgstr	"Lehitsejas keritavate ridade arv   :"
 
-#: src/lang.c:1525
+#: src/lang.c:1520
 msgid	"# Number of lines that cursor-up/down will scroll in article pager\n"
 	"# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n"
 	"# -1 = the top/bottom line is carried over onto the next page,\n"
@@ -4573,27 +4593,27 @@ msgstr	"# Ridade arv, mida lehitseja ker
 	"# -1 = ülemine või alumine rida jäetakse järgmisele lehele\n"
 	"# -2 = poole lehe kaupa kerimine\n"
 
-#: src/lang.c:1532
+#: src/lang.c:1527
 msgid	"Display signatures. <SPACE> toggles & <CR> sets."
 msgstr	"Näita signatuure, <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:1533
+#: src/lang.c:1528
 msgid	"Display signatures                 :"
 msgstr	"Näita signatuure                   :"
 
-#: src/lang.c:1534
+#: src/lang.c:1529
 msgid	"# If OFF don't show signatures when displaying articles\n"
 msgstr	"# Kui väärtus on OFF, ei näita koos artiklitega signatuure\n"
 
-#: src/lang.c:1538
+#: src/lang.c:1533
 msgid	"Display uuencoded data as tagged attachments. <SPACE> toggles & <CR> sets."
 msgstr	"Näita uuenkodeeritud andmeid märgitud lisadena. <TÜHIK> lülitab ja <CR> seab."
 
-#: src/lang.c:1539
+#: src/lang.c:1534
 msgid	"Display uue data as an attachment  :"
 msgstr	"Näita uuenk. andmeid lisadena      :"
 
-#: src/lang.c:1540
+#: src/lang.c:1535
 msgid	"# Handling of uuencoded data in the pager\n"
 	"# 0 = display raw uuencoded data\n"
 	"# 1 = uuencoded data will be condensed to a single tag line showing\n"
@@ -4608,30 +4628,30 @@ msgstr	"# uuenkodeeritud andmete käsitle
 	"#     märgituna.\n"
 
 #
-#: src/lang.c:1549
+#: src/lang.c:1544
 msgid	"Decode German style TeX umlaut codes to ISO. <SPACE> toggles & <CR> sets."
 msgstr	"Dekodeeri saksa TeX esituses tähed ISO koodideks. <TÜHIK> lülitab, <CR> seab."
 
 #
-#: src/lang.c:1550
+#: src/lang.c:1545
 msgid	"Display \"a as Umlaut-a             :"
 msgstr	"Näita \"a kui Umlaut-a              :"
 
-#: src/lang.c:1551
+#: src/lang.c:1546
 msgid	"# If ON decode German style TeX umlaut codes to ISO and\n"
 	"# show \"a as Umlaut-a, etc.\n"
 msgstr	"# Kui väärtus on ON, teisenda saksa TeX esituses tähed ISO\n"
 	"# koodideks ja näita \"a nagu Umlaut-a, jne.\n"
 
-#: src/lang.c:1556 src/lang.c:1566
+#: src/lang.c:1551 src/lang.c:1561
 msgid	"Space separated list of header fields"
 msgstr	"Tühikuga eraldatud päised"
 
-#: src/lang.c:1557
+#: src/lang.c:1552
 msgid	"Display these header fields (or *) :"
 msgstr	"Näita neid päiseid (või *)         :"
 
-#: src/lang.c:1558
+#: src/lang.c:1553
 msgid	"# Which news headers you wish to see. If you want to see _all_ the headers,\n"
 	"# place an '*' as this value. This is the only way a wildcard can be used.\n"
 	"# If you enter 'X-' as the value, you will see all headers beginning with\n"
@@ -4646,11 +4666,11 @@ msgstr	"# Milliseid artikli päiseid te s
 	"tühikut.\n"
 	"# Kui te väärtust ei määra, lülitatakse see omadus välja.\n"
 
-#: src/lang.c:1567
+#: src/lang.c:1562
 msgid	"Do not display these header fields :"
 msgstr	"Ära näita neid päiseridu           :"
 
-#: src/lang.c:1568
+#: src/lang.c:1563
 msgid	"# Same as 'news_headers_to_display' except it denotes the opposite.\n"
 	"# An example of using both options might be if you thought X- headers were\n"
 	"# A Good Thing(tm), but thought Alan and Pape were miscreants...well then "
@@ -4668,28 +4688,28 @@ msgstr	"# Sama kui 'news_headers_to_disp
 	"#\n"
 	"# Kui te väärtust ei määra, lülitatakse see omadus välja.\n"
 
-#: src/lang.c:1578
+#: src/lang.c:1573
 msgid	"Do you want to enable automatic handling of multipart/alternative articles?"
 msgstr	"Kas te soovite multipart/alternative artiklite automaatset käsitlemist?"
 
-#: src/lang.c:1579
+#: src/lang.c:1574
 msgid	"Skip multipart/alternative parts   :"
 msgstr	"Jäta multipart/alternative osad    :"
 
-#: src/lang.c:1580
+#: src/lang.c:1575
 msgid	"# If ON strip multipart/alternative messages automatically\n"
 msgstr	"# Kui väärtus on ON, loobu automaatselt multipart/alternative teadete "
 	"lisadest\n"
 
-#: src/lang.c:1585
+#: src/lang.c:1580
 msgid	"A regex used to decide which lines to show in col_quote."
 msgstr	"Regulaaravaldis otsustamaks, milliseid ridu tsitaatides näidata."
 
-#: src/lang.c:1586
+#: src/lang.c:1581
 msgid	"Regex used to show quoted lines    :"
 msgstr	"Tsiteeritud ridade näitamise regex :"
 
-#: src/lang.c:1587
+#: src/lang.c:1582
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted when viewing articles. Quoted lines are shown in col_quote.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4697,15 +4717,15 @@ msgstr	"# Regulaaravaldis, mida tin kasu
 	"# milliseid read on tsiteeritud. Tsiteeritud ridu näidatakse col_quote.\n"
 	"# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n"
 
-#: src/lang.c:1593
+#: src/lang.c:1588
 msgid	"A regex used to decide which lines to show in col_quote2."
 msgstr	"Regulaaravaldis otsustamaks, milliseid ridu näidata col_quote2."
 
-#: src/lang.c:1594
+#: src/lang.c:1589
 msgid	"Regex used to show twice quoted l. :"
 msgstr	"Topelt tsiteeritud ridu näitav reg :"
 
-#: src/lang.c:1595
+#: src/lang.c:1590
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted twice. Twice quoted lines are shown in col_quote2.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4714,15 +4734,15 @@ msgstr	"# Regulaaravaldis, mida tin kasu
 	"# näidatakse col_quote2.\n"
 	"# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n"
 
-#: src/lang.c:1601
+#: src/lang.c:1596
 msgid	"A regex used to decide which lines to show in col_quote3."
 msgstr	"Regulaaravaldis otsustamaks, milliseid ridu näidata col_quote3."
 
-#: src/lang.c:1602
+#: src/lang.c:1597
 msgid	"Regex used to show >= 3 times q.l. :"
 msgstr	">= 3 tsiteeritud ridu näitav reg   :"
 
-#: src/lang.c:1603
+#: src/lang.c:1598
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4731,15 +4751,15 @@ msgstr	"# Regulaaravaldis, mida tin kasu
 	"# näidatakse col_quote3.\n"
 	"# Kui te jätate selle tühjaks, kasutab tin sisseehitatud väärtust.\n"
 
-#: src/lang.c:1610
+#: src/lang.c:1605
 msgid	"A regex used to decide which words to show in col_markslashes."
 msgstr	"Regex et otsustada, milliseid sõnu näidata col_markslashes abil."
 
-#: src/lang.c:1611
+#: src/lang.c:1606
 msgid	"Regex used to highlight /slashes/  :"
 msgstr	"Regex et esile tõsta /kaldkriipse/ :"
 
-#: src/lang.c:1612
+#: src/lang.c:1607
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '/' are to be shown in col_markslashes.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4747,15 +4767,15 @@ msgstr	"# Regulaaravaldis mida tin kasut
 	"# sõnu näidata col_markslashes abil. Kui jätate selle tühjaks, kasutab\n"
 	"# tin sisse ehitatud vaikeväärtust.\n"
 
-#: src/lang.c:1618
+#: src/lang.c:1613
 msgid	"A regex used to decide which words to show in col_markstars."
 msgstr	"Regex et otsustada, milliseid sõnu näidata col_markstars abil."
 
-#: src/lang.c:1619
+#: src/lang.c:1614
 msgid	"Regex used to highlight *stars*    :"
 msgstr	"Regex et esile tõsta *tärne*       :"
 
-#: src/lang.c:1620
+#: src/lang.c:1615
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '*' are to be shown in col_markstars.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4763,15 +4783,15 @@ msgstr	"# Regulaaravaldis mida tin kasut
 	"# sõnu näidata col_markstars abil. Kui jätate selle tühjaks, kasutab\n"
 	"# tin sisse ehitatud vaikeväärtust.\n"
 
-#: src/lang.c:1626
+#: src/lang.c:1621
 msgid	"A regex used to decide which words to show in col_markstroke."
 msgstr	"Regex et otsustada, milliseid sõnu näidata col_markstroke abil."
 
-#: src/lang.c:1627
+#: src/lang.c:1622
 msgid	"Regex used to highlight -strokes-  :"
 msgstr	"Regex et esile tõsta -kriipse-     :"
 
-#: src/lang.c:1628
+#: src/lang.c:1623
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '-' are to be shown in col_markstroke.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4779,15 +4799,15 @@ msgstr	"# Regulaaravaldis mida tin kasut
 	"# sõnu näidata col_markstroke abil. Kui jätate selle tühjaks, kasutab\n"
 	"# tin sisse ehitatud vaikeväärtust.\n"
 
-#: src/lang.c:1634
+#: src/lang.c:1629
 msgid	"A regex used to decide which words to show in col_markdash."
 msgstr	"Regex et otsustada, milliseid sõnu näidata col_markdash abil."
 
-#: src/lang.c:1635
+#: src/lang.c:1630
 msgid	"Regex used to highlight _underline_:"
 msgstr	"Regex et esile tõsta _alakriipse_  :"
 
-#: src/lang.c:1636
+#: src/lang.c:1631
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '_' are to be shown in col_markdash.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
@@ -4795,44 +4815,44 @@ msgstr	"# Regulaaravaldis mida tin kasut
 	"# sõnu näidata col_markdash abil. Kui jätate selle tühjaks, kasutab\n"
 	"# tin sisse ehitatud vaikeväärtust.\n"
 
-#: src/lang.c:1642
+#: src/lang.c:1637
 msgid	"A regex used to find Subject prefixes to remove.  Use '|' as separator."
 msgstr	"Regulaaravaldis eemaldatava teema prefiksi leidmiseks. Eraldajaks on '|'."
 
-#: src/lang.c:1643
+#: src/lang.c:1638
 msgid	"Regex with Subject prefixes        :"
 msgstr	"Regex teema prefiksi leidmiseks    :"
 
-#: src/lang.c:1644
+#: src/lang.c:1639
 msgid	"# A regular expression that tin will use to find Subject prefixes\n"
 	"# which will be removed before showing the header.\n"
 msgstr	"# Regulaaravaldis, mida tin kasutab, et leida teema prefiksit, mida\n"
 	"# enne päise näitamist eemaldada.\n"
 
-#: src/lang.c:1649
+#: src/lang.c:1644
 msgid	"A regex used to find Subject suffixes to remove.  Use '|' as separator."
 msgstr	"Regulaaravaldis eemaldatava teema sufiksi leidmiseks. Eraldajaks on '|'."
 
-#: src/lang.c:1650
+#: src/lang.c:1645
 msgid	"Regex with Subject suffixes        :"
 msgstr	"Regex teema sufiksi leidmiseks     :"
 
-#: src/lang.c:1651
+#: src/lang.c:1646
 msgid	"# A regular expression that tin will use to find Subject suffixes\n"
 	"# which will be removed when replying or posting followup.\n"
 msgstr	"# Regulaaravaldis, mida tin kasutab teema sufiksi leidmiseks,\n"
 	"# mis eemaldatakse vastuse saatmisel või postitamisel.\n"
 
-#: src/lang.c:1656
+#: src/lang.c:1651
 msgid	"Enter name and options for external MIME viewer, --internal for built-in "
 	"viewer"
 msgstr	"Sisestage välise MIME lehitseja nimi ja võtmed, sisemise valib --internal"
 
-#: src/lang.c:1657
+#: src/lang.c:1652
 msgid	"MIME binary content viewer         :"
 msgstr	"MIME kahendsisu lehitseja          :"
 
-#: src/lang.c:1658
+#: src/lang.c:1653
 msgid	"# If --internal automatically use the built in MIME viewer for non-text\n"
 	"# parts of articles.\n"
 	"# Otherwise specify an external viewer program (eg, metamail) or leave blank\n"
@@ -4842,362 +4862,362 @@ msgstr	"# --internal korral kasuta artik
 	"# Muidu määra automaatseks vaatamiseks väline programm (nt. metamail) või\n"
 	"# jäta tühjaks\n"
 
-#: src/lang.c:1665
+#: src/lang.c:1660
 msgid	"Confirm before starting non-text viewing program"
 msgstr	"Küsi enne mitte-tekstiliste osade vaatamist kinnitust"
 
-#: src/lang.c:1666
+#: src/lang.c:1661
 msgid	"Ask before using MIME viewer       :"
 msgstr	"Küsi MIME lehitseja kasutamise luba:"
 
-#: src/lang.c:1667
+#: src/lang.c:1662
 msgid	"# If ON tin will ask before using metamail to display MIME messages\n"
 	"# this only happens if metamail_prog is set to something\n"
 msgstr	"# Kui väärtus on ON, küsi metamaili kasutamise luba\n"
 	"# see juhtub ainult siis, kui metamail_prog on väärtustatud\n"
 
-#: src/lang.c:1672
+#: src/lang.c:1667
 msgid	"Ask to mark groups read when quitting. <SPACE> toggles & <CR> sets."
 msgstr	"Küsi, kas märkida väljumisel grupid loetuks. <TÜHIK> lülitab ja <CR> seab."
 
-#: src/lang.c:1673
+#: src/lang.c:1668
 msgid	"Catchup read groups when quitting  :"
 msgstr	"Väljumisel märkida grupid loetuks  :"
 
-#: src/lang.c:1674
+#: src/lang.c:1669
 msgid	"# If ON ask user if read groups should all be marked read\n"
 msgstr	"# Kui väärtus on ON, küsi kasutajalt, kas märkida loetud gruppides kõik\n"
 	"# artiklid loetuks\n"
 
-#: src/lang.c:1679
+#: src/lang.c:1674
 msgid	"Catchup group using left key       :"
 msgstr	"Nool vasakule märgib grupi loetuks :"
 
-#: src/lang.c:1680
+#: src/lang.c:1675
 msgid	"# If ON catchup group/thread when leaving with the left arrow key.\n"
 msgstr	"# Kui väärtus on ON, märgi grupp/teema loetuks, kui sellest väljutakse\n"
 	"# nool vasakule klahviga.\n"
 
-#: src/lang.c:1685
+#: src/lang.c:1680
 msgid	"Catchup thread by using left key   :"
 msgstr	"Nool vasakule märgib teema loetuks :"
 
 # TRANSLATION TOO LONG
-#: src/lang.c:1691
+#: src/lang.c:1686
 msgid	"Which actions require confirmation :"
 msgstr	"Millised tegevused nõuavad kinnitust:"
 
-#: src/lang.c:1692
+#: src/lang.c:1687
 msgid	"# What should we ask confirmation for.\n"
 msgstr	"# Millele me peaksime küsima kinnitust.\n"
 
-#: src/lang.c:1696
+#: src/lang.c:1691
 msgid	"Program to run to open URL's, <CR> sets, <ESC> cancels."
 msgstr	"Programm URLide avamiseks, <CR> seab, <ESC> katkestab."
 
-#: src/lang.c:1697
+#: src/lang.c:1692
 msgid	"Program that opens URL's           :"
 msgstr	"Programm URLide avamiseks          :"
 
-#: src/lang.c:1698
+#: src/lang.c:1693
 msgid	"# The program used to open URL's. The actual URL will be appended\n"
 msgstr	"# Programm URLide avamiseks. URL lisatakse argumendiks\n"
 
-#: src/lang.c:1703
+#: src/lang.c:1698
 msgid	"Use mouse in xterm                 :"
 msgstr	"Kasuta xterm aknas hiirt           :"
 
-#: src/lang.c:1704
+#: src/lang.c:1699
 msgid	"# If ON enable mouse key support on xterm terminals\n"
 msgstr	"# Kui väärtus on ON, luba xterm aknas hiire tugi\n"
 
-#: src/lang.c:1710
+#: src/lang.c:1705
 msgid	"Use scroll keys on keypad          :"
 msgstr	"Kasuta kerimisnuppe                :"
 
-#: src/lang.c:1711
+#: src/lang.c:1706
 msgid	"# If ON enable scroll keys on terminals that support it\n"
 msgstr	"# Kui väärtus on ON, luba kerimisnuppude kasutamist terminalidel, millel need "
 	"on olemas\n"
 
-#: src/lang.c:1716
+#: src/lang.c:1711
 msgid	"Enter maximum number of article to get. <CR> sets."
 msgstr	"Sisestage suurim laetavate artiklite arv. <CR> seab."
 
-#: src/lang.c:1717
+#: src/lang.c:1712
 msgid	"Number of articles to get          :"
 msgstr	"Laetavate artiklite arv            :"
 
-#: src/lang.c:1718
+#: src/lang.c:1713
 msgid	"# Number of articles to get (0=no limit), if negative sets maximum number\n"
 	"# of already read articles to be read before first unread one\n"
 msgstr	"# Laetavate artiklite arv (0=limiit puudub), negatiivne väärtus seab\n"
 	"# maksimaalse arvu loetud artikleid, mida lugeda enne lugemata artiklit\n"
 
-#: src/lang.c:1723
+#: src/lang.c:1718
 msgid	"Enter number of days article is considered recent. <CR> sets."
 msgstr	"Sisestage artikli värskuse kestus. <CR> seab."
 
-#: src/lang.c:1724
+#: src/lang.c:1719
 msgid	"Article recentness time limit      :"
 msgstr	"Artikli värskuse ajapiir           :"
 
-#: src/lang.c:1725
+#: src/lang.c:1720
 msgid	"# Number of days in which article is considered recent, (0=OFF)\n"
 msgstr	"# Päevad, mille jooksul loetakse artiklit värskeks, (0=OFF)\n"
 
-#: src/lang.c:1729
+#: src/lang.c:1724
 msgid	"WILDMAT for normal wildcards, REGEX for full regular expression matching."
 msgstr	"WILDMAT tavalistele jokkeritele, REGEX täisregulaaravaldistega otsimisele."
 
-#: src/lang.c:1730
+#: src/lang.c:1725
 msgid	"Wildcard matching                  :"
 msgstr	"Jokkeritega otsimine               :"
 
-#: src/lang.c:1731
+#: src/lang.c:1726
 msgid	"# Wildcard matching 0=(wildmat) 1=(regex)\n"
 msgstr	"# Jokkeritega otsimine 0=(wildmat) 1=(regex)\n"
 
-#: src/lang.c:1735
+#: src/lang.c:1730
 msgid	"Enter minimal score before an article is marked killed. <CR> sets."
 msgstr	"Sisestage minimaalne kaal artikli surmamiseks. <CR> seab."
 
-#: src/lang.c:1736
+#: src/lang.c:1731
 msgid	"Score limit (kill)                 :"
 msgstr	"Kaalu alampiir (surmamine)         :"
 
-#: src/lang.c:1737
+#: src/lang.c:1732
 msgid	"# Score limit before an article is marked killed\n"
 msgstr	"# Kaalu alampiir, enne kui artikkel märgitakse surmatuks\n"
 
-#: src/lang.c:1741
+#: src/lang.c:1736
 msgid	"Enter default score to kill articles. <CR> sets."
 msgstr	"Sisestage vaikimisi kaal artiklite surmamiseks. <CR> seab."
 
 # TRANSLATION TOO LONG
-#: src/lang.c:1742
+#: src/lang.c:1737
 msgid	"Default score to kill articles     :"
 msgstr	"Vaikimisi kaal artiklite surmamiseks:"
 
-#: src/lang.c:1743
+#: src/lang.c:1738
 msgid	"# Default score to kill articles\n"
 msgstr	"# Vaikimisi kaal artiklite surmamiseks\n"
 
-#: src/lang.c:1747
+#: src/lang.c:1742
 msgid	"Enter minimal score before an article is marked hot. <CR> sets."
 msgstr	"Sisestage minimaalne kaal, enne kui artikkel märgitakse kuumaks. <CR> seab."
 
-#: src/lang.c:1748
+#: src/lang.c:1743
 msgid	"Score limit (select)               :"
 msgstr	"Kaalu alampiir (valik)             :"
 
-#: src/lang.c:1749
+#: src/lang.c:1744
 msgid	"# Score limit before an article is marked hot\n"
 msgstr	"# Kaalu alampiir, enne kui artikkel märgitakse muumaks\n"
 
-#: src/lang.c:1753
+#: src/lang.c:1748
 msgid	"Enter default score to select articles. <CR> sets."
 msgstr	"Sisestage vaikimisi kaal artiklite valimiseks. <CR> seab."
 
-#: src/lang.c:1754
+#: src/lang.c:1749
 msgid	"Default score to select articles   :"
 msgstr	"Vaikimisi kaal artiklite valimiseks:"
 
-#: src/lang.c:1755
+#: src/lang.c:1750
 msgid	"# Default score to select articles\n"
 msgstr	"# Vaikimisi kaal artiklite valimiseks\n"
 
 # TRANSLATION TOO LONG
-#: src/lang.c:1761
+#: src/lang.c:1756
 msgid	"Use slrnface to show ''X-Face:''s  :"
 msgstr	"Et näidata ''X-Face:'', kasutage slrnface:"
 
-#: src/lang.c:1762
+#: src/lang.c:1757
 msgid	"# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n"
 	"# Only useful when running in an xterm.\n"
 msgstr	"# Kui väärtus on ON, kasutan ''X-Face:'' päiste käsitlemiseks slrnface(1).\n"
 	"# Kasulik ainult xterm aknas.\n"
 
-#: src/lang.c:1770
+#: src/lang.c:1765
 msgid	"Use ANSI color                     :"
 msgstr	"Kasuta ANSI värve                  :"
 
-#: src/lang.c:1771
+#: src/lang.c:1766
 msgid	"# If ON using ANSI-color\n"
 msgstr	"# Kui väärtus on ON, kasuta ANSI värve\n"
 
-#: src/lang.c:1776
+#: src/lang.c:1771
 msgid	"Standard foreground color          :"
 msgstr	"Standardne esiplaani värv          :"
 
-#: src/lang.c:1777
+#: src/lang.c:1772
 msgid	"# Standard foreground color\n"
 msgstr	"# Standardne esiplaani värv\n"
 
-#: src/lang.c:1782
+#: src/lang.c:1777
 msgid	"Standard background color          :"
 msgstr	"Standardne tagaplaani värv         :"
 
-#: src/lang.c:1783
+#: src/lang.c:1778
 msgid	"# Standard-Background-Color\n"
 msgstr	"# Standardne tagaplaani värv\n"
 
-#: src/lang.c:1788
+#: src/lang.c:1783
 msgid	"Color for inverse text (background):"
 msgstr	"Pööratud teksti värv (tagaplaan)   :"
 
-#: src/lang.c:1789
+#: src/lang.c:1784
 msgid	"# Color of background for inverse text\n"
 msgstr	"# Pööratud teksti tagaplaani värv\n"
 
-#: src/lang.c:1794
+#: src/lang.c:1789
 msgid	"Color for inverse text (foreground):"
 msgstr	"Pööratud teksti värv (esiplaan)    :"
 
-#: src/lang.c:1795
+#: src/lang.c:1790
 msgid	"# Color of foreground for inverse text\n"
 msgstr	"# Pööratud teksti esiplaani värv\n"
 
-#: src/lang.c:1800
+#: src/lang.c:1795
 msgid	"Color of text lines                :"
 msgstr	"Tekstiridade värv                  :"
 
-#: src/lang.c:1801
+#: src/lang.c:1796
 msgid	"# Color of text-lines\n"
 msgstr	"# Tekstiridade värv\n"
 
-#: src/lang.c:1806
+#: src/lang.c:1801
 msgid	"Color of mini help menu            :"
 msgstr	"Miniabiinfo värv                   :"
 
-#: src/lang.c:1807
+#: src/lang.c:1802
 msgid	"# Color of mini help menu\n"
 msgstr	"# Miniabiinfo värv\n"
 
-#: src/lang.c:1812
+#: src/lang.c:1807
 msgid	"Color of help text                 :"
 msgstr	"Abiinfo värv                       :"
 
-#: src/lang.c:1813
+#: src/lang.c:1808
 msgid	"# Color of help pages\n"
 msgstr	"# Abiinfo värv\n"
 
-#: src/lang.c:1818
+#: src/lang.c:1813
 msgid	"Color of status messages           :"
 msgstr	"Olekuteadete värv                  :"
 
-#: src/lang.c:1819
+#: src/lang.c:1814
 msgid	"# Color of messages in last line\n"
 msgstr	"# Viimasel real olevate teadete värv\n"
 
-#: src/lang.c:1824
+#: src/lang.c:1819
 msgid	"Color of quoted lines              :"
 msgstr	"Tsitaadi värv                      :"
 
-#: src/lang.c:1825
+#: src/lang.c:1820
 msgid	"# Color of quote-lines\n"
 msgstr	"# Tsitaadi värv\n"
 
-#: src/lang.c:1830
+#: src/lang.c:1825
 msgid	"Color of twice quoted line         :"
 msgstr	"Topelt tsiteeritud rea värv        :"
 
-#: src/lang.c:1831
+#: src/lang.c:1826
 msgid	"# Color of twice quoted lines\n"
 msgstr	"# Topelt tsiteeritud rea värv\n"
 
-#: src/lang.c:1836
+#: src/lang.c:1831
 msgid	"Color of =>3 times quoted line     :"
 msgstr	"=>3 korda tsiteeritud rea värv     :"
 
-#: src/lang.c:1837
+#: src/lang.c:1832
 msgid	"# Color of >=3 times quoted lines\n"
 msgstr	"# =>3 korda tsiteeritud rea värv\n"
 
-#: src/lang.c:1842
+#: src/lang.c:1837
 msgid	"Color of article header lines      :"
 msgstr	"Artikli päiseridade värv           :"
 
-#: src/lang.c:1843
+#: src/lang.c:1838
 msgid	"# Color of header-lines\n"
 msgstr	"# Päiseridade värv\n"
 
-#: src/lang.c:1848
+#: src/lang.c:1843
 msgid	"Color of actual news header fields :"
 msgstr	"Artikli tegelike päiseridade värv  :"
 
-#: src/lang.c:1849
+#: src/lang.c:1844
 msgid	"# Color of actual news header fields\n"
 msgstr	"# Artikli tegelike päiseridade värv\n"
 
-#: src/lang.c:1854
+#: src/lang.c:1849
 msgid	"Color of article subject lines     :"
 msgstr	"Artikli teemarea värv              :"
 
-#: src/lang.c:1855
+#: src/lang.c:1850
 msgid	"# Color of article subject\n"
 msgstr	"# Artikli teema värv\n"
 
-#: src/lang.c:1860
+#: src/lang.c:1855
 msgid	"Color of response counter          :"
 msgstr	"Vastuste arvu loenduri värv        :"
 
-#: src/lang.c:1861
+#: src/lang.c:1856
 msgid	"# Color of response counter\n"
 msgstr	"# Vastuste arvu loenduri värv\n"
 
-#: src/lang.c:1866
+#: src/lang.c:1861
 msgid	"Color of sender (From:)            :"
 msgstr	"Saatja värv (From:)                :"
 
-#: src/lang.c:1867
+#: src/lang.c:1862
 msgid	"# Color of sender (From:)\n"
 msgstr	"# Saatja värv (From:)\n"
 
-#: src/lang.c:1872
+#: src/lang.c:1867
 msgid	"Color of help/mail sign            :"
 msgstr	"Abiinfo/kirja teate värv           :"
 
-#: src/lang.c:1873
+#: src/lang.c:1868
 msgid	"# Color of Help/Mail-Sign\n"
 msgstr	"# Abiinfo/kirja teate värv\n"
 
-#: src/lang.c:1878
+#: src/lang.c:1873
 msgid	"Color of signatures                :"
 msgstr	"Signatuuri värv                    :"
 
-#: src/lang.c:1879
+#: src/lang.c:1874
 msgid	"# Color of signature\n"
 msgstr	"# Signatuuri värv\n"
 
-#: src/lang.c:1884
+#: src/lang.c:1879
 msgid	"Color of highlighting with *stars* :"
 msgstr	"*tärnidega* esiletõstmise värv     :"
 
-#: src/lang.c:1885
+#: src/lang.c:1880
 msgid	"# Color of word highlighting. There are four possibilities\n"
 	"# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n"
 msgstr	"# Sõnade esiletõstmise värv. Artiklites saab kasutada nelja võimalust:\n"
 	"# *tärnid*, /kaldkriipsud/, _alakriipsud_ ja -kriipsud-.\n"
 
-#: src/lang.c:1891
+#: src/lang.c:1886
 msgid	"Color of highlighting with _dash_  :"
 msgstr	"_alakriipsudega_ esiletõstmise värv:"
 
 # TRANSLATION TOO LONG
-#: src/lang.c:1897
+#: src/lang.c:1892
 msgid	"Color of highlighting with /slash/ :"
 msgstr	"/Kaldkriipsudega/ esiletõstmise värv:"
 
-#: src/lang.c:1903
+#: src/lang.c:1898
 msgid	"Color of highlighting with -stroke-:"
 msgstr	"-Kriipsudega- esiletõstmise värv   :"
 
-#: src/lang.c:1910
+#: src/lang.c:1905
 msgid	"Attr. of highlighting with *stars* :"
 msgstr	"*tärnidega* esiletõstmise atribuut :"
 
-#: src/lang.c:1911
+#: src/lang.c:1906
 msgid	"# Attribute of word highlighting on mono terminals.\n"
 	"# There are four possibilities in articles:\n"
 	"# *stars*, /slashes/, _underdashes_ and -strokes-.\n"
@@ -5211,32 +5231,32 @@ msgstr	"# Sõnade esiletõstmise atribuut 
 	"# 0 - Tavaline, 1 - Allajoonitud, 2 - Parim esiletõstmine,\n"
 	"# 3 - Pööratud video, 4 - Plinkiv, 5 - Poolhele, 6 - Paks\n"
 
-#: src/lang.c:1921
+#: src/lang.c:1916
 msgid	"Attr. of highlighting with _dash_  :"
 msgstr	"_alakriipsudega_ esiletõstmise atr.:"
 
 # TRANSLATION TOO LONG
-#: src/lang.c:1927
+#: src/lang.c:1922
 msgid	"Attr. of highlighting with /slash/ :"
 msgstr	"/Kaldkriipsudega/ esiletõstmise atr.:"
 
-#: src/lang.c:1933
+#: src/lang.c:1928
 msgid	"Attr. of highlighting with -stroke-:"
 msgstr	"-Kriipsudega- esiletõstmise atr.   :"
 
-#: src/lang.c:1939
+#: src/lang.c:1934
 msgid	"Word highlighting in message body  :"
 msgstr	"Sõnade esiletõstmine teate kehas   :"
 
-#: src/lang.c:1940
+#: src/lang.c:1935
 msgid	"# Enable word highlighting?\n"
 msgstr	"# Lubada sõnade esiletõstmine?\n"
 
-#: src/lang.c:1945
+#: src/lang.c:1940
 msgid	"What to display instead of mark    :"
 msgstr	"Mida näidata märgi asemel          :"
 
-#: src/lang.c:1946
+#: src/lang.c:1941
 msgid	"# Should the leading and ending stars and dashes also be displayed,\n"
 	"# even when they are highlighting marks?\n"
 	"# 0 - no    1 - yes, display mark    2 - print a space instead\n"
@@ -5244,55 +5264,55 @@ msgstr	"# Kas näidata algavaid ja lõppev
 	"# isegi, kui need on ka esiletõstmise märgid?\n"
 	"# 0 - ei    1 - jah, näita märki    2 - trüki hoopis tühik\n"
 
-#: src/lang.c:1952
+#: src/lang.c:1947
 msgid	"Enter column number to wrap article lines to in the pager. <CR> sets."
 msgstr	"Sisestage veerg, millelt lehitseja hakkab ridu murdma. <CR> seab."
 
-#: src/lang.c:1953
+#: src/lang.c:1948
 msgid	"Page line wrap column              :"
 msgstr	"Rea murdmise veerg lehitsejas      :"
 
-#: src/lang.c:1954
+#: src/lang.c:1949
 msgid	"# Wrap article lines at column\n"
 msgstr	"# Murra artikli read antud veerus\n"
 
-#: src/lang.c:1959
+#: src/lang.c:1954
 msgid	"Wrap around threads on next unread :"
 msgstr	"Liigu lugemata art-le ümber teemade:"
 
-#: src/lang.c:1960
+#: src/lang.c:1955
 msgid	"# If ON wrap around threads on searching next unread article\n"
 msgstr	"# Kui väärtus on ON, liigu lugemata artiklite otsingul ümber teemade\n"
 
-#: src/lang.c:1964
+#: src/lang.c:1959
 msgid	"Enter default mail address (and fullname). <CR> sets."
 msgstr	"Sisestage oma e-posti aadress (ja oma nimi). <CR> seab."
 
-#: src/lang.c:1965
+#: src/lang.c:1960
 msgid	"Mail address (and fullname)        :"
 msgstr	"E-posti aadress (ja teie nimi)     :"
 
-#: src/lang.c:1966
+#: src/lang.c:1961
 msgid	"# User's mail address (and fullname), if not username@host (fullname)\n"
 msgstr	"# Kasutaja e-posti aadress (ja nimi), kui ei ole kasutaja@host (nimi)\n"
 
-#: src/lang.c:1971
+#: src/lang.c:1966
 msgid	"Show empty Followup-To in editor   :"
 msgstr	"Näita toimetis tühja Followup-To   :"
 
-#: src/lang.c:1972
+#: src/lang.c:1967
 msgid	"# If ON show empty Followup-To header when editing an article\n"
 msgstr	"# Kui väärtus on ON, näita artikli toimetamisel tühja Followup-To rida\n"
 
-#: src/lang.c:1976
+#: src/lang.c:1971
 msgid	"Enter path/! command/--none to create your default signature. <CR> sets."
 msgstr	"Sisestage tee/! käsk/--none, et luua oma vaikimisi signatuur. <CR> seab."
 
-#: src/lang.c:1977
+#: src/lang.c:1972
 msgid	"Create signature from path/command :"
 msgstr	"Signatuuri loomiseks tee/käsk      :"
 
-#: src/lang.c:1978
+#: src/lang.c:1973
 msgid	"# Signature path (random sigs)/file to be used when posting/replying\n"
 	"# default_sigfile=file       appends file as signature\n"
 	"# default_sigfile=!command   executes external command to generate a "
@@ -5303,49 +5323,49 @@ msgstr	"# Postitamisel/vastamisel kasuta
 	"# default_sigfile=!käsk      käivitab käsu, mis genereerib signatuuri\n"
 	"# default_sigfile=--none     ära lisa signatuuri\n"
 
-#: src/lang.c:1985
+#: src/lang.c:1980
 msgid	"Prepend signature with \"-- \" on own line. <SPACE> toggles & <CR> sets."
 msgstr	"Signatuurile eelnevale reale \"-- \". <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:1986
+#: src/lang.c:1981
 msgid	"Prepend signature with \"-- \"       :"
 msgstr	"Lisa signatuuri ette \"-- \"         :"
 
-#: src/lang.c:1987
+#: src/lang.c:1982
 msgid	"# If ON prepend the signature with dashes '\\n-- \\n'\n"
 msgstr	"# Kui väärtus on ON, lisa signatuuri ette '\\n-- \\n'\n"
 
-#: src/lang.c:1991
+#: src/lang.c:1986
 msgid	"Add signature when reposting articles. <SPACE> toggles & <CR> sets."
 msgstr	"Lisa artikli uuestipostitamisel signatuur. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:1992
+#: src/lang.c:1987
 msgid	"Add signature when reposting       :"
 msgstr	"Lisa uuestipostitusel signatuur    :"
 
-#: src/lang.c:1993
+#: src/lang.c:1988
 msgid	"# If ON add signature to reposted articles\n"
 msgstr	"# Kui väärtus on ON, lisa uuestipostitatud artiklile signatuur\n"
 
-#: src/lang.c:1997
+#: src/lang.c:1992
 msgid	"Enter quotation marks, %s or %S for author's initials."
 msgstr	"Sisestage tsitaadimärgid, %s või %S annab autori initsiaalid."
 
-#: src/lang.c:1998
+#: src/lang.c:1993
 msgid	"Characters used as quote-marks     :"
 msgstr	"Tsiteerimise märgid                :"
 
-#: src/lang.c:1999
+#: src/lang.c:1994
 msgid	"# Characters used in quoting to followups and replies.\n"
 	"# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n"
 msgstr	"# Sümbolid, mida kasutada tsiteerimisel vastustes.\n"
 	"# '_' asendatakse tühikuga ' ', %%s, %%S asendatakse autori initsiaalidega.\n"
 
-#: src/lang.c:2005
+#: src/lang.c:2000
 msgid	"Quoting behavior                   :"
 msgstr	"Käitumine tsiteerimisel            :"
 
-#: src/lang.c:2006
+#: src/lang.c:2001
 msgid	"# How quoting should be handled when following up or replying.\n"
 	"# 0 = Nothing special\n"
 	"# 1 = Compress quotes\n"
@@ -5365,15 +5385,15 @@ msgstr	"# Kuidas käsitleda vastamisel ts
 	"# 6 = Tsiteeri allkirju, tsiteeri tühje ridu\n"
 	"# 7 = Tihenda tsitaadid, tsiteeri allkirju, tsiteeri tühje ridu\n"
 
-#: src/lang.c:2018 src/lang.c:2026 src/lang.c:2032
+#: src/lang.c:2013 src/lang.c:2021 src/lang.c:2027
 msgid	"%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name"
 msgstr	"%A Aadr. %D Kuup. %F Aadr.+Nimi %G Grupp %M Message-ID %N Nimi %C Eesnimi"
 
-#: src/lang.c:2019
+#: src/lang.c:2014
 msgid	"Quote line when following up       :"
 msgstr	"Tsiteerimise rida vastamisel       :"
 
-#: src/lang.c:2020
+#: src/lang.c:2015
 msgid	"# Format of quote line when mailing/posting/following-up an article\n"
 	"# %%A Address    %%D Date   %%F Addr+Name   %%G Groupname   %%M Message-ID\n"
 	"# %%N Full Name  %%C First Name   %%I Initials\n"
@@ -5381,35 +5401,35 @@ msgstr	"# Tsiteeriva rea vorming artikli
 	"# %%A Aadress    %%D Kuup   %%F Aadr+Nimi   %%G Grupp   %%M Message-ID\n"
 	"# %%N Täielik nimi  %%C Eesnimi   %%I Initsiaalid\n"
 
-#: src/lang.c:2027
+#: src/lang.c:2022
 msgid	"Quote line when cross-posting      :"
 msgstr	"Tsiteerimise rida ristpostitusel   :"
 
-#: src/lang.c:2033
+#: src/lang.c:2028
 msgid	"Quote line when mailing            :"
 msgstr	"Tsiteerimise rida kirjutamisel     :"
 
-#: src/lang.c:2038
+#: src/lang.c:2033
 msgid	"If ON, include User-Agent: header. <SPACE> toggles & <CR> sets."
 msgstr	"Kasuta User-Agent: päiserida. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:2039
+#: src/lang.c:2034
 msgid	"Insert 'User-Agent:'-header        :"
 msgstr	"Sisestage 'User-Agent:'-päis       :"
 
-#: src/lang.c:2040
+#: src/lang.c:2035
 msgid	"# If ON include advertising User-Agent: header\n"
 msgstr	"# Kui väärtus on ON, lisa artikli päisesse User-Agent: rida\n"
 
-#: src/lang.c:2044
+#: src/lang.c:2039
 msgid	"Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), <CR> to set."
 msgstr	"Sisestage MIME kooditabeli nimi (n. US-ASCII, ISO-8859-15, EUC-KR), <CR> seab."
 
-#: src/lang.c:2045
+#: src/lang.c:2040
 msgid	"MM_CHARSET                         :"
 msgstr	"MM_CHARSET                         :"
 
-#: src/lang.c:2046
+#: src/lang.c:2041
 msgid	"# Charset supported locally which is also used for MIME header and\n"
 	"# Content-Type header.\n"
 	"# If not set, the value of the environment variable MM_CHARSET is used.\n"
@@ -5425,27 +5445,27 @@ msgstr	"# Lokaalselt toetatud kooditabel
 	"# loetakse mm_charset väärtusest erinev kooditabel mitte-näidatavaks\n"
 	"# ja näitamisel kasutatakse '?'.\n"
 
-#: src/lang.c:2057
+#: src/lang.c:2052
 msgid	"MM_NETWORK_CHARSET                 :"
 msgstr	"MM_NETWORK_CHARSET                 :"
 
-#: src/lang.c:2058
+#: src/lang.c:2053
 msgid	"# Charset used for MIME (Content-Type) header in postings.\n"
 msgstr	"# Postituste MIME (Content-Type) päises kasutatav kooditabel.\n"
 
-#: src/lang.c:2064
+#: src/lang.c:2059
 msgid	"Mailbox format                     :"
 msgstr	"Kirjade kataloog                   :"
 
-#: src/lang.c:2065
+#: src/lang.c:2060
 msgid	"# Format of the mailbox.\n"
 msgstr	"# Kirjade kataloog.\n"
 
-#: src/lang.c:2070
+#: src/lang.c:2065
 msgid	"MIME encoding in news messages     :"
 msgstr	"Kasuta artiklites MIME kodeerimist :"
 
-#: src/lang.c:2071
+#: src/lang.c:2066
 msgid	"# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n"
 	"# for mails and posts, if necessary. QP is efficient for most European\n"
 	"# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n"
@@ -5457,15 +5477,15 @@ msgstr	"# Vajadusel kirjade ja artiklite
 	"# Base64 on kasulik enamuse 8 bitistele ida-aasia, kreeka ja vene\n"
 	"# kooditabelitele, kus kasutatakse palju 8 bitiseid sümboleid.\n"
 
-#: src/lang.c:2079 src/lang.c:2100
+#: src/lang.c:2074 src/lang.c:2095
 msgid	"Don't change unless you know what you are doing. <ESC> cancels."
 msgstr	"Ärge muutke, kui te ei tea, mida teete. <ESC> katkestab."
 
-#: src/lang.c:2080
+#: src/lang.c:2075
 msgid	"Use 8bit characters in news headers:"
 msgstr	"Kasuta artikli päises 8bit tähti   :"
 
-#: src/lang.c:2081
+#: src/lang.c:2076
 msgid	"# If ON, 8bit characters in news headers are NOT encoded.\n"
 	"# default is OFF. Thus 8bit characters are encoded by default.\n"
 	"# 8bit chars in header are encoded regardless of the value of this\n"
@@ -5475,28 +5495,28 @@ msgstr	"# Kui väärtus on ON, 8bit sümbol
 	"# 8bit sümbolid päistes kodeeritakse sõltumata selle parameetri väärtusest,\n"
 	"# v.a. juhul, kui post_mime_encoding väärtus on samuti 8bit.\n"
 
-#: src/lang.c:2088
+#: src/lang.c:2083
 msgid	"Auto-view post-processed files <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	"Vaata töödeldud faile automaatselt <TÜHIK> lülitab, <CR> seab, <ESC> "
 	"katkestab."
 
-#: src/lang.c:2089
+#: src/lang.c:2084
 msgid	"View post-processed files          :"
 msgstr	"Vaata töödeldud faile              :"
 
-#: src/lang.c:2090
+#: src/lang.c:2085
 msgid	"# If set, post processed files will be opened in a viewer\n"
 msgstr	"# Kui on seatud, avatakse töödeldud fail vaatamiseks\n"
 
-#: src/lang.c:2095
+#: src/lang.c:2090
 msgid	"MIME encoding in mail messages     :"
 msgstr	"Kasuta kirjades MIME kodeerimist   :"
 
-#: src/lang.c:2101
+#: src/lang.c:2096
 msgid	"Use 8bit characters in mail headers:"
 msgstr	"Kasuta kirja päises 8bit tähti     :"
 
-#: src/lang.c:2102
+#: src/lang.c:2097
 msgid	"# If ON, 8bit characters in mail headers are NOT encoded.\n"
 	"# default is OFF. Thus 8bit characters are encoded by default.\n"
 	"# 8bit chars in headers are encoded regardless of the value of this "
@@ -5511,24 +5531,24 @@ msgstr	"# Kui väärtus on ON, 8bit sümbol
 	"# et RFC 2822 keelab 8bit sümbolid kirjade päistes, seega selle\n"
 	"# parameetri väärtus ON ei ole soovitatav kasutada.\n"
 
-#: src/lang.c:2112
+#: src/lang.c:2107
 msgid	"Strip blanks of end of lines       :"
 msgstr	"Eemalda tühikud realõppudest       :"
 
-#: src/lang.c:2113
+#: src/lang.c:2108
 msgid	"# If ON strip blanks from end of lines to speedup display on slow terminals\n"
 msgstr	"# Kui väärtus on ON, eemalda aeglaste terminalise töö kiirendamiseks\n"
 	"# realõppudest tühikud\n"
 
-#: src/lang.c:2118
+#: src/lang.c:2113
 msgid	"If ON, use transliteration. <SPACE> toggles & <CR> sets."
 msgstr	"Kui väärtus on ON, kasuta transliteratsiooni. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:2119
+#: src/lang.c:2114
 msgid	"Transliteration                    :"
 msgstr	"Transliteratsioon                  :"
 
-#: src/lang.c:2120
+#: src/lang.c:2115
 msgid	"# If ON, use //TRANSLIT extension. This means that when a character cannot\n"
 	"# be represented in the in the target character set, it can be approximated\n"
 	"# through one or several similarly looking characters.\n"
@@ -5537,245 +5557,245 @@ msgstr	"# Kui väärtus on ON, kasuta //TR
 	"kasutades\n"
 	"# üht või enamat sarnast sümbolit.\n"
 
-#: src/lang.c:2127
+#: src/lang.c:2122
 msgid	"Send you a carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr	"Saada kasutajale automaatselt koopia. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:2128
+#: src/lang.c:2123
 msgid	"Send you a cc automatically        :"
 msgstr	"Saada automaatselt koopia          :"
 
-#: src/lang.c:2129
+#: src/lang.c:2124
 msgid	"# If ON automatically put your name in the Cc: field when mailing an article\n"
 msgstr	"# Kui väärtus on ON, pane kasutaja nimi artikli saatmisel automaatselt\n"
 	"# Cc: reale\n"
 
-#: src/lang.c:2133
+#: src/lang.c:2128
 msgid	"Send you a blind carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr	"Saada automaatselt pimekoopia. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:2134
+#: src/lang.c:2129
 msgid	"Send you a blind cc automatically  :"
 msgstr	"Saada automaatselt pimekoopia      :"
 
-#: src/lang.c:2135
+#: src/lang.c:2130
 msgid	"# If ON automatically put your name in the Bcc: field when mailing an "
 	"article\n"
 msgstr	"# Kui väärtus on ON, pane kasutaja nimi artikli saatmisel automaatselt\n"
 	"# Bcc: väljale\n"
 
-#: src/lang.c:2139
+#: src/lang.c:2134
 msgid	"Enter address elements about which you want to be warned. <CR> sets."
 msgstr	"Sisestage aadressi komponendid, mille eest peaks hoiatama. <CR> seab."
 
-#: src/lang.c:2140
+#: src/lang.c:2135
 msgid	"Spamtrap warning address parts     :"
 msgstr	"Rämpsposti hoiatus aadressi osadele:"
 
-#: src/lang.c:2141
+#: src/lang.c:2136
 msgid	"# A comma-delimited list of address-parts you want to be warned\n"
 	"# about when trying to reply by email.\n"
 msgstr	"# Komaga eraldatud aadresside komponentide loend, mille kasutamisel\n"
 	"# tuleks kasutajat hoiatada.\n"
 
-#: src/lang.c:2146
+#: src/lang.c:2141
 msgid	"Enter default number of days a filter entry will be valid. <CR> sets."
 msgstr	"Sisestage kirje kehtivuse aeg päevades. <CR> seab."
 
-#: src/lang.c:2147
+#: src/lang.c:2142
 msgid	"No. of days a filter entry is valid:"
 msgstr	"Filtri kehtivus päevades           :"
 
-#: src/lang.c:2148
+#: src/lang.c:2143
 msgid	"# Number of days a short term filter will be active\n"
 msgstr	"# lühiajalise filtri kehtivus päevades\n"
 
-#: src/lang.c:2152
+#: src/lang.c:2147
 msgid	"Add posted articles to filter. <SPACE> toggles & <CR> sets."
 msgstr	"Lisage postitatud artikkel filtrisse. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:2153
+#: src/lang.c:2148
 msgid	"Add posted articles to filter      :"
 msgstr	"Lisage postitatud artikkel filtrile:"
 
-#: src/lang.c:2154
+#: src/lang.c:2149
 msgid	"# If ON add posted articles which start a new thread to filter for\n"
 	"# highlighting follow-ups\n"
 msgstr	"# Kui väärtus on ON, lisa postitatud artiklid, mis alustavad uut teemat,\n"
 	"# filtrile, mis märgistab vastuseid\n"
 
-#: src/lang.c:2158
+#: src/lang.c:2153
 msgid	"The directory where articles/threads are to be saved in mailbox format."
 msgstr	"Kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis."
 
-#: src/lang.c:2159
+#: src/lang.c:2154
 msgid	"Mail directory                     :"
 msgstr	"Kirjade kataloog                   :"
 
-#: src/lang.c:2160
+#: src/lang.c:2155
 msgid	"# (-m) directory where articles/threads are saved in mailbox format\n"
 msgstr	"# (-m) kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis\n"
 
-#: src/lang.c:2165
+#: src/lang.c:2160
 msgid	"Save articles in batch mode (-S)   :"
 msgstr	"Salvesta artiklid pakettmoodis (-S):"
 
-#: src/lang.c:2166
+#: src/lang.c:2161
 msgid	"# If ON articles/threads will be saved in batch mode when save -S\n"
 	"# or mail (-M/-N) is specified on the command line\n"
 msgstr	"# Kui väärtus on ON, artiklid salvestatakse pakettmoodis, kui käsureal\n"
 	"# on kasutatud võtmeid salvestamiseks -S või saatmiseks -M, -N\n"
 
-#: src/lang.c:2171
+#: src/lang.c:2166
 msgid	"The directory where you want articles/threads saved."
 msgstr	"Kataloog, kuhu te soovite artikleid salvestada."
 
-#: src/lang.c:2172
+#: src/lang.c:2167
 msgid	"Directory to save arts/threads in  :"
 msgstr	"Kataloog artiklite salvestamiseks  :"
 
-#: src/lang.c:2173
+#: src/lang.c:2168
 msgid	"# Directory where articles/threads are saved\n"
 msgstr	"# Kataloog, kuhu salvestatakse artiklid/teemad\n"
 
-#: src/lang.c:2177
+#: src/lang.c:2172
 msgid	"Auto save article/thread by Archive-name: header. <SPACE> toggles & <CR> sets."
 msgstr	"Salvesta artiklid Archive-name: päiserea järgi. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:2178
+#: src/lang.c:2173
 msgid	"Use Archive-name: header for save  :"
 msgstr	"Kasuta salvestamisel Archive-name: :"
 
-#: src/lang.c:2179
+#: src/lang.c:2174
 msgid	"# If ON articles/threads with Archive-name: in mail header will\n"
 	"# be automatically saved with the Archive-name & part/patch no.\n"
 msgstr	"# Kui väärtus on ON, salvestatakse artiklid/teemad, mis omavad päiserida\n"
 	"# Archive-name:, automaatselt selle reaga määratud nime ja osa numbriga.\n"
 
-#: src/lang.c:2184
+#: src/lang.c:2179
 msgid	"Mark saved articles/threads as read. <SPACE> toggles, <CR> sets, <ESC> "
 	"cancels."
 msgstr	"Märgi salvestatud artiklid loetuks. <TÜHIK> lülitab, <CR> seab, <ESC> "
 	"katkestab."
 
-#: src/lang.c:2185
+#: src/lang.c:2180
 msgid	"Mark saved articles/threads as read:"
 msgstr	"Märgi salvestatud artiklid loetuks :"
 
-#: src/lang.c:2186
+#: src/lang.c:2181
 msgid	"# If ON mark articles that are saved as read\n"
 msgstr	"# Kui väärtus on ON, märgi salvestatud artiklid loetuks\n"
 
-#: src/lang.c:2190
+#: src/lang.c:2185
 msgid	"Do post processing (eg. extract attachments) for saved articles."
 msgstr	"Teosta salvestatud artiklitel järeltöötlemist (nt. lisade eraldamist)."
 
-#: src/lang.c:2191
+#: src/lang.c:2186
 msgid	"Post process saved articles        :"
 msgstr	"Salvestatud artikl. järeltöötlemine:"
 
-#: src/lang.c:2192
+#: src/lang.c:2187
 msgid	"# Perform post processing (saving binary attachments) from saved articles.\n"
 	"# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n"
 msgstr	"# Teosta salvestatud artiklite järeltöötlemist (lisade eraldamine).\n"
 	"# 0=(ei) 1=(jah) 2=(eralda ainult shelli arhiivid (shar))\n"
 
-#: src/lang.c:2198
+#: src/lang.c:2193
 msgid	"Process only unread articles       :"
 msgstr	"Töötle ainult lugemata artikleid   :"
 
-#: src/lang.c:2199
+#: src/lang.c:2194
 msgid	"# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n"
 msgstr	"# Kui väärtus on ON, salvesta/trüki/torusse/saada lugemata artikleid\n"
 	"# (eeldatakse märgitud artikleid).\n"
 
-#: src/lang.c:2204
+#: src/lang.c:2199
 msgid	"Print all or just part of header. <SPACE> toggles & <CR> sets."
 msgstr	"Trüki kõik või ainult osa päisest. <TÜHIK> lülitab, <CR> seab."
 
-#: src/lang.c:2205
+#: src/lang.c:2200
 msgid	"Print all headers when printing    :"
 msgstr	"Trükkimisel trüki kõik päised      :"
 
-#: src/lang.c:2206
+#: src/lang.c:2201
 msgid	"# If ON print all of article header otherwise just the important lines\n"
 msgstr	"# Kui väärtus on ON, trüki kogu artikli päis, muidu ainult tähtsamad read\n"
 
-#: src/lang.c:2210
+#: src/lang.c:2205
 msgid	"The printer program with options that is to be used to print articles/threads."
 msgstr	"Programm koos argumentidega, mida kasutatakse artiklite/teemade trükkimiseks."
 
-#: src/lang.c:2211
+#: src/lang.c:2206
 msgid	"Printer program with options       :"
 msgstr	"Trükikäsk koos võtmetega           :"
 
-#: src/lang.c:2212
+#: src/lang.c:2207
 msgid	"# Print program with parameters used to print articles/threads\n"
 msgstr	"# Programm koos argumentidega, mida kasutatakse artiklite/teemade "
 	"trükkimiseks\n"
 
-#: src/lang.c:2218
+#: src/lang.c:2213
 msgid	"Force redraw after certain commands:"
 msgstr	"Värskenda ekraani peale käske      :"
 
-#: src/lang.c:2219
+#: src/lang.c:2214
 msgid	"# If ON a screen redraw will always be done after certain external commands\n"
 msgstr	"# Kui väärtus on ON, värskendatakse alati peale teatud väliseid käske "
 	"ekraani\n"
 
-#: src/lang.c:2223
+#: src/lang.c:2218
 msgid	"Start editor with line offset. <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	"Käivita tekstitoimeti etteantud real. <TÜHIK> lülitab, <CR> seab, <ESC> "
 	"katkestab."
 
-#: src/lang.c:2224
+#: src/lang.c:2219
 msgid	"Start editor with line offset      :"
 msgstr	"Käivita tekstitoimeti reanumbril   :"
 
-#: src/lang.c:2225
+#: src/lang.c:2220
 msgid	"# If ON editor will be started with cursor offset into the file\n"
 	"# otherwise the cursor will be positioned at the first line\n"
 msgstr	"# Kui väärtus on ON, käivitatakse tekstitoimeti kursori paigutamisega\n"
 	"# vastavale reale. Vastasel korral positsioneeritakse kursor esimesele reale\n"
 
-#: src/lang.c:2230
+#: src/lang.c:2225
 msgid	"Enter %E for editor, %F for filename, %N for line-number, <CR> to set."
 msgstr	"Kasutage %E toimeti kohal, %F failinime kohal, %N reanumbrina, <CR> seab."
 
-#: src/lang.c:2231
+#: src/lang.c:2226
 msgid	"Invocation of your editor          :"
 msgstr	"Teie tekstitoimeti                 :"
 
-#: src/lang.c:2232
+#: src/lang.c:2227
 msgid	"# Format of editor line including parameters\n"
 	"# %%E Editor  %%F Filename  %%N Linenumber\n"
 msgstr	"# Tekstitoimeti rea formaat koos parameetritega\n"
 	"# %%E Toimeti  %%F Failinimi  %%N Reanumber\n"
 
-#: src/lang.c:2237
+#: src/lang.c:2232
 msgid	"Enter name and options for external-inews, --internal for internal inews"
 msgstr	"Sisestage välise inews käsu nimi ja võtmed, sisemise valib --internal"
 
-#: src/lang.c:2238
+#: src/lang.c:2233
 msgid	"External inews                     :"
 msgstr	"Väline inews                       :"
 
-#: src/lang.c:2239
+#: src/lang.c:2234
 msgid	"# If --internal use the built in mini inews for posting via NNTP\n"
 	"# otherwise use an external inews program\n"
 msgstr	"# Kui on --internal, kasuta NNTP postitustel sisseehitatud inews käsku\n"
 	"# muidu kasuta välist inews programmi\n"
 
-#: src/lang.c:2243
+#: src/lang.c:2238
 msgid	"Enter %M for mailer, %S for subject, %T for to, %F for filename, <CR> to set."
 msgstr	"Kasutage %M programmi kohal, %S teema kohal, %T saaja kohal, %F failinime "
 	"kohal, <CR> seab."
 
-#: src/lang.c:2244
+#: src/lang.c:2239
 msgid	"Invocation of your mail command    :"
 msgstr	"Teie e-posti käsk                  :"
 
-#: src/lang.c:2245
+#: src/lang.c:2240
 msgid	"# Format of mailer line including parameters\n"
 	"# %%M Mailer  %%S Subject  %%T To  %%F Filename  %%U User (AmigaDOS)\n"
 	"# ie. to use elm as your mailer:    elm -s \"%%S\" \"%%T\" < %%F\n"
@@ -5785,11 +5805,11 @@ msgstr	"# e-posti saatja käsurea formaat
 	"# näiteks. kasutada saatjana elm programmi:    elm -s \"%%S\" \"%%T\" < %%F\n"
 	"# näiteks. elm interaktiivses moodis      :    elm -i %%F -s \"%%S\" \"%%T\"\n"
 
-#: src/lang.c:2253
+#: src/lang.c:2248
 msgid	"Use interactive mail reader        :"
 msgstr	"Kasuta interaktiivset e-posti      :"
 
-#: src/lang.c:2254
+#: src/lang.c:2249
 msgid	"# Interactive mailreader: if ON mailreader will be invoked earlier for\n"
 	"# reply so you can use more of its features (eg. MIME, pgp, ...)\n"
 	"# this option has to suit default_mailer_format\n"
@@ -5798,344 +5818,344 @@ msgstr	"# Interaktiivne e-posti lugeja: 
 	"# lisavõimalusi (MIME, pgp, ...)\n"
 	"# see omadus kasutab default_mailer_format väärtust\n"
 
-#: src/lang.c:2261
+#: src/lang.c:2256
 msgid	"Remove ~/.article after posting    :"
 msgstr	"Eemalda ~/.article peale postitust :"
 
-#: src/lang.c:2262
+#: src/lang.c:2257
 msgid	"# If ON remove ~/.article after posting.\n"
 msgstr	"# Kui väärtus on ON, kustuta  ~/.article peale postitust.\n"
 
-#: src/lang.c:2266
+#: src/lang.c:2261
 msgid	"Filename for all posted articles, <CR> sets, no filename=do not save."
 msgstr	"Failinimi postitatud artiklitele. <CR> seab. Nime puudumisel ei salvestata."
 
-#: src/lang.c:2267
+#: src/lang.c:2262
 msgid	"Filename for posted articles       :"
 msgstr	"Failinimi postitatud artiklitele   :"
 
-#: src/lang.c:2268
+#: src/lang.c:2263
 msgid	"# Filename where to keep all postings (default posted)\n"
 	"# If no filename is set then postings will not be saved\n"
 msgstr	"# Failinimi, kus hoida kõiki postitusi (vaikimisi posted)\n"
 	"# Kui nime pole, siis postitusi ei salvestata\n"
 
-#: src/lang.c:2273
+#: src/lang.c:2268
 msgid	"Keep all failed articles in ~/dead.articles. <SPACE> toggles & <CR> sets."
 msgstr	"Hoia ebaõnnestunud postitused failis ~/dead.articles. <TÜHIK> lülitab ja <CR> "
 	"seab."
 
-#: src/lang.c:2274
+#: src/lang.c:2269
 msgid	"Keep failed arts in ~/dead.articles:"
 msgstr	"Vigased artiklid ~/dead.articles   :"
 
-#: src/lang.c:2275
+#: src/lang.c:2270
 msgid	"# If ON keep all failed postings in ~/dead.articles\n"
 msgstr	"# Kui väärtus on ON, hoia ebaõnnestunud postitused failis ~/dead.articles\n"
 
-#: src/lang.c:2279
+#: src/lang.c:2274
 msgid	"Do you want to strip unsubscribed groups from .newsrc"
 msgstr	"Kas te soovite eemaldada tellimata grupid .newsrc failist"
 
-#: src/lang.c:2280
+#: src/lang.c:2275
 msgid	"No unsubscribed groups in newsrc   :"
 msgstr	"newsrcs ainult tellitud grupid     :"
 
-#: src/lang.c:2281
+#: src/lang.c:2276
 msgid	"# If ON strip unsubscribed groups from newsrc\n"
 msgstr	"# Kui väärtus on ON, eemalda tellimata grupid newsrc failist\n"
 
-#: src/lang.c:2286
+#: src/lang.c:2281
 msgid	"Remove bogus groups from newsrc    :"
 msgstr	"Eemalda olematud grupid newsrcst   :"
 
-#: src/lang.c:2287
+#: src/lang.c:2282
 msgid	"# What to do with bogus groups in newsrc file\n"
 	"# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n"
 msgstr	"# Mida teha olematute gruppidega newsrc failis\n"
 	"# 0 =(Hoia alles) 1=(Eemalda) 2=(Märgi valikuekraanil D lipuga).\n"
 
-#: src/lang.c:2291
+#: src/lang.c:2286
 msgid	"Enter number of seconds until active file will be reread. <CR> sets."
 msgstr	"Sisestage aktiivsete faili lugemise intervall sekundites. <CR> seab."
 
-#: src/lang.c:2292
+#: src/lang.c:2287
 msgid	"Interval in secs to reread active  :"
 msgstr	"Aktiivsete faili lugemise intervall:"
 
-#: src/lang.c:2293
+#: src/lang.c:2288
 msgid	"# Time interval in seconds between rereading the active file (0=never)\n"
 msgstr	"# Aktiivsete faili lugemise intervall (0 = ei loe)\n"
 
-#: src/lang.c:2298
+#: src/lang.c:2293
 msgid	"Reconnect to server automatically  :"
 msgstr	"Taasta automaatselt NNTP ühendus   :"
 
-#: src/lang.c:2299
+#: src/lang.c:2294
 msgid	"# If ON automatically reconnect to NNTP server if the connection is broken\n"
 msgstr	"# Kui väärtus on ON, ürita NNTP serveriga ühenduse katkemisel ühendust\n"
 	"# automaatselt taastada\n"
 
-#: src/lang.c:2303
+#: src/lang.c:2298
 msgid	"Create local copies of NNTP overview files. <SPACE> toggles & <CR> sets."
 msgstr	"Loo NNTP overview failidest lokaalne koopia. <TÜHIK> lülitab ja <CR> seab."
 
-#: src/lang.c:2304
+#: src/lang.c:2299
 msgid	"Cache NNTP overview files locally  :"
 msgstr	"Puhverda NNTP overview lokaalselt  :"
 
-#: src/lang.c:2305
+#: src/lang.c:2300
 msgid	"# If ON, create local copies of NNTP overview files.\n"
 msgstr	"# Kui väärtus on ON, loo NNTP overview failidest lokaalsed koopiad.\n"
 
-#: src/main.c:627
+#: src/main.c:619
 #, c-format
 msgid	"Version: %s release %s (\"%s\") %s %s"
 msgstr	"Versioon: %s väljalase %s (\"%s\") %s %s"
 
-#: src/main.c:630
+#: src/main.c:622
 #, c-format
 msgid	"Version: %s release %s (\"%s\")"
 msgstr	"Versioon: %s väljalase %s (\"%s\")"
 
-#: src/nntplib.c:795
+#: src/nntplib.c:804
 #, c-format
 msgid	"\n"
 	"Server timed out, trying reconnect # %d\n"
 msgstr	"\n"
 	"Ühendus serveriga aegus, proovin taastada, katse %d\n"
 
-#: src/nntplib.c:813
+#: src/nntplib.c:822
 msgid	"Rejoin current group\n"
 msgstr	"Taasühinen jooksva grupiga\n"
 
-#: src/nntplib.c:820
+#: src/nntplib.c:829
 #, c-format
 msgid	"Read (%s)\n"
 msgstr	"Lugesin (%s)\n"
 
-#: src/nntplib.c:822
+#: src/nntplib.c:831
 #, c-format
 msgid	"Resend last command (%s)\n"
 msgstr	"Saada viimane käsk uuesti (%s)\n"
 
-#: src/nntplib.c:942
+#: src/nntplib.c:951
 msgid	"100  Help text on way"
 msgstr	"100  Abitekst on tulemas"
 
-#: src/nntplib.c:946
+#: src/nntplib.c:955
 msgid	"180  Authorization capabilities"
 msgstr	"180  Autoriseerimis võimalused"
 
-#: src/nntplib.c:950
+#: src/nntplib.c:959
 msgid	"199  Debug output"
 msgstr	"199  Silumise väljund"
 
-#: src/nntplib.c:954
+#: src/nntplib.c:963
 msgid	"200  Hello; you can post"
 msgstr	"200  Tere; te võite postitada"
 
-#: src/nntplib.c:958
+#: src/nntplib.c:967
 msgid	"201  Hello; you can't post"
 msgstr	"200  Tere; te ei saa postitada"
 
-#: src/nntplib.c:962
+#: src/nntplib.c:971
 msgid	"202  Slave status noted"
 msgstr	"202  Alamserveri olek teadustatud"
 
-#: src/nntplib.c:970
+#: src/nntplib.c:979
 msgid	"211  Group selected"
 msgstr	"211  Grupp valitud"
 
-#: src/nntplib.c:975
+#: src/nntplib.c:984
 msgid	"215  Newsgroups follow"
 msgstr	"215  Grupid järgnevad"
 
-#: src/nntplib.c:980
+#: src/nntplib.c:989
 msgid	"218  Group index file follows"
 msgstr	"218  Grupi indeksfail järgneb"
 
-#: src/nntplib.c:985
+#: src/nntplib.c:994
 msgid	"220  Article (head & body) follows"
 msgstr	"220  Artikkel (päis ja keha) järgneb"
 
-#: src/nntplib.c:989
+#: src/nntplib.c:998
 msgid	"221  Head follows"
 msgstr	"221  Päis järgneb"
 
-#: src/nntplib.c:993
+#: src/nntplib.c:1002
 msgid	"222  Body follows"
 msgstr	"222  Keha järgneb"
 
-#: src/nntplib.c:997
+#: src/nntplib.c:1006
 msgid	"223  No text sent -- stat, next, last"
 msgstr	"223  Teksti ei saadetud -- stat, next, last"
 
-#: src/nntplib.c:1001
+#: src/nntplib.c:1010
 msgid	"230  New articles by message-id follow"
 msgstr	"230  Uute artiklite message-id järgnevad"
 
-#: src/nntplib.c:1005
+#: src/nntplib.c:1014
 msgid	"231  New newsgroups follow"
 msgstr	"231  Uued grupid järgnevad"
 
-#: src/nntplib.c:1009
+#: src/nntplib.c:1018
 msgid	"235  Article transferred successfully"
 msgstr	"235  Artikkel on edukalt edastatud"
 
-#: src/nntplib.c:1013
+#: src/nntplib.c:1022
 msgid	"240  Article posted successfully"
 msgstr	"240  Artikkel on edukalt postitatud"
 
-#: src/nntplib.c:1017
+#: src/nntplib.c:1026
 msgid	"280  Authorization system ok"
 msgstr	"280  Autoriseerimissüsteem ok"
 
-#: src/nntplib.c:1021
+#: src/nntplib.c:1030
 msgid	"281  Authorization (user/pass) ok"
 msgstr	"281  Autoriseerimine (kasutaja/parool) ok"
 
-#: src/nntplib.c:1025
+#: src/nntplib.c:1034
 msgid	"282  binary data follows"
 msgstr	"282  kahendandmed järgnevad"
 
-#: src/nntplib.c:1029
+#: src/nntplib.c:1038
 msgid	"283  spooldir list follows"
 msgstr	"283  spooldir nimekiri järgneb"
 
-#: src/nntplib.c:1033
+#: src/nntplib.c:1042
 msgid	"284  Switching to a different spooldir"
 msgstr	"284  Lülitun teisele spooldirile"
 
-#: src/nntplib.c:1037
+#: src/nntplib.c:1046
 msgid	"285  Still using same spooldir"
 msgstr	"285  Kasutan ikka endist spooldiri"
 
-#: src/nntplib.c:1041
+#: src/nntplib.c:1050
 msgid	"286  Current spooldir"
 msgstr	"286  Jooksev spooldir"
 
-#: src/nntplib.c:1045
+#: src/nntplib.c:1054
 msgid	"287  Available spooldir"
 msgstr	"287  Kasutatav spooldir"
 
-#: src/nntplib.c:1049
+#: src/nntplib.c:1058
 msgid	"288  Unavailable spooldir or invalid entry"
 msgstr	"288  spooldir pole kasutatav või on vigane"
 
-#: src/nntplib.c:1053
+#: src/nntplib.c:1062
 msgid	"335  Continue to send article"
 msgstr	"335  Jätka artikli edastamist"
 
-#: src/nntplib.c:1057
+#: src/nntplib.c:1066
 msgid	"340  Continue to post article"
 msgstr	"340  Jätka artikli postitamist"
 
-#: src/nntplib.c:1061
+#: src/nntplib.c:1070
 msgid	"380  authorization is required"
 msgstr	"380  nõuame autoriseerimist"
 
-#: src/nntplib.c:1065
+#: src/nntplib.c:1074
 msgid	"381  <type> authorization data required"
 msgstr	"381  <tüüp> autoriseerimise info on nõutav"
 
-#: src/nntplib.c:1069
+#: src/nntplib.c:1078
 msgid	"400  Have to hang up for some reason"
 msgstr	"400  Pean miskipärast ühenduse katkestama"
 
-#: src/nntplib.c:1073
+#: src/nntplib.c:1082
 msgid	"411  No such newsgroup"
 msgstr	"411  Gruppi pole"
 
-#: src/nntplib.c:1077
+#: src/nntplib.c:1086
 msgid	"412  Not currently in newsgroup"
 msgstr	"412  Pole grupis"
 
-#: src/nntplib.c:1081
+#: src/nntplib.c:1090
 msgid	"418  No index file for this group"
 msgstr	"418  Sellel grupil pole indeks faili"
 
-#: src/nntplib.c:1085
+#: src/nntplib.c:1094
 msgid	"420  No current article selected"
 msgstr	"420  Jooksvat artiklit pole valitud"
 
-#: src/nntplib.c:1089
+#: src/nntplib.c:1098
 msgid	"421  No next article in this group"
 msgstr	"421  Selles grupis pole järgmist artiklit"
 
-#: src/nntplib.c:1093
+#: src/nntplib.c:1102
 msgid	"422  No previous article in this group"
 msgstr	"422  Selles grupis pole eelmist artiklit"
 
-#: src/nntplib.c:1097
+#: src/nntplib.c:1106
 msgid	"423  No such article in this group"
 msgstr	"423  Selles grupis pole sellist artiklit"
 
-#: src/nntplib.c:1101
+#: src/nntplib.c:1110
 msgid	"430  No such article at all"
 msgstr	"430  Sellist artiklit pole"
 
-#: src/nntplib.c:1105
+#: src/nntplib.c:1114
 msgid	"435  Already got that article, don't send"
 msgstr	"435  Sain juba selle artikli, ära uuesti saada"
 
-#: src/nntplib.c:1109
+#: src/nntplib.c:1118
 msgid	"436  Transfer failed"
 msgstr	"436  Ülekanne ebaõnnestus"
 
-#: src/nntplib.c:1113
+#: src/nntplib.c:1122
 msgid	"437  Article rejected, don't resend"
 msgstr	"437  Artikkel lükati tagasi, ära uueasti saada"
 
-#: src/nntplib.c:1117
+#: src/nntplib.c:1126
 msgid	"440  Posting not allowed"
 msgstr	"440  Postitamine pole lubatud"
 
-#: src/nntplib.c:1121
+#: src/nntplib.c:1130
 msgid	"441  Posting failed"
 msgstr	"441  Postitamine ebaõnnestus"
 
-#: src/nntplib.c:1125
+#: src/nntplib.c:1134
 msgid	"480  authorization required for command"
 msgstr	"480  käsk nõuab autoriseerimist"
 
-#: src/nntplib.c:1129
+#: src/nntplib.c:1138
 msgid	"481  Authorization system invalid"
 msgstr	"481  Autoriseerimise süsteem on vigane"
 
-#: src/nntplib.c:1133
+#: src/nntplib.c:1142
 msgid	"482  Authorization data rejected"
 msgstr	"482  Autoriseerimise andmed pole vastuvõetavad"
 
-#: src/nntplib.c:1137
+#: src/nntplib.c:1146
 msgid	"483  Invalid alias on spooldir cmd"
 msgstr	"483  Vigane spooldir käsu lühend"
 
-#: src/nntplib.c:1141
+#: src/nntplib.c:1150
 msgid	"484  No spooldir file found"
 msgstr	"484  Spooldir faili pole"
 
-#: src/nntplib.c:1145
+#: src/nntplib.c:1154
 msgid	"500  Command not recognized"
 msgstr	"500  Tundmatu käsk"
 
-#: src/nntplib.c:1149
+#: src/nntplib.c:1158
 msgid	"501  Command syntax error"
 msgstr	"501  Süntaksi viga käsus"
 
-#: src/nntplib.c:1153
+#: src/nntplib.c:1162
 msgid	"502  Access to server denied"
 msgstr	"502  Serverile pole juurdepääsu"
 
-#: src/nntplib.c:1158
+#: src/nntplib.c:1167
 msgid	"503  Program fault, command not performed"
 msgstr	"503  Programmi tõrge, käsku ei täidetud"
 
-#: src/nntplib.c:1162
+#: src/nntplib.c:1171
 msgid	"580  Authorization Failed"
 msgstr	"580 Autoriseerimine ebaõnnestus"
 
-#: src/nntplib.c:1166
+#: src/nntplib.c:1175
 msgid	"Unknown NNTP response code"
 msgstr	"Tundmatu NNTP vastusekood"
 
@@ -6144,22 +6164,22 @@ msgstr	"Tundmatu NNTP vastusekood"
 msgid	"couldn't expand %s\n"
 msgstr	"ei saa laiendada %s\n"
 
-#: src/open.c:1103
+#: src/open.c:1040
 msgid	"Unreachable?\n"
 msgstr	"Kättesaamatu?\n"
 
-#: src/post.c:1712
+#: src/post.c:1749
 #, c-format
 msgid	"%s is bogus"
 msgstr	"gruppi %s pole"
 
-#: src/post.c:1903
+#: src/post.c:1940
 #, c-format
 msgid	"Posting: %.*s ..."
 msgstr	"Postitan: %.*s ..."
 
 #. TODO: -> lang.c
-#: src/post.c:4012
+#: src/post.c:4037
 #, c-format
 msgid	"Rereading %s..."
 msgstr	"Loen %s uuesti..."
@@ -6240,12 +6260,18 @@ msgstr	"Seda kataloogi kasutatakse slrnf
 msgid	"Can't run slrnface: couldn't construct fifo name."
 msgstr	"Slrnface ei saa käivitada: ei õnnestu konstrueerida fifo nime."
 
-#: src/xface.c:151
+#: src/xface.c:162
 #, c-format
 msgid	"Slrnface abnormally exited, code %d."
 msgstr	"Slrnface lõpetas veaga, kood %d."
 
-#: src/xface.c:195
+#: src/xface.c:206
 #, c-format
 msgid	"Slrnface failed: %s."
 msgstr	"Slrnface ebaõnnestus: %s."
+
+#~ msgid	"%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: "
+#~ msgstr	"%s=välju, %s=toimeta, %s=ispell, %s=postita, %s=postitusootele [%%.*s]: "
+
+#~ msgid	"%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: "
+#~ msgstr	"%s=välju, %s=toimeta, %s=postita, %s=postitusootele [%%.*s]: "
Binary files tin-1.5.18/po/fr.gmo and tin-1.6.0/po/fr.gmo differ
diff -Nurp tin-1.5.18/po/fr.po tin-1.6.0/po/fr.po
--- tin-1.5.18/po/fr.po	Mon Jun  2 14:54:31 2003
+++ tin-1.6.0/po/fr.po	Mon Jul 14 17:48:20 2003
@@ -2,9 +2,9 @@
 # Matt Anton <tin@syrius.org>, 2003
 #
 msgid	""
-msgstr	"Project-Id-Version: 1.5.17\n"
-	"POT-Creation-Date: 2003-06-02 14:53+0200\n"
-	"PO-Revision-Date: 2003-04-22 23:15+0100\n"
+msgstr	"Project-Id-Version: 1.5.18\n"
+	"POT-Creation-Date: 2003-07-14 17:23+0200\n"
+	"PO-Revision-Date: 2003-07-04 04:15+0200\n"
 	"Last-Translator: Matt Anton <tin@syrius.org\n"
 	"Language-Team: French <tin@syrius.org>\n"
 	"MIME-Version: 1.0\n"
@@ -14,7 +14,8 @@ msgstr	"Project-Id-Version: 1.5.17\n"
 #: src/attrib.c:574
 msgid	"# Do not edit this comment block\n"
 	"#\n"
-msgstr	""
+msgstr	"# Ne pas éditer ce commentaire\n"
+	"#\n"
 
 #: src/attrib.c:575
 msgid	"#  scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n"
@@ -58,7 +59,7 @@ msgstr	"#  x_body=TERME (pe. ~/.tin/extr
 
 #: src/attrib.c:585
 msgid	"#  from=STRING (just append wanted From:-line, don't use quotes)\n"
-msgstr	"#  from=TERME (choix du From:-line, ne pas utiliser celui cité)\n"
+msgstr	"#  from=TERME (choix du From:-ligne:, ne pas utiliser celui cité)\n"
 
 #: src/attrib.c:586
 msgid	"#  news_quote_format=STRING\n"
@@ -70,7 +71,7 @@ msgstr	"#  quote_chars=TERME (%%s, %%S p
 
 #: src/attrib.c:588
 msgid	"#  mime_types_to_save=STRING (eg. image/*,!image/bmp)\n"
-msgstr	""
+msgstr	"#  mime_types_to_save=TERME (pe. image/*,!image/bmp)\n"
 
 #: src/attrib.c:590
 msgid	"#  ispell=STRING\n"
@@ -204,7 +205,8 @@ msgstr	"# dans *sources* choisir le type
 
 #: src/attrib.c:684
 msgid	"# in *binaries* do full post processing, remove tmp files\n"
-msgstr	""
+msgstr	"# dans *binaries* faire traitement complet, effaçant les fichiers "
+	"temporaires\n"
 
 #: src/attrib.c:685
 msgid	"# and set Followup-To: poster\n"
@@ -212,45 +214,53 @@ msgstr	"# et utiliser Followup-To: poste
 
 #: src/cook.c:798
 msgid	"(unknown)"
-msgstr	""
+msgstr	"(inconnu)"
 
 #.
 #. * TODO: add to the right rule, give better explanation, -> lang.c
 #.
 #: src/filter.c:604 src/filter.c:612
 msgid	"Removed from the previous rule: "
-msgstr	""
+msgstr	"Effacé de la règle précédente : "
 
 #: src/lang.c:42
 #, c-format
 msgid	"1 Response%s"
 msgstr	"1 Réponse%s"
 
-#: src/lang.c:45
+#: src/lang.c:46
 #, c-format
 msgid	"\n"
 	"%s contains no newsgroups. Exiting."
 msgstr	"\n"
 	"%s ne contient pas de groupes. Fermeture."
 
-#: src/lang.c:46
-#, c-format
-msgid	"File %s exists. %s=append, %s=overwrite, %s=quit: "
-msgstr	"Fichier %s existe. %s=ajouter, %s=écraser, %s=quitter : "
-
 #: src/lang.c:47
 msgid	"all "
 msgstr	"tout "
 
 #: src/lang.c:48
+msgid	"All groups"
+msgstr	"Tous les groupes"
+
+#: src/lang.c:49
+#, c-format
+msgid	"File %s exists. %s=append, %s=overwrite, %s=quit: "
+msgstr	"Fichier %s existe. %s=ajouter, %s=écraser, %s=quitter : "
+
+#: src/lang.c:50
 msgid	"Article cancelled (deleted)."
 msgstr	"Article annulé (effacé)."
 
-#: src/lang.c:49
+#: src/lang.c:51
 msgid	"Article cannot be cancelled (deleted)."
 msgstr	"Impossible d'annuler l'article (effacé)."
 
-#: src/lang.c:50
+#: src/lang.c:52
+msgid	"Article deleted."
+msgstr	"Article effacé."
+
+#: src/lang.c:53
 #, c-format
 msgid	"\n"
 	"Your article:\n"
@@ -261,582 +271,543 @@ msgstr	"\n"
 	"  \"%s\"\n"
 	"sera posté dans le %s suivant :\n"
 
-#: src/lang.c:51
+#: src/lang.c:54
 msgid	"Article not posted!"
 msgstr	"Article non posté !"
 
-#: src/lang.c:52
+#: src/lang.c:55
 msgid	"Article not saved"
 msgstr	"Article non enregistré"
 
-#: src/lang.c:53
+#: src/lang.c:56
 msgid	"Article Level Commands"
 msgstr	"Commandes pour articles"
 
-#: src/lang.c:54
+#: src/lang.c:57
+msgid	"Article has no parent"
+msgstr	"Article orphelin"
+
+#: src/lang.c:58
+msgid	"Parent article has been killed"
+msgstr	"L'article parent a été filtré"
+
+#: src/lang.c:59
+msgid	"Parent article is unavailable"
+msgstr	"L'article parent est indisponible"
+
+#: src/lang.c:60
 #, c-format
 msgid	"Article posted: %s"
 msgstr	"Article posté : %s"
 
-#: src/lang.c:55
+#: src/lang.c:61
 #, c-format
 msgid	"Article rejected (saved to %s)"
 msgstr	"Article rejeté (enregistré dans %s)"
 
-#: src/lang.c:56
+#: src/lang.c:62
 #, c-format
 msgid	"%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: "
-msgstr	"%s=article, %s=enfilade, %s=sélection, %s=modèle, %s=art. marq., %s=quitter: "
+msgstr	"%s=article, %s=fil, %s=sélection, %s=modèle, %s=art. marq., %s=quitter : "
 
-#: src/lang.c:57
+#: src/lang.c:63
 msgid	"Article unavailable"
 msgstr	"Article indisponible"
 
-#: src/lang.c:58
-msgid	"Article has no parent"
-msgstr	"Article orphelin"
-
-#: src/lang.c:59
-msgid	"Parent article has been killed"
-msgstr	"L'article parent a été filtré"
-
-#: src/lang.c:60
-msgid	"Parent article is unavailable"
-msgstr	"L'article parent est indisponible"
+#: src/lang.c:64
+msgid	"Article undeleted."
+msgstr	"Article non effacé"
 
-#: src/lang.c:62
+#: src/lang.c:66
 msgid	"articles"
 msgstr	"articles"
 
-#: src/lang.c:63
+#: src/lang.c:67
 msgid	"This is a repost of the following article:"
 msgstr	"C'est un repostage de l'article suivant :"
 
-#: src/lang.c:64
+#: src/lang.c:68
 msgid	"article"
 msgstr	"article"
 
-#: src/lang.c:65
+#: src/lang.c:69
 msgid	"Article"
 msgstr	"Article"
 
-#: src/lang.c:66
+#: src/lang.c:70
 #, c-format
 msgid	"-- %d %s mailed --"
 msgstr	"-- %d %s envoyé --"
 
-#: src/lang.c:68
+#: src/lang.c:71
 #, c-format
-msgid	"%d %s printed"
-msgstr	"%d %s imprimé"
+msgid	" at %s"
+msgstr	" à %s"
 
-#: src/lang.c:70
+#: src/lang.c:72
 #, c-format
 msgid	"%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n"
 msgstr	"%*s[-- %s/%s, encodage de %s%s%s, %d lignes%s%s --]\n"
 
-#: src/lang.c:71
+#: src/lang.c:73
 msgid	", charset: "
 msgstr	", encodage : "
 
-#: src/lang.c:72
+#: src/lang.c:74
 #, c-format
 msgid	"%*s[-- Description: %s --]\n"
 msgstr	"%*s[-- Description : %s --]\n"
 
-#: src/lang.c:73
-#, c-format
-msgid	"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
-	"\n"
-msgstr	"%*s[-- %s/%s, %sfichier uuencodé, %d lignes, nom : %s --]\n"
-	"\n"
-
-#: src/lang.c:74
+#: src/lang.c:75
 #, c-format
 msgid	"%d Authentication failed"
 msgstr	"%d Échec de l'authentification"
 
-#: src/lang.c:75
+#: src/lang.c:76
 msgid	"Server expects authentication.\n"
 msgstr	"Le serveur attend une authentification.\n"
 
-#: src/lang.c:76
+#: src/lang.c:77
 msgid	"    Please enter password: "
 msgstr	"    Entrez votre mdp svp : "
 
-#: src/lang.c:77
+#: src/lang.c:78
 msgid	"    Please enter username: "
 msgstr	"    Entrez votre identifiant svp : "
 
-#: src/lang.c:78
+#: src/lang.c:79
 #, c-format
 msgid	"Author search backwards [%s]> "
 msgstr	"Recherche arrière sur l'auteur [%s]> "
 
-#: src/lang.c:79
+#: src/lang.c:80
 #, c-format
 msgid	"Author search forwards [%s]> "
 msgstr	"Recherche avant sur l'auteur [%s]> "
 
-#: src/lang.c:80
+#: src/lang.c:81
 #, c-format
 msgid	"Authorized for user: %s\n"
 msgstr	"Autorisé pour l'utilisateur : %s\n"
 
-#: src/lang.c:81
+#: src/lang.c:82
 #, c-format
 msgid	"Authorization failed for user: %s\n"
-msgstr	"Autorisation refusée pour l'utilisateur : %s \n"
+msgstr	"Autorisation refusée pour l'utilisateur : %s\n"
 
-#: src/lang.c:82
+#: src/lang.c:83
 #, c-format
 msgid	"\n"
 	"Autosubscribed to %s"
 msgstr	"\n"
 	"Abonnement auto. à %s"
 
-#: src/lang.c:83
+#: src/lang.c:84
 msgid	"Autosubscribing groups...\n"
 msgstr	"Abonnement auto. aux groupes...\n"
 
-#: src/lang.c:84
+#: src/lang.c:85
 #, c-format
 msgid	"Autoselecting articles (use '%s' to see all unread) ..."
 msgstr	"Sélection auto. des articles (voir les non lus par '%s')..."
 
-#: src/lang.c:85
+#: src/lang.c:87
 #, c-format
 msgid	"Active file corrupt - %s"
 msgstr	"Fichier actif corrompu - %s"
 
-#: src/lang.c:86
+#: src/lang.c:88
 #, c-format
 msgid	"Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: "
 msgstr	"L'article à poster pose des problèmes. %s=quitter, %s=Menu, %s=éditer : "
 
-#: src/lang.c:87
+#: src/lang.c:89
 #, c-format
 msgid	"Unrecognized attribute: %s"
 msgstr	"Attribut non reconnu : %s"
 
-#: src/lang.c:88
+#: src/lang.c:90
 #, c-format
 msgid	"Bad command. Type '%s' for help."
 msgstr	"Mauvaise comande. Tapez '%s' pour l'aide."
 
-#: src/lang.c:90
+#: src/lang.c:92
 msgid	"Base article"
 msgstr	"Article initial"
 
-#: src/lang.c:91
+#: src/lang.c:93
 msgid	"Base article range"
 msgstr	"Champ article initial"
 
-#: src/lang.c:92
+#: src/lang.c:94
 #, c-format
 msgid	"%s: Updating of index files not supported\n"
 msgstr	"%s : Màj des fichiers index non supportée\n"
 
-#: src/lang.c:93
+#: src/lang.c:95
 msgid	"*** Beginning of article ***"
 msgstr	"*** Début de l'article ***"
 
-#: src/lang.c:94
+#: src/lang.c:97
 msgid	"Cancel (delete) or supersede (overwrite) article [%%.*s]? (%s/%s/%s): "
 msgstr	"Annuler (effacer) ou remplacer (écraser) l'article [%%.*s]? (%s/%s/%s) : "
 
-#: src/lang.c:95
+#: src/lang.c:98
 msgid	"Cancelling article..."
 msgstr	"Annulation de l'article..."
 
-#: src/lang.c:97
+#: src/lang.c:100
 #, c-format
 msgid	"Cannot create %s"
 msgstr	"Création de %s impossible"
 
-#: src/lang.c:98
+#: src/lang.c:101
 #, c-format
 msgid	"Can't find base article %d"
 msgstr	"Article initial %d introuvable"
 
-#: src/lang.c:99
-msgid	"Cannot find NNTP server name"
-msgstr	"Nom du serveur NNTP introuvable"
-
-#: src/lang.c:101
-#, c-format
-msgid	"%s: Can't get entry for TERM\n"
-msgstr	"%s : Entrée pour TERM introuvable\n"
-
-#: src/lang.c:103
+#: src/lang.c:102
 #, c-format
 msgid	"Can't open %s"
 msgstr	"Ouverture de %s impossible"
 
-#: src/lang.c:105
-#, c-format
-msgid	"Can't open %s. Try %s -r to read news via NNTP.\n"
-msgstr	"Ouverture de %s impossible. Essayez %s -r pour lire via NNTP.\n"
-
-#: src/lang.c:107
+#: src/lang.c:103
 #, c-format
 msgid	"Couldn't open %s for saving"
 msgstr	"Ouverture de %s pour enregistrement impossible"
 
-#: src/lang.c:108
+#: src/lang.c:104
 msgid	"*** Posting not allowed ***"
 msgstr	"*** Postage non autorisé ***"
 
-#: src/lang.c:109
+#: src/lang.c:105
 #, c-format
 msgid	"Posting is not allowed to %s"
 msgstr	"Postage non autorisé dans %s"
 
-#: src/lang.c:110
+#: src/lang.c:106
 #, c-format
 msgid	"Can't retrieve %s"
 msgstr	"Récupération de %s impossible"
 
-#: src/lang.c:111
-#, c-format
-msgid	"Can't write index %s"
-msgstr	"Écriture de l'index %s impossible"
-
-#: src/lang.c:112
+#: src/lang.c:107
 #, c-format
 msgid	"%s is a directory"
 msgstr	"%s est un dossier"
 
-#: src/lang.c:113
+#: src/lang.c:108
 msgid	"Catchup"
 msgstr	"Marquer lu"
 
-#: src/lang.c:114
+#: src/lang.c:109
 #, c-format
 msgid	"Catchup %s..."
 msgstr	"Effacement sur %s..."
 
-#: src/lang.c:115
+#: src/lang.c:110
 msgid	"Catchup all groups entered during this session?"
 msgstr	"Marquer comme lu tous les groupes entrés lors de la session ?"
 
-#: src/lang.c:116
+#: src/lang.c:111
 msgid	"You have tagged articles in this group - catchup anyway?"
 msgstr	"Vous avez marqué des articles de ce groupe - marquer comme lu ?"
 
-#: src/lang.c:117
+#: src/lang.c:112
 #, c-format
 msgid	"%s %d %s in %lu seconds\n"
 msgstr	"%s %d %s en %lu secondes\n"
 
-#: src/lang.c:118
+#: src/lang.c:113
 msgid	"Caughtup"
 msgstr	"Caughtup"
 
-#: src/lang.c:119
+#: src/lang.c:114
 msgid	"Check Prepared Article"
 msgstr	"Vérification de l'article préparé"
 
-#: src/lang.c:120
+#: src/lang.c:115
 msgid	"Checking for new groups... "
 msgstr	"Vérification de nouveaux groupes..."
 
-#: src/lang.c:121
+#: src/lang.c:116
 msgid	"Checking for news..."
-msgstr	"Vérification de nouveaux articles..."
-
-#: src/lang.c:123
-#, c-format
-msgid	"\tChecksum of %s (%ld %s)"
-msgstr	"\tSomme de contrôle de %s (%ld %s)"
+msgstr	"Vérification de articles..."
 
-#: src/lang.c:125
+#: src/lang.c:117
 #, c-format
 msgid	"Post-process %s=no, %s=yes, %s=shar, %s=quit: "
 msgstr	"Traiter %s=aucun, %s=oui, %s=shar, %s=quitter : "
 
-#: src/lang.c:126
+#: src/lang.c:118
 msgid	"ANSI color disabled"
 msgstr	"Couleurs ANSI désactivées"
 
-#: src/lang.c:127
+#: src/lang.c:119
 msgid	"ANSI color enabled"
 msgstr	"Couleurs ANSI activées"
 
-#: src/lang.c:128
+#: src/lang.c:120
 #, c-format
 msgid	"Command failed: %s"
 msgstr	"Commande échouée : %s"
 
-#: src/lang.c:129
+#: src/lang.c:121
 msgid	"Mark not selected articles read?"
 msgstr	"Marquer comme lu les articles sélectionnés ?"
 
-#: src/lang.c:130
+#: src/lang.c:122
 #, c-format
 msgid	"Connecting to %s..."
 msgstr	"Connexion à %s..."
 
-#: src/lang.c:131
-#, c-format
-msgid	"Connecting to %s:%d..."
-msgstr	"Connexion à %s:%d..."
-
-#: src/lang.c:132
-#, c-format
-msgid	"\n"
-	"Connection to %s: "
-msgstr	"\n"
-	"Connexion à %s : "
-
-#: src/lang.c:146
+#: src/lang.c:123
 msgid	"<CR>"
 msgstr	"<CR>"
 
-#: src/lang.c:147
+#: src/lang.c:124
 msgid	"Creating active file for saved groups...\n"
 msgstr	"Création du fichier active des groupes enregistrés...\n"
 
-#: src/lang.c:148
+#: src/lang.c:125
 msgid	"Creating newsrc file...\n"
 msgstr	"Création du fichier newsrc...\n"
 
-#: src/lang.c:149
+#: src/lang.c:127 src/lang.c:1129
+msgid	"Default"
+msgstr	"Défaut"
+
+#: src/lang.c:128
 msgid	"Delete saved files that have been post processed?"
 msgstr	"Effacer les fichiers enregistrés qui ont été post-traités ?"
 
-#: src/lang.c:150
+#: src/lang.c:129
 msgid	"Deleting temporary files..."
 msgstr	"Effacement des fichiers temporaires..."
 
-#: src/lang.c:151
-msgid	"Disconnecting from server...\n"
-msgstr	"Déconnexion du serveur...\n"
-
-#: src/lang.c:152
+#: src/lang.c:131
 msgid	"*** End of article ***"
 msgstr	"*** Fin de l'article ***"
 
-#: src/lang.c:153
+#: src/lang.c:132
 msgid	"*** End of articles ***"
 msgstr	"*** Fin de la liste ***"
 
-#: src/lang.c:154
+#: src/lang.c:133
 msgid	"*** End of groups ***"
 msgstr	"*** Fin de la liste ***"
 
-#: src/lang.c:155
+#: src/lang.c:134
 msgid	"*** End of thread ***"
-msgstr	"*** Fin de l'enfilade ***"
+msgstr	"*** Fin du fil ***"
 
-#: src/lang.c:156
+#: src/lang.c:135
 msgid	"Enter limit of articles to get> "
 msgstr	"Entrez le nombre max d'articles à récupérer> "
 
-#: src/lang.c:157
+#: src/lang.c:136
 msgid	"Enter Message-ID to go to> "
 msgstr	"Entrez le Message-ID à aller voir> "
 
-#: src/lang.c:158
+#: src/lang.c:137
 msgid	" and enter next unread thread"
-msgstr	" et passer à l'enfilade non lue suivante"
+msgstr	" et passer au fil non lu suivant"
 
-#: src/lang.c:159
+#: src/lang.c:138
 msgid	" and enter next unread group"
 msgstr	" et entrer dans le groupe suivant non lu"
 
-#: src/lang.c:160
+#: src/lang.c:139
 msgid	"Enter option number> "
 msgstr	"Entrez le numéro de l'option> "
 
-#: src/lang.c:161
+#: src/lang.c:140
 #, c-format
 msgid	"Enter range [%s]> "
 msgstr	"Entrez un champ [%s]> "
 
-#: src/lang.c:162
+#: src/lang.c:141
 msgid	"\n"
 	"Warning: Approved: header used.\n"
 msgstr	"\n"
 	"Attention : en-tête Approved: utilisé.\n"
 
-#: src/lang.c:164
+#: src/lang.c:143
 msgid	"\n"
 	"Error: Bad address in Approved: header.\n"
 msgstr	"\n"
 	"Erreur : Mauvaise adresse dans l'en-tête Approved:.\n"
 
-#: src/lang.c:165
+#: src/lang.c:144
 msgid	"\n"
 	"Error: Bad address in From: header.\n"
 msgstr	"\n"
 	"Erreur : Mauvaise adresse dans l'en-tête From:.\n"
 
-#: src/lang.c:166
+#: src/lang.c:145
 msgid	"\n"
 	"Error: Bad address in Reply-To: header.\n"
 msgstr	"\n"
 	"Erreur : Mauvais adresse dans l'en-ête Reply-To:.\n"
 
-#: src/lang.c:167
+#: src/lang.c:146
 msgid	"\n"
 	"Error: Bad FQDN in Message-ID: header.\n"
 msgstr	"\n"
 	"Erreur : Mauvais FQDN dans l'en-tête Message-ID:.\n"
 
-#: src/lang.c:168
+#: src/lang.c:147
 #, c-format
 msgid	"Can't unlock %s"
 msgstr	"Déverrouillage de %s impossible"
 
-#: src/lang.c:170
+#: src/lang.c:149
 #, c-format
 msgid	"Corrupted file %s"
 msgstr	"Fichier %s corrompu"
 
-#: src/lang.c:171
+#: src/lang.c:150
 #, c-format
 msgid	"Couldn't dotlock %s - article not appended!"
 msgstr	"N'a pu 'dotlock' %s - article non ajouté !"
 
-#: src/lang.c:172
+#: src/lang.c:151
 #, c-format
 msgid	"Couldn't lock %s - article not appended!"
 msgstr	"N'a pu verrouiller %s - article non ajouté !"
 
-#: src/lang.c:174
+#: src/lang.c:153
 msgid	"Internal error in GNKSA routine - send bug report.\n"
 msgstr	"Erreur interne dans routine GNKSA - envoi d'un rapport de bug.\n"
 
-#: src/lang.c:175
+#: src/lang.c:154
 msgid	"Left angle bracket missing in route address.\n"
 msgstr	"Accolade gauche manquante dans l'adresse de routage.\n"
 
-#: src/lang.c:176
+#: src/lang.c:155
 msgid	"Left parenthesis missing in old-style address.\n"
 msgstr	"Parenthèse gauche manquante dans l'ancien type d'adresse.\n"
 
-#: src/lang.c:177
+#: src/lang.c:156
 msgid	"Right parenthesis missing in old-style address.\n"
 msgstr	"Parenthèse droite manquante dans l'ancien type d'adresse.\n"
 
-#: src/lang.c:178
+#: src/lang.c:157
 msgid	"At-sign missing in mail address.\n"
 msgstr	"Arobase manquant dans l'adresse email.\n"
 
-#: src/lang.c:179
+#: src/lang.c:158
 msgid	"Single component FQDN is not allowed. Add your domain.\n"
 msgstr	"Composant FQDN unique non autorisé. Ajoutez votre domaine.\n"
 
-#: src/lang.c:180
+#: src/lang.c:159
 msgid	"Invalid domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Domaine invalide. Envoyez un rapport de bug si votre domaine premier existe.\n"
 	"Utilisez .invalid comme domaine premier pour les fausses adresses.\n"
 
-#: src/lang.c:181
+#: src/lang.c:160
 msgid	"Illegal domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Domaine illégal. Envoyez un rapport de bug si votre domaine premier existe.\n"
 	"Utilisez .invalid comme domaine premier pour les fausses adresses.\n"
 
-#: src/lang.c:182
+#: src/lang.c:161
 msgid	"Unknown domain. Send bug report if your top level domain really exists.\n"
 	"Use .invalid as top level domain for munged addresses.\n"
 msgstr	"Domaine inconnu. Envoyez un rapport de bug si votre domaine premier existe.\n"
 	"Utilisez .invalid comme domaine premier pour les fausses adresses.\n"
 
-#: src/lang.c:183
+#: src/lang.c:162
 msgid	"Illegal character in FQDN.\n"
 msgstr	"Caractère illégal dans le FQDN.\n"
 
-#: src/lang.c:184
+#: src/lang.c:163
 msgid	"Zero length FQDN component not allowed.\n"
 msgstr	"Valeur vide dans le FQDN non autorisé.\n"
 
-#: src/lang.c:185
+#: src/lang.c:164
 msgid	"FQDN component exceeds maximum allowed length (63 chars).\n"
 msgstr	"Composant FQDN excède la longueur max autorisée (63 car.).\n"
 
-#: src/lang.c:186
+#: src/lang.c:165
 msgid	"FQDN component may not start or end with hyphen.\n"
 msgstr	"Composant FQDN ne devrait pas commencer ou finir par un tiret.\n"
 
-#: src/lang.c:187
+#: src/lang.c:166
 msgid	"FQDN component may not start with digit.\n"
 msgstr	"Composant FQDN ne devrait pas commencer par un chiffre.\n"
 
-#: src/lang.c:188
+#: src/lang.c:167
 msgid	"Domain literal has impossible numeric value.\n"
 msgstr	"Domaine littéral contient une valeur numérique impossible.\n"
 
-#: src/lang.c:189
+#: src/lang.c:168
 msgid	"Domain literal is for private use only and not allowed for global use.\n"
 msgstr	"Domaine littéral est pour l'usage privé et n'est pas autorisé à l'usage "
 	"global.\n"
 
-#: src/lang.c:190
+#: src/lang.c:169
 msgid	"Right bracket missing in domain literal.\n"
 msgstr	"Parenthèse droite manquante dans le domaine littéral.\n"
 
-#: src/lang.c:191
+#: src/lang.c:170
 msgid	"Missing localpart of mail address.\n"
 msgstr	"Partie locale manquante dans l'adresse email.\n"
 
-#: src/lang.c:192
+#: src/lang.c:171
 msgid	"Illegal character in localpart of mail address.\n"
 msgstr	"Caractère illégal dans la partie locale de l'adresse email.\n"
 
-#: src/lang.c:193
+#: src/lang.c:172
 msgid	"Zero length localpart component not allowed.\n"
 msgstr	"Valeur vide dans composant de partie locale non autorisé.\n"
 
-#: src/lang.c:194
+#: src/lang.c:173
 msgid	"Illegal character in realname.\n"
 	"Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n"
 msgstr	"Caractère illégal dans le nom réel.\n"
 	"Mots non cités ne devraient pas contenir '!()<>@,;:\\.[]' dans l'adresse de "
 	"routage.\n"
 
-#: src/lang.c:195
+#: src/lang.c:174
 msgid	"Illegal character in realname.\n"
 	"Quoted words may not contain '()<>\\'.\n"
 msgstr	"Caractère illégal dans le nom réel.\n"
 	"Mots cités ne devraient pas contenir '()<>\\'.\n"
 
-#: src/lang.c:196
+#: src/lang.c:175
 msgid	"Illegal character in realname.\n"
 	"Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n"
 msgstr	"Caractère illégal dans le nom réel.\n"
 	"Mots encodés ne devraient pas contenir '!()<>@,;:\"\\.[]/=' dans le "
 	"paramètre.\n"
 
-#: src/lang.c:197
+#: src/lang.c:176
 msgid	"Bad syntax in encoded word used in realname.\n"
 msgstr	"Mauvaise syntaxe dans le mot encodé utilisé dans le nom réel.\n"
 
-#: src/lang.c:198
+#: src/lang.c:177
 msgid	"Illegal character in realname.\n"
 	"Unquoted words may not contain '()<>\\' in old-style addresses.\n"
 msgstr	"Caractère illégal dans le nom réel.\n"
 	"Mots non cités ne devraient pas contenir '()<>\\' dans les adresses de type "
 	"anciennes.\n"
 
-#: src/lang.c:199
+#: src/lang.c:178
 msgid	"Illegal character in realname.\n"
 	"Control characters and unencoded 8bit characters > 127 are not allowed.\n"
 msgstr	"Caractère illégal dans le nom réel.\n"
 	"Les caractères de contrôle et non encodés en 8bit > 127 ne sont pas "
 	"autorisés.\n"
 
-#: src/lang.c:200
+#: src/lang.c:179
 msgid	"\n"
 	"Error: No blank line found after header.\n"
 msgstr	"\n"
 	"Erreur : Pas de ligne vide trouvée après l'en-tête.\n"
 
 #. TODO: fixme, US-ASCII is not the only 7bit charset we know about
-#: src/lang.c:202
+#: src/lang.c:181
 msgid	"\n"
 	"Error: Posting contains non-ASCII characters but MM_CHARSET is set to\n"
 	"       US-ASCII  - please change this setting to a suitable value for\n"
@@ -845,10 +816,10 @@ msgid	"\n"
 msgstr	"\n"
 	"Erreur : L'article contient des caractères non-ASCII mais US-ASCII est\n"
 	"         choisi comme MM_CHARSET - changez svp ce réglage en une valeur\n"
-	"         correcte pour votre langue via le M)enu des options ou via \n"
+	"         correcte pour votre langue via le M)enu des options ou via\n"
 	"         l'édition de votre tinrc.\n"
 
-#: src/lang.c:207
+#: src/lang.c:186
 msgid	"\n"
 	"Error: Posting contains  non-ASCII characters  but the  MIME encoding\n"
 	"       for news  messages  is set  to \"7bit\"  -  please change this\n"
@@ -863,13 +834,13 @@ msgstr	"\n"
 	"         changement peut être effectué via le M)enu des options ou via\n"
 	"         l'édition de votre tinrc.\n"
 
-#: src/lang.c:213
+#: src/lang.c:192
 msgid	"\n"
 	"Error: Article starts with blank line instead of header\n"
 msgstr	"\n"
 	"Erreur : L'article débute avec une ligne vide au lieu d'un en-tête\n"
 
-#: src/lang.c:214
+#: src/lang.c:193
 #, c-format
 msgid	"\n"
 	"Error: Header on line %d does not have a colon after the header name:\n"
@@ -879,45 +850,21 @@ msgstr	"\n"
 	":\n"
 	"%s\n"
 
-#: src/lang.c:215
+#: src/lang.c:194
 #, c-format
 msgid	"\n"
 	"Error: The \"%s:\" line is empty.\n"
 msgstr	"\n"
 	"Erreur : La ligne \"%s:\" est vide.\n"
 
-#: src/lang.c:217
-#, c-format
-msgid	"\n"
-	"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
-	"       The only allowable  space is the one  separating the colon (:)\n"
-	"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
-	"       newsgroup names.\n"
-msgstr	"\n"
-	"Erreur : La ligne \"%s:\" contient des espaces qui DOIVENT être retirés.\n"
-	"         Le seul espace autorisé est celui séparant le séparateur (:)\n"
-	"         du contenu. Utilisez une virgule (,) pour séparer de multiples\n"
-	"         noms de groupes.\n"
-
-#: src/lang.c:222
-#, c-format
-msgid	"\n"
-	"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
-	"       the line  may not  contain  whitespace,  this is  not allowed.\n"
-	"       Please write all newsgroups into a single line.\n"
-msgstr	"\n"
-	"Erreur : La ligne \"%s:\" n'est pas discontinue dans la ligne suivante.\n"
-	"         Comme la ligne ne contient pas d'espace, ce n'est pas autorisé.\n"
-	"         Inscrivez svp tous les groupes sur une seule ligne.\n"
-
-#: src/lang.c:227
+#: src/lang.c:195
 #, c-format
 msgid	"\n"
 	"Error: The \"%s:\" line is missing from the article header.\n"
 msgstr	"\n"
 	"Erreur : La ligne \"%s:\" est absente de l'en-tête de l'article.\n"
 
-#: src/lang.c:228
+#: src/lang.c:196
 #, c-format
 msgid	"\n"
 	"Error: Header on line %d does not have a space after the colon:\n"
@@ -926,71 +873,71 @@ msgstr	"\n"
 	"Erreur : L'en-tête à la ligne %d n'a pas d'espace après le séparateur:\n"
 	"%s\n"
 
-#: src/lang.c:229
+#: src/lang.c:197
 #, c-format
 msgid	"\n"
 	"Error: There are multiple (%d) \"%s:\" lines in the header.\n"
 msgstr	"\n"
 	"Erreur : Il y a plusieurs lignes (%d) \"%s:\" dans l'en-tête.\n"
 
-#: src/lang.c:230
+#: src/lang.c:198
 #, c-format
 msgid	"Insecure permissions of %s (%o)"
 msgstr	"Permissions de %s non sûres (%o)"
 
-#: src/lang.c:231 src/open.c:1080
+#: src/lang.c:199 src/open.c:1017
 #, c-format
 msgid	"Invalid response to GROUP command, %s"
 msgstr	"Réponse de la commande GROUP invalide, %s"
 
-#: src/lang.c:233
+#: src/lang.c:201
 #, c-format
 msgid	"MIME parse error: Unexpected end of %s/%s article"
 msgstr	"Erreur MIME : Fin inattendue de l'article %s %s"
 
-#: src/lang.c:234
+#: src/lang.c:202
 msgid	"MIME parse error: Start boundary whilst reading headers"
 msgstr	"Erreur MIME : Début de la borne lors de la lecture des en-têtes"
 
-#: src/lang.c:235
+#: src/lang.c:203
 msgid	"Can't get a (fully-qualified) domain-name!\n"
 msgstr	"Nom de domaine (qualifié) introuvable !\n"
 
-#: src/lang.c:236
+#: src/lang.c:204
 #, c-format
 msgid	"No permissions to go into %s\n"
 msgstr	"Pas la permission d'aller dans %s\n"
 
-#: src/lang.c:237
+#: src/lang.c:205
 msgid	"\n"
 	"Error: From: line missing.\n"
 msgstr	"\n"
 	"Erreur : Ligne De: manquante.\n"
 
-#: src/lang.c:238
+#: src/lang.c:206
 #, c-format
 msgid	"No read permissions for %s\n"
 msgstr	"Pas la permission de lecture pour %s\n"
 
-#: src/lang.c:239
+#: src/lang.c:207
 #, c-format
 msgid	"File %s does not exist\n"
 msgstr	"Fichier %s inexistant\n"
 
-#: src/lang.c:240
+#: src/lang.c:208
 #, c-format
 msgid	"No write permissions for %s\n"
 msgstr	"Pas la permission d'écrire pour %s\n"
 
-#: src/lang.c:241
+#: src/lang.c:209
 msgid	"Can't get user information (/etc/passwd missing?)"
 msgstr	"Info sur l'utilisateur introuvable (/etc/passwd manquant ?)"
 
-#: src/lang.c:242
+#: src/lang.c:210
 msgid	"errors"
 msgstr	"erreurs"
 
-#: src/lang.c:243
+#: src/lang.c:211
 #, c-format
 msgid	"\n"
 	"Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n"
@@ -998,761 +945,803 @@ msgstr	"\n"
 	"Erreur sur la ligne %d : en-tête \"Sender:\" non autorisé (sera ajouté pour "
 	"vous)\n"
 
-#: src/lang.c:244
+#: src/lang.c:212
 #, c-format
 msgid	"Server has non of the groups listed in %s"
 msgstr	"Le serveur n'a aucun groupe listé dans %s"
 
-#: src/lang.c:245
+#: src/lang.c:213
 msgid	"error"
 msgstr	"erreur"
 
-#: src/lang.c:247
-msgid	"\n"
-	"socket or connect problem\n"
-msgstr	"\n"
-	"problème de socket ou de connexion\n"
-
-#: src/lang.c:250
-msgid	"Server unavailable\n"
-msgstr	"Service indisponible\n"
-
-#: src/lang.c:253
+#: src/lang.c:214
 msgid	"Unknown display level"
 msgstr	"Vue affichée inconnue"
 
-#: src/lang.c:254
-#, c-format
-msgid	"%s/tcp: Unknown service.\n"
-msgstr	"%s/tcp : Service inconnu.\n"
-
-#: src/lang.c:255
-#, c-format
-msgid	"Wrong newsgroup name in response of GROUP command, %s for %s"
-msgstr	"Nom de groupe erroné dans la réponse de la cmd GROUP, %s pour %s"
-
-#: src/lang.c:256
+#: src/lang.c:215
 msgid	"<ESC>"
 msgstr	"<ESC>"
 
-#: src/lang.c:257
+#: src/lang.c:216
 msgid	"Exiting..."
 msgstr	"Fermeture..."
 
-#: src/lang.c:258
+#: src/lang.c:217
 msgid	"leaving external mail-reader"
 msgstr	"fermeture du lecteur de messagerie externe"
 
-#: src/lang.c:259
+#: src/lang.c:218
 #, c-format
 msgid	"Extracting %s..."
 msgstr	"Extraction de %s..."
 
-#: src/lang.c:260
-#, c-format
-msgid	"Failed to connect to NNTP server %s. Exiting..."
-msgstr	"Échec de la connexion au serveur NNTP %s. Fermeture..."
-
-#: src/lang.c:261
+#: src/lang.c:220
 #, c-format
 msgid	"Error writing %s file. Filesystem full? File reset to previous state."
 msgstr	"Écriture du fichier %s échouée. Disque plein ? Fichier non touché."
 
-#: src/lang.c:262
+#: src/lang.c:221
 #, c-format
 msgid	"Error making backup of %s file. Filesystem full?"
 msgstr	"Erreur lors de la sauvegarde du fichier %s. Disque plein ?"
 
-#: src/lang.c:263
+#: src/lang.c:222
 #, c-format
 msgid	"Filtering global rules (%d/%d)..."
 msgstr	"Filtrage selon les règles globales (%d/%d)..."
 
-#: src/lang.c:264
+#: src/lang.c:223
 msgid	"Rule created by: "
 msgstr	"Règle créée par : "
 
-#: src/lang.c:265
+#: src/lang.c:224
 #, c-format
 msgid	"Enter pattern [%s]> "
 msgstr	"Entrez le réglage [%s]> "
 
-#: src/lang.c:266
+#: src/lang.c:225
 #, c-format
 msgid	"\n"
 	"You requested followups to your article to go to the following %s:\n"
 msgstr	"\n"
-	"Vous avez souhaité que les réponses à votre article aillent au %s suivant : \n"
+	"Vous avez souhaité que les réponses à votre article aillent au %s suivant :\n"
 
-#: src/lang.c:267
+#: src/lang.c:226
 #, c-format
 msgid	"  %s\t Answers will be directed to you by mail.\n"
 msgstr	"  %s\t Réponses vous seront envoyées par email.\n"
 
-#: src/lang.c:268
+#: src/lang.c:227
+msgid	"# Format:\n"
+	"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
+	"placed\n"
+	"#                     at the beginning of a rule, or they will be moved to "
+	"the\n"
+	"#                     next rule. '#' is not a valid keyword for a comment!\n"
+	"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
+	"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
+	"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
+	"#     score=NUM         A number (e.g. 70). Or:\n"
+	"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
+	"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
+	"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
+	"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n"
+	"#                     full references.\n"
+	"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
+	"#   msgid_only=STRING Optional. Like above, but without references.\n"
+	"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
+	"without\n"
+	"#                     Message-ID:\n"
+	"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
+	"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
+	"opt.\n"
+	"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
+	"#   time=NUM          Optional. time_t value when rule expires\n"
+	"#\n"
+msgstr	""
+
+#: src/lang.c:248
 #, c-format
-msgid	"%s%s: Unknown host.\n"
-msgstr	"%s%s : Hôte inconnu.\n"
+msgid	"Enter score for rule (default=%d): "
+msgstr	""
 
-#: src/lang.c:269
-msgid	"Giving up...\n"
-msgstr	"Abandon...\n"
+#: src/lang.c:249
+#, c-format
+msgid	"Enter the score weight (range 0 < score <= %d)"
+msgstr	""
 
-#: src/lang.c:270
-msgid	"global "
-msgstr	"global "
+#. SCORE_MAX
+#: src/lang.c:250
+msgid	"Full"
+msgstr	"Complet"
 
-#: src/lang.c:273
-#, c-format
-msgid	"Group %.*s ('q' to quit)..."
-msgstr	"Groupe %.*s ('q' pour quitter)..."
+#: src/lang.c:251
+msgid	"Comment (optional)  : "
+msgstr	"Commentaire (optionnel) : "
 
-#: src/lang.c:275
+#: src/lang.c:252
+msgid	"Apply pattern to    : "
+msgstr	"Appliquer le réglage à  : "
+
+#: src/lang.c:253
+msgid	"From: line (ignore case)      "
+msgstr	"Ligne De : (ignorer la casse) "
+
+#: src/lang.c:254
+msgid	"From: line (case sensitive)   "
+msgstr	"Ligne De : (casse sensible)   "
+
+#: src/lang.c:256
 #, c-format
-msgid	"Group %.*s..."
-msgstr	"Groupe %.*s..."
+msgid	"%s%s: Unknown host.\n"
+msgstr	"%s%s : Hôte inconnu.\n"
 
-#: src/lang.c:278
+#: src/lang.c:257
+msgid	"global "
+msgstr	"global "
+
+#: src/lang.c:258
 #, c-format
 msgid	"Please use %.100s instead"
 msgstr	"Utilisez svp %.100s à la place"
 
-#: src/lang.c:279
+#: src/lang.c:259
 #, c-format
 msgid	"Group %s is moderated. Continue?"
 msgstr	"Groupe %s modéré. Continuer ?"
 
-#: src/lang.c:280
+#: src/lang.c:260
 msgid	"groups"
 msgstr	"groupes"
 
-#: src/lang.c:281
+#: src/lang.c:261
 msgid	"Top Level Commands"
 msgstr	"Commandes niveau supérieur"
 
-#: src/lang.c:282
+#: src/lang.c:262
 msgid	"Group Selection"
 msgstr	"Sélection de groupe"
 
-#: src/lang.c:283
+#: src/lang.c:263
 msgid	"group"
 msgstr	"groupe"
 
-#: src/lang.c:285
+#: src/lang.c:265
+msgid	"One or more lines of comment. <CR> to add a line or proceed if line is empty."
+msgstr	"Un ou plusieurs lignes de commentaire. <CR> pour ajouter une ligne ou "
+	"procéder si vide."
+
+#: src/lang.c:266
+msgid	"From: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:267
+msgid	"Linecount of articles to be filtered. < for less, > for more, = for equal."
+msgstr	""
+
+#: src/lang.c:268
+msgid	"Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:269
+msgid	"Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:270
+msgid	"Enter text pattern to filter if Subject: & From: lines are not what you want."
+msgstr	""
+
+#: src/lang.c:271
+msgid	"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:272
+msgid	"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:273
+msgid	"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:274
+msgid	"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr	""
+
+#: src/lang.c:275
 msgid	"kill an article via a menu"
 msgstr	"filtrer un article via un menu"
 
-#: src/lang.c:286
+#: src/lang.c:276
 msgid	"auto-select (hot) an article via a menu"
 msgstr	"sélection auto. (hot) d'un article via un menu"
 
-#: src/lang.c:287
+#: src/lang.c:277
 msgid	"Browse URLs in article"
 msgstr	"Voir les URLs dans l'article"
 
-#: src/lang.c:288
+#: src/lang.c:278
 msgid	"0 - 9\t  display article by number in current thread"
-msgstr	"0 - 9\t affiche les articles par numéro dans l'enfilade actuelle"
+msgstr	"0 - 9\t affiche les articles par numéro du fil actuel"
 
-#: src/lang.c:289
+#: src/lang.c:279
 msgid	"cancel (delete) current article; must have been posted by you"
 msgstr	"annuler (effacer) l'article actuel; a dû être posté par vous"
 
-#: src/lang.c:290
+#: src/lang.c:280
 msgid	"edit article (mail-groups only)"
 msgstr	"éditer l'article (groupes de messagerie uniquement)"
 
-#: src/lang.c:291
+#: src/lang.c:281
 msgid	"display first article in current thread"
-msgstr	"afficher le 1er article de l'enfilade actuelle"
+msgstr	"afficher le 1er article du fil actuel"
 
-#: src/lang.c:292
+#: src/lang.c:282
 msgid	"display first page of article"
 msgstr	"afficher la 1ère page de l'article"
 
-#: src/lang.c:293
+#: src/lang.c:283
 msgid	"post followup to current article"
 msgstr	"poster un suivi pour l'article actuel"
 
-#: src/lang.c:294
+#: src/lang.c:284
 msgid	"post followup (don't copy text) to current article"
 msgstr	"poster un suivi (ne pas copier le texte) pour l'article actuel"
 
-#: src/lang.c:295
+#: src/lang.c:285
 msgid	"post followup to current article quoting complete headers"
 msgstr	"poster un suivi pour l'article actuel en citant les en-têtes"
 
-#: src/lang.c:296
+#: src/lang.c:286
 msgid	"display last article in current thread"
-msgstr	"afficher le dernier article de l'enfilade actuelle"
+msgstr	"afficher le dernier article du fil actuel"
 
-#: src/lang.c:297
+#: src/lang.c:287
 msgid	"display last page of article"
 msgstr	"afficher la dernière page de l'article"
 
-#: src/lang.c:298
+#: src/lang.c:288
 msgid	"mark rest of thread as read and advance to next unread"
-msgstr	"marquer comme lu le reste de l'enfilade et aller à la non lue suivante"
+msgstr	"marquer comme lu le reste du fil et aller au fil non lu suivant"
 
-#: src/lang.c:299
+#: src/lang.c:289
 msgid	"display next article"
 msgstr	"afficher l'article suivant"
 
-#: src/lang.c:300
+#: src/lang.c:290
 msgid	"display first article in next thread"
-msgstr	"afficher le 1er article de l'enfilade suivante"
+msgstr	"afficher le 1er article du fil suivant"
 
-#: src/lang.c:301 src/lang.c:311 src/lang.c:382 src/lang.c:383
+#: src/lang.c:291 src/lang.c:298 src/lang.c:357 src/lang.c:358
 msgid	"display next unread article"
 msgstr	"afficher le prochain article non lu"
 
-#: src/lang.c:302
+#: src/lang.c:292
 msgid	"go to the article that this one followed up"
 msgstr	"aller à l'article parent"
 
-#: src/lang.c:304
-msgid	"perform PGP operations on article"
-msgstr	"effectuer des opérations PGP sur l'article"
-
-#: src/lang.c:306
+#: src/lang.c:293
 msgid	"display previous article"
 msgstr	"afficher l'article précédent"
 
-#: src/lang.c:307 src/lang.c:385
+#: src/lang.c:294 src/lang.c:360
 msgid	"display previous unread article"
 msgstr	"afficher l'article précédent non lu"
 
-#: src/lang.c:308
+#: src/lang.c:295
 msgid	"quickly kill an article using defaults"
 msgstr	"filtrer rapidement un article en utilisant les défauts"
 
-#: src/lang.c:309
+#: src/lang.c:296
 msgid	"quickly auto-select (hot) an article using defaults"
 msgstr	"sélection auto. (hot) un article en utilisant les défauts"
 
-#: src/lang.c:310
+#: src/lang.c:297
 msgid	"return to group selection level"
 msgstr	"retourner à la vue sélection de groupe"
 
-#: src/lang.c:312
+#: src/lang.c:299
 msgid	"reply through mail to author"
 msgstr	"répondre par email à l'auteur"
 
-#: src/lang.c:313
+#: src/lang.c:300
 msgid	"reply through mail (don't copy text) to author"
 msgstr	"répondre (ne pas copier le texte) par email à l'auteur"
 
-#: src/lang.c:314
+#: src/lang.c:301
 msgid	"reply through mail to author quoting complete headers"
 msgstr	"répondre par email à l'auteur en citant les en-têtes"
 
-#: src/lang.c:315 src/lang.c:387
+#: src/lang.c:302 src/lang.c:362
 msgid	"repost chosen article to another group"
 msgstr	"reposter l'article choisi dans un autre groupe"
 
-#: src/lang.c:316
+#: src/lang.c:303
 msgid	"search backwards within this article"
 msgstr	"recherche arrière dans cet article"
 
-#: src/lang.c:317
+#: src/lang.c:304
 msgid	"search forwards within this article"
 msgstr	"recherche avant dans cet article"
 
-#: src/lang.c:318
+#: src/lang.c:305
 msgid	"show article in raw-mode (including all headers)"
 msgstr	"afficher la source des articles (incluant les en-têtes)"
 
-#: src/lang.c:319
+#: src/lang.c:306
 msgid	"skip next block of included text"
 msgstr	"passer au bloc suivant incluant du texte"
 
-#: src/lang.c:320
+#: src/lang.c:307
 msgid	"toggle display of sections hidden by a form-feed (^L) on/off"
 msgstr	"(dés)activer l'affichage des sections masquer par (^L)"
 
-#: src/lang.c:321
+#: src/lang.c:308
 msgid	"toggle word highlighting on/off"
 msgstr	"(dés)activer la surbrillance des mots"
 
-#: src/lang.c:322
+#: src/lang.c:309
 msgid	"toggle ROT-13 (basic decode) for current article"
 msgstr	"(dés)activer ROT-13 (décodage basic) pour l'article actuel"
 
-#: src/lang.c:323
+#: src/lang.c:310
 msgid	"toggle tabwidth 4 <-> 8"
 msgstr	"(dés)activer taille de tabulation 4 <-> 8"
 
-#: src/lang.c:324
+#: src/lang.c:311
 msgid	"toggle german TeX style decoding for current article"
 msgstr	"(dés)activer le décodage de type TeX allemand pour l'article actuel"
 
 # TRANSLATION MISSING
-#: src/lang.c:325
+#: src/lang.c:312
 msgid	"toggle display of uuencoded sections"
 msgstr	""
 
-#: src/lang.c:326
+#: src/lang.c:313
 msgid	"View/save multimedia attachments"
 msgstr	"Voir/enregistrer les pj multimédia"
 
-#: src/lang.c:327
+#: src/lang.c:314
 #, c-format
 msgid	"report bug or comment via mail to %s"
 msgstr	"envoi d'un report de bug ou de commentaires à %s"
 
-#: src/lang.c:328
+#: src/lang.c:315
 msgid	"choose range of articles to be affected by next command"
 msgstr	"choisir les articles qui seront affectés par la commande suivante"
 
-#: src/lang.c:329
+#: src/lang.c:316
 msgid	"escape from command prompt"
 msgstr	"quitter le prompt"
 
-#: src/lang.c:330
+#: src/lang.c:317
 msgid	"get help"
 msgstr	"avoir de l'aide"
 
-#: src/lang.c:331
+#: src/lang.c:318
 msgid	"display last article viewed"
 msgstr	"afficher le dernier article lu"
 
-#: src/lang.c:332
+#: src/lang.c:319
 msgid	"down one line"
 msgstr	"descendre d'une ligne"
 
-#: src/lang.c:333
+#: src/lang.c:320
 msgid	"up one line"
 msgstr	"monter d'une ligne"
 
-#: src/lang.c:334
+#: src/lang.c:321
 msgid	"go to article chosen by Message-ID"
 msgstr	"aller à l'article via son Message-ID"
 
-#: src/lang.c:335
+#: src/lang.c:322
 msgid	"mail article/thread/hot/pattern/tagged articles to someone"
-msgstr	"envoyer article/enfilade/sél./articles marqués à une personne"
+msgstr	"envoyer article/fil/sél./articles marqués à une personne"
 
-#: src/lang.c:336
+#: src/lang.c:323
 msgid	"menu of configurable options"
 msgstr	"menu des options réglables"
 
-#: src/lang.c:337
+#: src/lang.c:324
 msgid	"down one page"
 msgstr	"descendre d'une page"
 
-#: src/lang.c:338
+#: src/lang.c:325
 msgid	"up one page"
 msgstr	"monter d'une page"
 
-#: src/lang.c:340
-msgid	"pipe article/thread/hot/pattern/tagged articles into command"
-msgstr	"passer article/enfilade/sél./articles marqués à une commande"
-
-#: src/lang.c:342
+#: src/lang.c:326
 msgid	"post (write) article to current group"
 msgstr	"poster (écrire) l'article dans le groupe actuel"
 
-#: src/lang.c:343
+#: src/lang.c:327
 msgid	"post postponed articles"
 msgstr	"poster les brouillons"
 
-#: src/lang.c:344
+#: src/lang.c:328
 msgid	"list articles posted by you (from posted file)"
 msgstr	"lister les articles postés par vous (fichier posted)"
 
-#: src/lang.c:345
+#: src/lang.c:329
 msgid	"return to previous menu"
 msgstr	"retourner au menu précédent"
 
-#: src/lang.c:347
-msgid	"output article/thread/hot/pattern/tagged articles to printer"
-msgstr	"envoyer article/enfilade/sél./articles marqués à l'imprimante"
-
-#: src/lang.c:349
+#: src/lang.c:330
 msgid	"quit tin immediately"
 msgstr	"quitter tin immédiatement"
 
-#: src/lang.c:350
+#: src/lang.c:331
 msgid	"redraw page"
 msgstr	"redessiner la page"
 
-#: src/lang.c:351
+#: src/lang.c:332
 msgid	"save article/thread/hot/pattern/tagged articles to file"
-msgstr	"enregistrer article/enfilade/sél./articles marqués dans un fichier"
+msgstr	"enregistrer article/fil/sél./articles marqués dans un fichier"
 
-#: src/lang.c:352
+#: src/lang.c:333
 msgid	"save marked articles automatically without user prompts"
 msgstr	"enregistrement auto. des articles marqués sans demander"
 
-#: src/lang.c:353
+#: src/lang.c:334
 msgid	"search for articles by author backwards"
 msgstr	"recherche arrière d'articles par auteur"
 
-#: src/lang.c:354
+#: src/lang.c:335
 msgid	"search for articles by author forwards"
 msgstr	"recherche avant d'articles par auteur"
 
-#: src/lang.c:355
+#: src/lang.c:336
 msgid	"search all articles for a given string (this may take some time)"
 msgstr	"rechercher partout un terme précis (cela peut prendre du temps)"
 
-#: src/lang.c:356
+#: src/lang.c:337
 msgid	" \t  (searches are case-insensitive and wrap around to all articles)"
 msgstr	" \t  (recherches ignorent la casse et se cantonne à tous les articles)"
 
-#: src/lang.c:357
+#: src/lang.c:338
 msgid	"search for articles by Subject line backwards"
 msgstr	"recherche arrière d'articles par Sujet"
 
-#: src/lang.c:358
+#: src/lang.c:339
 msgid	"search for articles by Subject line forwards"
 msgstr	"recherche avant d'articles par Sujet"
 
-#: src/lang.c:359
+#: src/lang.c:340
 msgid	"repeat last search"
 msgstr	"répéter la dernière recherche"
 
-#: src/lang.c:361
-msgid	"shell escape"
-msgstr	"accéder à un shell"
-
-#: src/lang.c:363
+#: src/lang.c:341
 msgid	"tag current article for reposting/mailing/piping/printing/saving"
 msgstr	"marquer article pour repostage/envoi/passer/imprimer/enregistrer"
 
-#: src/lang.c:365
-msgid	"toggle color"
-msgstr	"(dés)activer la couleur"
-
-#: src/lang.c:367
+#: src/lang.c:342
 msgid	"toggle info message in last line (subject/description)"
 msgstr	"(dés)activer les infos dans la dernière ligne (sujet/description)"
 
-#: src/lang.c:368
+#: src/lang.c:343
 msgid	"toggle inverse video"
 msgstr	"(dés)activer vidéo inversée"
 
-#: src/lang.c:369
+#: src/lang.c:344
 msgid	"toggle mini help menu display"
 msgstr	"(dés)activer vue du mini menu aide"
 
-#: src/lang.c:370
+#: src/lang.c:345
 msgid	"show version information"
 msgstr	"afficher la version de tin"
 
-#: src/lang.c:371
+#: src/lang.c:346
 msgid	"mark all articles as read and return to group selection menu"
 msgstr	"marquer tous les articles comme lus et retourner au menu groupe"
 
-#: src/lang.c:372
+#: src/lang.c:347
 msgid	"mark all articles as read and enter next group with unread articles"
 msgstr	"tout marquer comme lu et entrer dans le prochain groupe non lu"
 
-#: src/lang.c:373
+#: src/lang.c:348
 msgid	"choose first thread in list"
-msgstr	"choisir la 1ère enfilade de la liste"
+msgstr	"choisir le 1er fil de la liste"
 
-#: src/lang.c:374 src/lang.c:405
+#: src/lang.c:349 src/lang.c:380
 msgid	"choose group by name"
 msgstr	"choisir le groupe par nom"
 
-#: src/lang.c:375
+#: src/lang.c:350
 msgid	"choose last thread in list"
-msgstr	"choisir la dernière enfilade de la liste"
+msgstr	"choisir le dernier fil de la liste"
 
-#: src/lang.c:376
+#: src/lang.c:351
 msgid	"list articles within current thread (bring up Thread sub-menu)"
-msgstr	"lister les articles de l'enfilade actuelle (sous-menu Enfilade)"
+msgstr	"lister les articles du fil actuel (sous-menu fil)"
 
-#: src/lang.c:377
+#: src/lang.c:352
 msgid	"mark article as unread"
 msgstr	"marquer l'article comme non lu"
 
-#: src/lang.c:378
+#: src/lang.c:353
 msgid	"mark current thread as read"
-msgstr	"marquer l'enfilade actuelle comme lue"
+msgstr	"marquer le fil actuel comme lu"
 
-#: src/lang.c:379
+#: src/lang.c:354
 msgid	"mark thread as unread"
-msgstr	"marquer l'enfilade comme non lue"
+msgstr	"marquer le fil comme non lu"
 
-#: src/lang.c:380
+#: src/lang.c:355
 msgid	"toggle display of all/selected articles"
 msgstr	"(dés)activer la vue de tout article/articles sélectionnés"
 
-#: src/lang.c:381
+#: src/lang.c:356
 msgid	"display next group"
 msgstr	"afficher le groupe suivant"
 
-#: src/lang.c:384
+#: src/lang.c:359
 msgid	"display previous group"
 msgstr	"afficher le groupe précédent"
 
-#: src/lang.c:386 src/lang.c:434
+#: src/lang.c:361 src/lang.c:409
 msgid	"read chosen article"
 msgstr	"lire l'article choisi"
 
-#: src/lang.c:388
+#: src/lang.c:363
 msgid	"toggle all selections (all articles)"
 msgstr	"(dés)activer toutes les sélections (tout article)"
 
-#: src/lang.c:389
+#: src/lang.c:364
 msgid	"select group (make \"hot\")"
 msgstr	"sélection du groupe (utiliser \"hot\")"
 
-#: src/lang.c:390
+#: src/lang.c:365
 msgid	"select thread"
-msgstr	"sélectionner l'enfilade"
+msgstr	"sélectionner le fil"
 
-#: src/lang.c:391
+#: src/lang.c:366
 msgid	"select threads if at least one unread article is selected"
-msgstr	"sél. les enfilades si au moins un article non lu est sélectionné"
+msgstr	"sél. les fils si au moins un article non lu est sélectionné"
 
-#: src/lang.c:392
+#: src/lang.c:367
 msgid	"select threads that match user specified pattern"
-msgstr	"sélectionner les enfilades qui correspondent au critère choisi"
+msgstr	"sélectionner les fils qui correspondent au critère choisi"
 
-#: src/lang.c:393
+#: src/lang.c:368
 msgid	"tag all parts of current multipart-message in order"
-msgstr	"sélection dans l'ordre de toutes parties du message multipart"
+msgstr	"marquer dans l'ordre toutes parties du message multiparties"
 
-#: src/lang.c:394
+#: src/lang.c:369
 msgid	"0 - 9\t  choose thread by number"
-msgstr	"0 - 9\t  choisir l'enfilade par numéro"
+msgstr	"0 - 9\t  choisir le fil par numéro"
 
-#: src/lang.c:395
+#: src/lang.c:370
 msgid	"toggle limit number of articles to get, and reload"
 msgstr	"(dés)activer le nombre limite d'article à charger et à recharger"
 
-#: src/lang.c:396
+#: src/lang.c:371
 msgid	"toggle display of all/unread articles"
 msgstr	"(dés)activer l'affichage de tout article/articles non lus"
 
-#: src/lang.c:397 src/lang.c:435
+#: src/lang.c:372 src/lang.c:410
 msgid	"cycle the display of authors email address, real name, both or neither"
 msgstr	"afficher cycliquement l'email des auteurs, nom réel, les deux ou aucun"
 
-#: src/lang.c:398
+#: src/lang.c:373
 msgid	"toggle selection of thread"
-msgstr	"(dés)activer sélection de l'enfilade"
+msgstr	"(dés)activer sélection du fil"
 
-#: src/lang.c:399
+#: src/lang.c:374
 msgid	"cycle through threading options available"
 msgstr	"voir toutes les options de groupage disponibles"
 
-#: src/lang.c:400
+#: src/lang.c:375
 msgid	"undo all selections (all articles)"
 msgstr	"annuler toutes sélections (tout article)"
 
-#: src/lang.c:401
+#: src/lang.c:376
 msgid	"untag all tagged threads"
-msgstr	"désélection de toutes enfilades sélectionnées"
+msgstr	"démarquer tout fil marqué"
 
-#: src/lang.c:402
+#: src/lang.c:377
 msgid	"mark all articles in group as read"
-msgstr	"marquer lu tous les articles du group choisi"
+msgstr	"marquer lu tous les articles du groupe"
 
 # TRANSLATION MISSING (71 chars max)
-#: src/lang.c:403
+#: src/lang.c:378
 msgid	"mark all articles in group as read and move to next unread group"
-msgstr	""
+msgstr	"marquer tout article dans groupe comme lu et aller au groupe non lu suivant"
 
-#: src/lang.c:404
+#: src/lang.c:379
 msgid	"choose first group in list"
 msgstr	"choisir 1er groupe de la liste"
 
-#: src/lang.c:406
+#: src/lang.c:381
 msgid	"0 - 9\t  choose group by number"
-msgstr	""
+msgstr	"0 - 9\t  choisir groupe par numéro"
 
-#: src/lang.c:407
+#: src/lang.c:382
 msgid	"choose range of groups to be affected by next command"
-msgstr	""
+msgstr	"choisir les groupes affectés par la commande suivante"
 
-#: src/lang.c:408
+#: src/lang.c:383
 msgid	"choose last group in list"
 msgstr	"choisir dernier groupe de la liste"
 
-#: src/lang.c:409
+#: src/lang.c:384
 msgid	"mark all articles in chosen group unread"
-msgstr	""
+msgstr	"marquer non lu tout article dans le groupe choisi"
 
-#: src/lang.c:410
+#: src/lang.c:385
 msgid	"move chosen group within list"
-msgstr	""
+msgstr	"déplacer dans la liste le groupe choisi"
 
-#: src/lang.c:411
+#: src/lang.c:386
 msgid	"choose next group with unread news"
-msgstr	""
+msgstr	"choisir groupe suivant ayant articles non lus"
 
-#: src/lang.c:412 src/lang.c:913
+#: src/lang.c:387 src/lang.c:1176
 msgid	"quit"
 msgstr	"quitter"
 
-#: src/lang.c:413
+#: src/lang.c:388
 msgid	"quit without saving configuration changes"
-msgstr	""
+msgstr	"quitter sans enregistrer les changements"
 
-#: src/lang.c:414
+#: src/lang.c:389
 msgid	"read chosen group"
 msgstr	"lire le groupe choisi"
 
-#: src/lang.c:415
+#: src/lang.c:390
 msgid	"reset .newsrc (all available articles in groups marked unread)"
 msgstr	"réinitialiser .newsrc (tout sera marqué non lu dans les groupes)"
 
-#: src/lang.c:416
+#: src/lang.c:391
 msgid	"search backwards for a group name"
-msgstr	""
+msgstr	"recherche arrière d'un groupe"
 
-#: src/lang.c:417
+#: src/lang.c:392
 msgid	" \t  (all searches are case-insensitive and wrap around)"
-msgstr	""
+msgstr	" \t  (les recherches sont sensibles à la casse)"
 
-#: src/lang.c:418
+#: src/lang.c:393
 msgid	"search forwards for a group name"
-msgstr	""
+msgstr	"recherche avant d'un groupe"
 
-#: src/lang.c:419
+#: src/lang.c:394
 msgid	"subscribe to chosen group"
 msgstr	"abonnement au groupe choisi"
 
-#: src/lang.c:420
+#: src/lang.c:395
 msgid	"subscribe to groups that match pattern"
-msgstr	""
+msgstr	"abonnement aux groupes correspondant au critère"
 
-#: src/lang.c:421
+#: src/lang.c:396
 msgid	"reread active file to check for any new news"
-msgstr	""
+msgstr	"relire le fichier active pour vérifier nouveaux articles"
 
-#: src/lang.c:422
+#: src/lang.c:397
 msgid	"toggle display of group name only or group name plus description"
 msgstr	""
 
-#: src/lang.c:423
+#: src/lang.c:398
 msgid	"toggle display to show all/unread subscribed groups"
-msgstr	""
+msgstr	"afficher ou non tous les groupes abonnés non lu"
 
-#: src/lang.c:424
+#: src/lang.c:399
 msgid	"unsubscribe from chosen group"
-msgstr	""
+msgstr	"désabonnement du groupe choisi"
 
-#: src/lang.c:425
+#: src/lang.c:400
 msgid	"unsubscribe from groups that match pattern"
-msgstr	""
+msgstr	"désabonnement aux groupes correspondant au critère"
 
-#: src/lang.c:426
+#: src/lang.c:401
 msgid	"sort the list of groups"
-msgstr	""
+msgstr	"trier la liste des groupes"
 
-#: src/lang.c:427
+#: src/lang.c:402
 msgid	"toggle display to show all/subscribed groups"
-msgstr	""
+msgstr	"afficher ou non tous les groupes abonnés"
 
-#: src/lang.c:428
+#: src/lang.c:403
 msgid	"0 - 9\t  choose article by number"
-msgstr	""
+msgstr	"0 - 9\t  choisir article par numéro"
 
-#: src/lang.c:429
+#: src/lang.c:404
 msgid	"mark thread as read and return to group index page"
-msgstr	""
+msgstr	"marquer le fil comme lu et revenir à la liste des groupes"
 
-#: src/lang.c:430
+#: src/lang.c:405
 msgid	"mark thread as read and enter next unread thread or group"
-msgstr	""
+msgstr	"marquer le fil comme lu et aller dans le fil ou groupe non lu suivant"
 
-#: src/lang.c:431
+#: src/lang.c:406
 msgid	"choose first article in list"
-msgstr	""
+msgstr	"choisir le 1er article dans la liste"
 
-#: src/lang.c:432
+#: src/lang.c:407
 msgid	"choose last article in list"
-msgstr	""
+msgstr	"choisir le dernier article dans la liste"
 
-#: src/lang.c:433
+#: src/lang.c:408
 msgid	"mark article as read and move cursor to next unread article"
-msgstr	""
+msgstr	"marquer article comme lu et voir l'article non lu suivant"
 
-#: src/lang.c:436
+#: src/lang.c:411
 msgid	"Display properties\n"
 	"------------------"
 msgstr	"Propriétés de l'affichage\n"
 	"-------------------------"
 
-#: src/lang.c:437
+#: src/lang.c:412
 msgid	"Miscellaneous\n"
 	"-------------"
 msgstr	"Divers\n"
 	"------"
 
-#: src/lang.c:438
+#: src/lang.c:413
 msgid	"Moving around\n"
 	"-------------"
-msgstr	"Déplacement\n"
-	"-----------"
+msgstr	"Navigation\n"
+	"----------"
 
-#: src/lang.c:439
+#: src/lang.c:414
 msgid	"Group/thread/article operations\n"
 	"-------------------------------"
-msgstr	"Opérations sur les Groupes/enfilades/articles\n"
-	"---------------------------------------------"
+msgstr	"Opérations sur les Groupes/fils/articles\n"
+	"----------------------------------------"
 
-#: src/lang.c:440
+#: src/lang.c:416
 msgid	"Group Level Commands"
 msgstr	"Commandes du niveau Groupe"
 
-#: src/lang.c:441
+#: src/lang.c:417
 msgid	"Kill filter added"
 msgstr	"Filtre ajouté"
 
-#: src/lang.c:442
+#: src/lang.c:418
 msgid	"Auto-selection filter added"
 msgstr	"Filtre à auto-sélection ajouté"
 
-#: src/lang.c:443
+#: src/lang.c:419
 msgid	"All parts tagged"
 msgstr	"Toutes les parties sont marquées"
 
-#: src/lang.c:444
+#: src/lang.c:420
 msgid	"Storing article for later posting"
 msgstr	"Stockage de l'article afin de la poster plus tard"
 
-#: src/lang.c:445
+#: src/lang.c:421
 msgid	"Please enter a valid character"
 msgstr	"Entrez un caractère valide svp"
 
-#: src/lang.c:446
+#: src/lang.c:422
 #, c-format
 msgid	"Missing part #%d"
 msgstr	"Partie manquante #%d"
 
-#: src/lang.c:447
+#: src/lang.c:423
 msgid	"*** No postponed articles ***"
 msgstr	"*** Pas de brouillons ***"
 
-#: src/lang.c:448
+#: src/lang.c:424
 msgid	"Not a multi-part message"
 msgstr	"N'est pas un message en plusieurs parties"
 
-#: src/lang.c:449
+#: src/lang.c:425
 msgid	"You are not subscribed to this group"
 msgstr	"Vous n'êtes pas abonné à ce groupe"
 
-#: src/lang.c:450
+#: src/lang.c:426
 msgid	"No previous expression"
 msgstr	"Pas d'expression précédente"
 
-#: src/lang.c:451
+#: src/lang.c:427
 msgid	"Operation disabled in no-overwrite mode"
 msgstr	"Opération désactivée en mode lecture"
 
 #. TODO: replace hardcoded key-name in txt_info_postponed
-#: src/lang.c:453
+#: src/lang.c:429
 #, c-format
 msgid	"%d postponed %s, reuse with ^O...\n"
 msgstr	"%d brouillon(s) %s, réutilisez-les avec ^O...\n"
 
-#: src/lang.c:454
+#: src/lang.c:430
 msgid	"X-Conversion-Note: multipart/alternative contents have been removed.\n"
 	"  To get the whole article, turn alternative handling OFF in the Option Menu\n"
 msgstr	"X-Conversion-Note : contenus multiparties/alternatifs retirés.\n"
@@ -1760,21 +1749,21 @@ msgstr	"X-Conversion-Note : contenus mul
 	"dans\n"
 	"  le Menu Option.\n"
 
-#: src/lang.c:456
+#: src/lang.c:432
 #, c-format
 msgid	"Save filename for %s/%s is a mailbox. Attachment not saved"
-msgstr	""
+msgstr	"Enregistrer le fichier sous %s %s est une bàl. PJ non enregistrée"
 
-#: src/lang.c:457
+#: src/lang.c:433
 msgid	"TeX2Iso encoded article"
-msgstr	""
+msgstr	"Article encodé en TeX2Iso"
 
-#: src/lang.c:458
+#: src/lang.c:434
 msgid	"incomplete "
-msgstr	""
+msgstr	"incomplet "
 
 #. TODO: replace hardcoded key-names
-#: src/lang.c:460
+#: src/lang.c:436
 #, c-format
 msgid	"\n"
 	"Welcome to %s, a full screen threaded Netnews reader. It can read news "
@@ -1808,528 +1797,452 @@ msgid	"\n"
 	"For more information read the manual page, README, INSTALL, TODO and FTP "
 	"files.\n"
 	"Please send bug-reports/comments to %s with the 'R' command.\n"
-msgstr	""
+msgstr	"\n"
+	"Bienvenue dans %s, un lecteur de forums UseNet. Pouvant également lire un "
+	"spool local\n"
+	"(p.e. <spool>/news) ou depuis un serveur NNTP (Network News Transport "
+	"Protocol) distant (avec l'option -r). L'option -h liste les options "
+	"principales de la ligne de commande.\n"
+	"\n"
+	"%s a quatre niveaux, la liste des groupes, l'index du groupe, le contenu du "
+	"fil de discussion, la visualisation de l'article. Une aide est visible depuis "
+	"chaque niveaux en appuyant simplement sur 'h'.\n"
+	"\n"
+	"Déplacez-vous en utilisant les touches fléchées ou bien 'j' et 'k'. Utilisez "
+	"PgUp/PgDn ou Ctrl-U et Ctrl-D pour faire défiler la page de haut en bas. "
+	"Entrez dans un groupe en appuyant sur RETOUR/TAB.\n"
+	"\n"
+	"Les articles, fils, articles marqués ou articles correspondant à un critère "
+	"peuvent être envoyés par mail\n"
+	"(commande 'm'), imprimés (commande 'o'), enregistrés (commande 's'), passés "
+	"dans un tuyau (commande '|').\n"
+	"Utilisez la commande 'w' pour poster un nouvel article, les commandes 'f'/'F' "
+	"pour poster un suivi en réponse à un article existant et les commandes "
+	"'r'/'R' pour répondre par mail à l'auteur de l'article auquel vous répondez. "
+	"La commande 'M' permet de configurer %s via un menu.\n"
+	"\n"
+	"Pour plus d'informations, lisez les pages de manuel, ainsi que les fichiers  "
+	"README, INSTALL, TODO et FTP.\n"
+	"Si vous constatez des bogues ou tout autre problème, envoyez s'il vous plaît "
+	"un rapport de bogue/commentaires à %s via la touche 'R'.\n"
 
-#: src/lang.c:476
+#: src/lang.c:452
 #, c-format
 msgid	"Invalid  From: %s  line. Read the INSTALL file again."
-msgstr	""
+msgstr	"Ligne From: %s invalide. Lisez le fichier INSTALL une 2e fois."
 
-#: src/lang.c:477
+#: src/lang.c:453
 #, c-format
 msgid	"Invalid  Sender:-header %s"
-msgstr	""
+msgstr	"En-tête Sender: %s invalide"
 
-#: src/lang.c:478
+#: src/lang.c:454
 msgid	"Inverse video disabled"
-msgstr	""
+msgstr	"Vidéo inversée désactivée"
 
-#: src/lang.c:479
+#: src/lang.c:455
 msgid	"Inverse video enabled"
-msgstr	""
+msgstr	"Vidéo inversée activée"
 
-#: src/lang.c:480
+#: src/lang.c:457
 #, c-format
 msgid	"Missing definition for %s\n"
-msgstr	""
+msgstr	"Définition manquante pour %s\n"
 
-#: src/lang.c:481
+#: src/lang.c:458
 #, c-format
 msgid	"Invalid key definition '%s'\n"
-msgstr	""
+msgstr	"Définition de clé invalide '%s'\n"
 
-#: src/lang.c:482
+#: src/lang.c:459
 #, c-format
 msgid	"Invalid keyname '%s'\n"
-msgstr	""
+msgstr	"Nom de clé invalide '%s'\n"
+
+#: src/lang.c:460
+#, c-format
+msgid	"Key '%s' is defined for both %s%s and %s%s\n"
+msgstr	"Clé '%s' est définie pour %s%s et %s%s\n"
 
-#: src/lang.c:484
+#: src/lang.c:461
 #, c-format
-msgid	"Redefined key %s '%s' -> '%s'\n"
+msgid	"Kill From:     [%-*.*s] (y/n): "
 msgstr	""
 
-#: src/lang.c:485
-msgid	"  -D       debug mode 1=NNTP 2=ALL"
+#: src/lang.c:462
+msgid	"Kill Lines: (</>num): "
 msgstr	""
 
-#: src/lang.c:487
-#, c-format
-msgid	"Key '%s' is defined for both %s%s and %s%s\n"
+#: src/lang.c:463
+msgid	"Kill Article Menu"
 msgstr	""
 
-#: src/lang.c:488
-msgid	"-- Last response --"
-msgstr	"-- Dernière réponse --"
-
-#: src/lang.c:491
+#: src/lang.c:464
 #, c-format
-msgid	"%d files successfully written from %d articles. %d %s occurred."
-msgstr	"%d fichiers des %d articles écrits avec succès. %d %s est survenu."
-
-#: src/lang.c:492
-msgid	"Missing parts."
-msgstr	"Parties manquantes"
+msgid	"Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
+msgstr	""
 
-#: src/lang.c:493
-msgid	"No beginning."
-msgstr	"Pas de début."
+#: src/lang.c:465
+msgid	"Kill pattern scope  : "
+msgstr	""
 
-#: src/lang.c:494
-msgid	"No data."
-msgstr	"Pas de données."
+#: src/lang.c:466
+#, c-format
+msgid	"Kill Subject:  [%-*.*s] (y/n): "
+msgstr	""
 
-#: src/lang.c:495
-msgid	"Unknown error."
-msgstr	"Erreur inconnue."
+#: src/lang.c:467
+msgid	"Kill text pattern   : "
+msgstr	""
 
-#: src/lang.c:497
-#, c-format
-msgid	"Error decoding %s : %s"
-msgstr	"Erreur lors du décodage de %s : %s"
+#: src/lang.c:468
+msgid	"Kill time in days   : "
+msgstr	""
 
-#: src/lang.c:498
-msgid	"No end."
-msgstr	"Pas de fin."
+#: src/lang.c:470
+msgid	"Last"
+msgstr	"Dernier"
 
-#: src/lang.c:499
-#, c-format
-msgid	"%s successfully decoded."
-msgstr	"%s décodé avec succès."
+#: src/lang.c:471
+msgid	"-- Last response --"
+msgstr	"-- Dernière réponse --"
 
-#: src/lang.c:501
+#: src/lang.c:472
 #, c-format
 msgid	"Lines %s  "
 msgstr	"Ligne %s  "
 
-#: src/lang.c:503
+#: src/lang.c:474
+msgid	"Message-ID: line              "
+msgstr	""
+
+#: src/lang.c:476
 msgid	"mailbox "
 msgstr	"bàl"
 
-#: src/lang.c:504
+#: src/lang.c:477
 #, c-format
 msgid	"Mail article(s) to [%.*s]> "
 msgstr	"Envoyer article(s) à [%.*s]> "
 
-#: src/lang.c:505
+#: src/lang.c:478
 #, c-format
 msgid	"Mailing log to %s\n"
 msgstr	"Envoi de l'historique à %s\n"
 
-#: src/lang.c:506
+#: src/lang.c:479
 msgid	"Mail bug report..."
 msgstr	"Envoi d'un rapport de bug..."
 
-#: src/lang.c:507
+#: src/lang.c:480
 #, c-format
 msgid	"Mail BUG REPORT to %s?"
 msgstr	"Envoyer RAPPORT DE BUG à %s ?"
 
-#: src/lang.c:508
+#: src/lang.c:481
 msgid	"Mailed"
 msgstr	"Envoyé"
 
-#: src/lang.c:509
+#: src/lang.c:482
 #, c-format
 msgid	"Mailing to %s..."
 msgstr	"Envoi à %s..."
 
-#: src/lang.c:510
+#: src/lang.c:483
 msgid	"# [Mail/Save] active file. Format is like news active file:\n"
 	"#   groupname  max.artnum  min.artnum  /dir\n"
 	"# The 4th field is the basedir (ie. ~/Mail or ~/News)\n"
 	"#\n"
-msgstr	""
+msgstr	"# [Envoyer/Enregistrer] fichier active. Le format ressemble à\n"
+	"# celui du fichier news active :\n"
+	"#   nom_groupe  max.numéro_art  min.numéro_art  /répertoire\n"
+	"# Le 4ème champ est le répertoire racine utilisé\n"
+	"# (p.e. ~/Mail ou ~/News)\n"
 
-#: src/lang.c:513
+#: src/lang.c:486
 #, c-format
 msgid	"%s marked as unread"
 msgstr	"%s marqué comme non lu"
 
-#: src/lang.c:514
+#: src/lang.c:487
 #, c-format
 msgid	"Marked %d of %d tagged %s as read"
-msgstr	""
+msgstr	"%d marqué(s) sur %d sélectionné(s) %s comme lu(s)"
 
-#: src/lang.c:515
+#: src/lang.c:488
 #, c-format
 msgid	"Mark all articles as read%s?"
 msgstr	"Marquer tous les articles comme lus%s ?"
 
-#: src/lang.c:516
+#: src/lang.c:489
 #, c-format
 msgid	"Mark %s=tagged articles, %s=current article, %s=quit: "
-msgstr	""
+msgstr	"Marquer %s=art. marqués, %s=article actuel, %s=quitter : "
 
-#: src/lang.c:517
+#: src/lang.c:490
 #, c-format
 msgid	"Mark group %.*s as read?"
 msgstr	"Marquer le groupe %.*s comme lu ?"
 
-#: src/lang.c:518
+#: src/lang.c:491
 #, c-format
 msgid	"Mark thread as read%s?"
-msgstr	"Marquer l'enfilade comme lue%s ?"
+msgstr	"Marquer le fil comme lu%s ?"
 
-#: src/lang.c:519
+#: src/lang.c:492
 #, c-format
 msgid	"Mark %s=tagged articles/threads, %s=current thread, %s=quit: "
-msgstr	""
+msgstr	"Marquer %s=art./fils marqués, %s=fil actuel, %s=quitter : "
 
-#: src/lang.c:520
+#: src/lang.c:493
 #, c-format
 msgid	"Matching %s groups..."
 msgstr	"%s groupes correspondants..."
 
-#: src/lang.c:521 src/lang.c:525
+#: src/lang.c:494 src/lang.c:498
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s=search pattern; %s=kill/select"
 msgstr	"<n>=régler l'actuel à n; %s=non lu suivant; %s=rech. terme; %s=filtrer/sél."
 
 # TRANSLATION TOO LONG
-#: src/lang.c:522
+#: src/lang.c:495
 #, c-format
 msgid	"%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list "
 	"thread"
-msgstr	"%s=rech. auteur; %s=tout lu; %s=ligne + bas; %s=ligne + haut; %s=marquer lu; "
-	"%s=voir enfilade"
+msgstr	"%s=rech. auteur; %s=tout lu; %s=bas; %s=haut; %s=marquer lu; %s=voir fil"
 
-#: src/lang.c:523
+#: src/lang.c:496
 #, c-format
 msgid	"%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom"
-msgstr	"%s=ligne + haut; %s=ligne + bas; %s=haut de page; %s=bas de page; %s=haut; "
-	"%s=bas"
+msgstr	"%s=haut; %s=bas; %s=haut de page; %s=bas de page; %s=haut; %s=bas"
 
-#: src/lang.c:524
+#: src/lang.c:497
 #, c-format
 msgid	"%s=search forwards; %s=search backwards; %s=quit"
 msgstr	"%s=recherche avant; %s=recherche arrière; %s=quitter"
 
-#: src/lang.c:526
+#: src/lang.c:499
 #, c-format
 msgid	"%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read"
 msgstr	"%s=rech. auteur; %s=rech. corps; %s=tout marquer lu; %s=suivi; %s=marquer lu"
 
-# TRANSLATION TOO LONG
-#: src/lang.c:530
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
-	"%s=post"
-msgstr	"%s=pipe; %s=mail; %s=imprimer; %s=quitter; %s=voir lu/non lu; %s=enregistrer; "
-	"%s=sél.; %s=poster"
-
-# TRANSLATION TOO LONG
-#: src/lang.c:531
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=pipe; %s=mail; %s=imprimer; %s=quitter; %s=répondre; %s=enregistrer; "
-	"%s=sél.; %s=poster"
-
-#: src/lang.c:533
-#, c-format
-msgid	"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=mail; %s=imprimer; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=sél.; "
-	"%s=poster"
-
-#: src/lang.c:534
-#, c-format
-msgid	"%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=mail; %s=imprimer; %s=quitter; %s=répondre; %s=enregistrer; %s=sél.; "
-	"%s=poster"
-
-#: src/lang.c:538
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=pipe; %s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=sél.; "
-	"%s=poster"
-
-#: src/lang.c:539
-#, c-format
-msgid	"%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=pipe; %s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=sél.; %s=poster"
-
-#: src/lang.c:541
-#, c-format
-msgid	"%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr	"%s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=sélection; "
-	"%s=poster"
-
-#: src/lang.c:542
-#, c-format
-msgid	"%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr	"%s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=sélection; %s=poster"
-
-#: src/lang.c:546
+#: src/lang.c:500
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup"
 msgstr	"<n>=passer actuel à n; %s=non lu suivant; %s,%s=rech. terme; %s=tout lu"
 
 # TRANSLATION TOO LONG
-#: src/lang.c:547
+#: src/lang.c:501
 #, c-format
 msgid	"%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread"
-msgstr	"%s=ligne + bas; %s=ligne + haut; %s=aide; %s=déplacer; %s=quitter; %s=voir "
-	"lu/non lu"
+msgstr	"%s=bas; %s=haut; %s=aide; %s=déplacer; %s=quitter; %s=voir lu/non lu"
 
-#: src/lang.c:548
+#: src/lang.c:502
 #, c-format
 msgid	"%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out"
 msgstr	"%s=abonner; %s=sous-critère; %s=désabonner; %s=critère; %s=yank in/out"
 
-#: src/lang.c:549
+#: src/lang.c:503
 #, c-format
 msgid	"<n>=set current to n; %s=next unread; %s=catchup; %s=display toggle"
-msgstr	""
+msgstr	"<n>=passer l'actuel à n; %s=non lu suivant; %s=tout lu; %s=basculer "
+	"l'affichage"
 
-#: src/lang.c:550
+#: src/lang.c:504
 #, c-format
 msgid	"%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread"
-msgstr	""
+msgstr	"%s=aide; %s=bas; %s=haut; %s=quitter; %s=marquer; %s=marquer non lu"
 
-#: src/lang.c:551
+#: src/lang.c:505
 msgid	"--More--"
 msgstr	"-- Plus --"
 
-#: src/lang.c:552
+#: src/lang.c:506
 #, c-format
 msgid	"Moving %s..."
 msgstr	"Déplacement de %s..."
 
-#: src/lang.c:553
+#: src/lang.c:508
 msgid	", name: "
 msgstr	", nom : "
 
-#: src/lang.c:554
+#: src/lang.c:509
 #, c-format
 msgid	"Goto newsgroup [%s]> "
 msgstr	"Aller dans le groupe [%s]> "
 
-#: src/lang.c:555
+#: src/lang.c:510
 msgid	"newsgroups"
 msgstr	"groupes"
 
-#: src/lang.c:556
+#: src/lang.c:511
 #, c-format
 msgid	"Position %s in group list (1,2,..,$) [%d]> "
 msgstr	"Placer %s dans la liste des groupes (1,2,..,$) [%d]> "
 
-#: src/lang.c:557
+#: src/lang.c:512
 msgid	"newsgroup"
 msgstr	"groupe"
 
-#: src/lang.c:558
+#: src/lang.c:513
 msgid	"Try and save newsrc file again?"
 msgstr	"Encore essayer et enregistrer le newsrc ?"
 
-#: src/lang.c:559
+#: src/lang.c:514
 msgid	"Warning: No newsgroups were written to your newsrc file. Save aborted."
 msgstr	"Attention : Aucuns groupes n'a été écrits dans le newsrc. Enregistrement "
 	"annulé."
 
-#: src/lang.c:560
+#: src/lang.c:515
 msgid	"newsrc file saved successfully.\n"
 msgstr	"le newsrc a été enregistré avec succès.\n"
 
-#: src/lang.c:561
+#: src/lang.c:516
 msgid	"-- Next response --"
 msgstr	"-- Réponse suivante --"
 
-#: src/lang.c:562
+#: src/lang.c:517
 #, c-format
 msgid	"NNTP authorization password not found for %s"
 msgstr	"Mot de passe NNTP introuvable pour %s"
 
-#: src/lang.c:565 src/nntplib.c:966
-msgid	"205  Closing connection"
-msgstr	"205 Fermeture de la connexion"
-
-#: src/lang.c:566
-msgid	"  -A       force authentication on connect"
-msgstr	"  -A       force l'authentication à la connexion"
-
-#: src/lang.c:567
-#, c-format
-msgid	"  -g serv  read news from NNTP server serv [default=%s]"
-msgstr	""
-
-#: src/lang.c:568
-#, c-format
-msgid	"  -p port  use port as NNTP port [default=%d]"
-msgstr	""
-
-#: src/lang.c:569
-msgid	"  -Q       quick start. Same as -nqd"
-msgstr	""
-
-#: src/lang.c:570
-msgid	"  -l       use only LIST instead of GROUP (-n) command"
-msgstr	""
-
-#: src/lang.c:571
-msgid	"  -n       only read subscribed .newsrc groups from NNTP server"
-msgstr	""
-
-#: src/lang.c:573
-msgid	"  -Q       quick start. Same as -qd"
-msgstr	""
-
-#: src/lang.c:574
-msgid	"  -l       read only active file instead of scanning spool (-n) command"
-msgstr	""
-
-#: src/lang.c:575
-msgid	"  -n       only read subscribed .newsrc groups from spool"
-msgstr	""
-
-#: src/lang.c:578
+#: src/lang.c:518
 msgid	"No  "
 msgstr	"Non "
 
-#: src/lang.c:579
+#: src/lang.c:519
 msgid	"*** No articles ***"
 msgstr	"*** Pas d'articles ***"
 
-#: src/lang.c:580
+#: src/lang.c:520
 msgid	"No articles have been posted"
 msgstr	"Aucun article n'a été posté"
 
-#: src/lang.c:583
-msgid	"No command"
-msgstr	"Pas de commande"
-
-#: src/lang.c:588
-msgid	"Terminal does not support color"
-msgstr	"Terminal ne supporte pas les couleurs"
-
-#: src/lang.c:592
+#: src/lang.c:521
 msgid	"*** No description ***"
 msgstr	"*** Pas de description ***"
 
-#: src/lang.c:593
+#: src/lang.c:522
 msgid	"No filename"
 msgstr	"Pas de nom de fichier"
 
-#: src/lang.c:594
+#: src/lang.c:523
 msgid	"No group"
 msgstr	"Pas de groupe"
 
-#: src/lang.c:595
+#: src/lang.c:524
 msgid	"*** No groups ***"
 msgstr	"*** Pas de groupes ***"
 
-#: src/lang.c:596
+#: src/lang.c:525
 msgid	"No more groups to read"
 msgstr	"Plus de groupes à lire"
 
-#: src/lang.c:597
+#: src/lang.c:526
 msgid	"No last message"
 msgstr	"Pas de dernier message"
 
-#: src/lang.c:598
+#: src/lang.c:527
 msgid	"No mail address"
 msgstr	"Pas d'adresse email"
 
-#: src/lang.c:599
+#: src/lang.c:528
 msgid	"No articles marked for saving"
 msgstr	"Pas d'articles marqués à enregistrer"
 
-#: src/lang.c:600
+#: src/lang.c:529
 msgid	"No match"
 msgstr	"Pas de résultat"
 
-#: src/lang.c:601
+#: src/lang.c:530
 msgid	"No more groups"
 msgstr	"Plus de groupes"
 
-#: src/lang.c:602
+#: src/lang.c:531
 msgid	"No newsgroups"
 msgstr	"Pas de groupes"
 
-#: src/lang.c:603
+#: src/lang.c:532
 msgid	"No next unread article"
-msgstr	""
+msgstr	"Pas d'article non lu suivant"
 
-#: src/lang.c:604
+#: src/lang.c:533
 msgid	"No previous group"
-msgstr	""
+msgstr	"Pas de groupe précédent"
 
-#: src/lang.c:605
+#: src/lang.c:534
 msgid	"No previous unread article"
-msgstr	""
+msgstr	"Pas d'article non lu précédent"
 
-#: src/lang.c:606
+#: src/lang.c:535
 #, c-format
 msgid	"No responses%s"
 msgstr	"Pas de réponses%s"
 
-#: src/lang.c:607
+#: src/lang.c:536
 msgid	"No responses"
 msgstr	"Pas de réponses"
 
-#: src/lang.c:608
+#: src/lang.c:537
 msgid	"No responses to list in current thread"
-msgstr	"Pas de réponses à afficher dans l'enfilade actuelle"
+msgstr	"Pas de réponses à afficher dans le fil actuel"
 
-#: src/lang.c:609
+#: src/lang.c:538
 msgid	"No search string"
 msgstr	"Pas de termes à rechercher"
 
-#: src/lang.c:610
+#: src/lang.c:539
 msgid	"No subject"
 msgstr	"Pas de sujet"
 
-#: src/lang.c:611
+#: src/lang.c:540
 #, c-format
 msgid	"%s: Terminal must have clear to end-of-line (ce)\n"
-msgstr	""
+msgstr	"%s: Terminal doit avoir la fonction clear to end-of-line (ce)\n"
 
-#: src/lang.c:612
+#: src/lang.c:541
 #, c-format
 msgid	"%s: Terminal must have clear to end-of-screen (cd)\n"
-msgstr	""
+msgstr	"%s: Terminal doit avoir la fonction clear to end-of-screen (cd)\n"
 
-#: src/lang.c:613
+#: src/lang.c:542
 #, c-format
 msgid	"%s: Terminal must have clearscreen (cl) capability\n"
-msgstr	""
+msgstr	"%s: Terminal doit avoir la fonction clearscreen (cl)\n"
 
-#: src/lang.c:614
+#: src/lang.c:543
 #, c-format
 msgid	"%s: Terminal must have cursor motion (cm)\n"
-msgstr	""
+msgstr	"%s: Terminal doit avoir la fonction cursor motion (cm)\n"
 
-#: src/lang.c:615
+#: src/lang.c:544
 #, c-format
 msgid	"%s: TERM variable must be set to use screen capabilities\n"
-msgstr	""
+msgstr	"%s: la variable TERM doit être utilisée pour utiliser les fonctions\n"
 
-#: src/lang.c:616
+#: src/lang.c:545
 #, c-format
 msgid	"No viewer found for %s/%s\n"
-msgstr	""
-
-#: src/lang.c:617
-msgid	"Your server does not support the NNTP XOVER or OVER command.\n"
-	"Tin will use local index files instead.\n"
-msgstr	""
+msgstr	"Visualiseur introuvable pour %s/%s\n"
 
-#: src/lang.c:618
+#: src/lang.c:546
 msgid	"Newsgroup does not exist on this server"
 msgstr	"Groupe inexistant sur ce serveur"
 
-#: src/lang.c:619
+#: src/lang.c:547
 #, c-format
 msgid	"Group %s not found in active file"
 msgstr	"Groupe %s introuvable dans le fichier active"
 
-#: src/lang.c:620
+#: src/lang.c:548
 msgid	"c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr	"c)réer, utiliser a)utre nom, utiliser .newsrc par d)éfaut, q)uitter tin : "
 
-#: src/lang.c:621
+#: src/lang.c:549
 msgid	"use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr	"utiliser a)utre nom, utiliser .newsrc par d)éfaut, q)uitter tin : "
 
-#: src/lang.c:623
+#: src/lang.c:550
 #, c-format
 msgid	"# NNTP-server -> newsrc translation table and NNTP-server\n"
 	"# shortname list for %s %s\n"
@@ -2357,76 +2270,40 @@ msgstr	"# Serveur-NNTP -> tableau de cor
 	"#   news.ka.nu    /tmp/nrc-nu      kanu    nu\n"
 	"#\n"
 
-#: src/lang.c:630
+#: src/lang.c:557
+msgid	"Only"
+msgstr	"Uniquement"
+
+#: src/lang.c:558
 #, c-format
 msgid	"Option not enabled. Recompile with %s."
 msgstr	"Option non activée. Recompilez avec %s."
 
-#: src/lang.c:631
+#: src/lang.c:559
 msgid	"Options Menu"
 msgstr	"Menu Options"
 
-#: src/lang.c:634
+#: src/lang.c:562
 #, c-format
 msgid	"Error in regex: %s at pos. %d '%s'"
 msgstr	"Erreur dans la regex : %s à %d '%s'"
 
-#: src/lang.c:635
+#: src/lang.c:563
 #, c-format
 msgid	"Error in regex: pcre internal error %d"
 msgstr	"Erreur dans la regex : erreur pcre interne %d"
 
-#: src/lang.c:636
+#: src/lang.c:564
 #, c-format
 msgid	"Error in regex: study - pcre internal error %s"
 msgstr	"Erreur dans la regex : study - erreur pcre interne %s"
 
-#: src/lang.c:639
-msgid	"Add key(s) to public keyring?"
-msgstr	"Ajouter les clé(s) au cercle public ?"
-
-#: src/lang.c:640
-#, c-format
-msgid	"%s=encrypt, %s=sign, %s=both, %s=quit: "
-msgstr	"%s=encodé, %s=signer, %s=les deux, %s=quitter : "
-
-#: src/lang.c:641
-#, c-format
-msgid	"%s=sign, %s=sign & include public key, %s=quit: "
-msgstr	"%s=signer, %s=sig. & inclure clé publique, %s=quitter : "
-
-#: src/lang.c:642
-#, c-format
-msgid	"PGP has not been set up (can't open %s)"
-msgstr	"PGP n'a pas été configuré (ouverture de %s impossible)"
-
-#: src/lang.c:643
-msgid	"Article not signed and no public keys found"
-msgstr	"Article non signé et pas de clés publiques trouvées"
-
-#: src/lang.c:647
-msgid	"Pipe"
-msgstr	"Passer (pipe)"
-
-#: src/lang.c:648
-#, c-format
-msgid	"Pipe to command [%.*s]> "
-msgstr	"Passer à la commande [%.*s]> "
-
-#: src/lang.c:649
-msgid	"Piping..."
-msgstr	"Passage..."
-
-#: src/lang.c:651
-msgid	"Piping not enabled."
-msgstr	"Passage non activé."
-
-#: src/lang.c:654
+#: src/lang.c:565
 msgid	"Post a followup..."
 msgstr	"Postage du suivi..."
 
 #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone
-#: src/lang.c:656
+#: src/lang.c:567
 msgid	"An error has occurred while posting the article. If you think that this\n"
 	"error is temporary or otherwise correctable, you can postpone the article\n"
 	"and pick it up again with ^O later.\n"
@@ -2434,481 +2311,497 @@ msgstr	"Une erreur est survenue lors du 
 	"cette erreur est temporaire ou alors corrigeable, vous pouvez enregistrer\n"
 	"l'article comme brouillon et le réutiliser plus tard grâce à la commande ^O.\n"
 
-#: src/lang.c:659
+#: src/lang.c:570
 msgid	"Posted articles history"
 msgstr	"Historique des articles postés"
 
-#: src/lang.c:660
+#: src/lang.c:571
 #, c-format
 msgid	"Post to newsgroup(s) [%s]> "
 msgstr	"Poster dans groupe(s) [%s]> "
 
-#: src/lang.c:661
+#: src/lang.c:572
 msgid	"-- post processing started --"
 msgstr	"-- post-traitement lancé --"
 
-#: src/lang.c:662
+#: src/lang.c:573
 msgid	"-- post processing completed --"
 msgstr	"-- post-traitement terminé --"
 
-#: src/lang.c:663
+#: src/lang.c:574
 #, c-format
 msgid	"Post subject [%s]> "
 msgstr	"Poster le sujet [%s]> "
 
-#: src/lang.c:665
-msgid	"Posting using external inews failed. Use built in inews instead?"
-msgstr	"Le postage avec l'inews externe à échoué. Utiliser l'inews intégré ?"
-
-#: src/lang.c:666
-msgid	"It worked! Should I always use my built in inews from now on?"
-msgstr	"Ca a marché ! Devrais-je toujours utiliser mon inews intégré à présent ?"
-
-#: src/lang.c:668
+#: src/lang.c:575
 msgid	"# Summary of mailed/posted messages viewable by 'W' command from within tin.\n"
 msgstr	"# Sommaire des messages envoyés/postés visible par la commande 'W' depuis "
 	"tin.\n"
 
-#: src/lang.c:669
+#: src/lang.c:576
 msgid	"Posting article..."
 msgstr	"Postage de l'article..."
 
-#: src/lang.c:670
+#: src/lang.c:577
 msgid	"Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): "
 msgstr	"Poster les brouillons [%%.*s] ? (%s/%s/%s/%s/%s) : "
 
-#: src/lang.c:671
+#: src/lang.c:578
 #, c-format
 msgid	"Hot %s"
-msgstr	"%s marqué"
+msgstr	"%s sélectionné"
 
-#: src/lang.c:672
+#: src/lang.c:579
 #, c-format
 msgid	"Tagged %s"
-msgstr	"%s sélectionné"
+msgstr	"%s marqué"
 
-#: src/lang.c:673
+#: src/lang.c:580
+msgid	"Processing mail messages marked for deletion."
+msgstr	"Traitement des emails enregistrés marqués pour effacement."
+
+#: src/lang.c:581
+msgid	"Processing saved articles marked for deletion."
+msgstr	"Traitement des articles enregistrés marqués pour effacement."
+
+#: src/lang.c:582
 #, c-format
 msgid	"Accept Followup-To? %s=post, %s=ignore, %s=quit: "
 msgstr	"Accepter le Suivi ? %s=poster, %s=ignorer, %s=quitter : "
 
-#: src/lang.c:674
+#: src/lang.c:583
 msgid	"Article unchanged, abort mailing?"
 msgstr	"Article inchangé, annuler l'envoi ?"
 
-#: src/lang.c:675
+#: src/lang.c:584
 #, c-format
 msgid	"Do you want to see postponed articles (%d)?"
 msgstr	"Voulez-vous voir les brouillons (%d) ?"
 
-#: src/lang.c:676
+#: src/lang.c:586
 msgid	"Add quick kill filter?"
 msgstr	"Ajout rapide d'un filtre d'élimination ?"
 
-#: src/lang.c:677
+#: src/lang.c:587
 msgid	"Add quick selection filter?"
 msgstr	"Ajout rapide d'un filtre de sélection ?"
 
-#: src/lang.c:678
+#: src/lang.c:588
 msgid	"Do you really want to quit?"
 msgstr	"Voulez-vous réellement quitter ?"
 
-#: src/lang.c:679
+#: src/lang.c:589
 msgid	"%s=edit cancel message, %s=quit, %s=delete (cancel) [%%.*s]: "
 msgstr	"%s=éditer message d'annulation, %s=quitter, %s=effacer (annuler) [%%.*s] : "
 
-#: src/lang.c:680
+#: src/lang.c:590
 msgid	"You have tagged articles in this group - quit anyway?"
 msgstr	"Vous avez des articles marqués dans ce groupe - tout de même quitter?"
 
-#: src/lang.c:681
+#: src/lang.c:591
 #, c-format
 msgid	"%s=quit, %s=edit, %s=postpone: "
 msgstr	"%s=quitter, %s=éditer, %s=brouillon : "
 
-#: src/lang.c:682
+#: src/lang.c:592
 #, c-format
 msgid	"%s=quit %s=edit %s=save kill description: "
 msgstr	"%s=quitter, %s=éditer, %s=enregistrer description du filtre : "
 
-#: src/lang.c:683
+#: src/lang.c:593
 #, c-format
 msgid	"%s=quit %s=edit %s=save select description: "
 msgstr	"%s=quitter %s=éditer %s=enregistrer la description sél. : "
 
-#: src/lang.c:684
+#: src/lang.c:594
 msgid	"Do you really want to quit without saving your configuration?"
 msgstr	"Voulez-vous réellement quitter sans enregistrer votre configuration ?"
 
-#: src/lang.c:686
+#: src/lang.c:597
 msgid	"Invalid range - valid are '0-9.$' eg. 1-$"
 msgstr	"Champ invalide - '0-9.$' pe. 1-$ est valide"
 
-#: src/lang.c:687
+#: src/lang.c:598
 msgid	"Do you want to abort this operation?"
 msgstr	"Voulez-vous annuler cette opération ?"
 
-#: src/lang.c:688
+#: src/lang.c:599
 msgid	"Do you want to exit tin immediately?"
 msgstr	"Voulez-vous quitter tin immédiatement ?"
 
-#: src/lang.c:689
+#: src/lang.c:600
 msgid	"Read response> "
 msgstr	"Lire la réponse> "
 
-#: src/lang.c:690
+#: src/lang.c:601
 msgid	"Reading ('q' to quit)..."
 msgstr	"Lecture ('q' pour quitter)..."
 
-#: src/lang.c:691
+#: src/lang.c:602
 #, c-format
 msgid	"Reading %sarticles..."
 msgstr	"Lecture de %sarticles..."
 
-#: src/lang.c:692
+#: src/lang.c:603
 #, c-format
 msgid	"Reading %sattributes file...\n"
 msgstr	"Lecture du fichier %sattributes...\n"
 
-#: src/lang.c:693
+#: src/lang.c:604
 #, c-format
 msgid	"Reading %sconfig file...\n"
 msgstr	"Lecture du fichier %sconfig...\n"
 
-#: src/lang.c:694
+#: src/lang.c:605
 msgid	"Reading filter file...\n"
 msgstr	"Lecture du fichier filter...\n"
 
-#: src/lang.c:695
+#: src/lang.c:606
 #, c-format
 msgid	"Reading %s groups..."
 msgstr	"Lecture de %s groupes..."
 
-#: src/lang.c:696
+#: src/lang.c:607
 msgid	"Reading input history file...\n"
 msgstr	"Lecture du fichier d'historique...\n"
 
-#: src/lang.c:697
+#: src/lang.c:608
 msgid	"Reading keymap file...\n"
 msgstr	"Lecture du fichier keymap...\n"
 
-#: src/lang.c:699
-msgid	"Reading mail active file... "
-msgstr	"Lecture du fichier active mail... "
-
-#: src/lang.c:700
-msgid	"Reading mailgroups file... "
-msgstr	"Lecture du fichier mailgroups... "
-
-#: src/lang.c:702
+#: src/lang.c:609
 msgid	"Reading groups from active file... "
 msgstr	"Lecture des groupes depuis le fichier active... "
 
-#: src/lang.c:703
+#: src/lang.c:610
 msgid	"Reading groups from newsrc file... "
 msgstr	"Lecture des groupes depuis le fichier newsrc... "
 
-#: src/lang.c:704
+#: src/lang.c:611
 msgid	"Reading newsgroups file... "
 msgstr	"Lecture du fichier newsgroups... "
 
-#: src/lang.c:705
+#: src/lang.c:612
 msgid	"Reading newsrc file..."
 msgstr	"Lecture du fichier newsrc..."
 
-#: src/lang.c:706
-msgid	"Connection to news server has timed out. Reconnect?"
-msgstr	"Connexion au serveur de nouvelles expirée. Se reconnecter ?"
-
-#: src/lang.c:707
+#: src/lang.c:613
 #, c-format
 msgid	"Bogus group %s removed."
 msgstr	"Effacement du groupe corrompu %s."
 
-#: src/lang.c:708
+#: src/lang.c:614
 #, c-format
 msgid	"Error: rename %s to %s"
 msgstr	"Erreur : renommer %s à %s"
 
-#: src/lang.c:709
+#: src/lang.c:615
 msgid	"Reply to author..."
 msgstr	"Répondre à l'auteur..."
 
-#: src/lang.c:710
+#: src/lang.c:616
 msgid	"Repost"
 msgstr	"Reposter"
 
-#: src/lang.c:711
+#: src/lang.c:617
 msgid	"Reposting article..."
 msgstr	"Repostage de l'article..."
 
-#: src/lang.c:712
+#: src/lang.c:618
 #, c-format
 msgid	"Repost article(s) to group(s) [%s]> "
 msgstr	"Reposter article(s) dans groupe(s) [%s]> "
 
-#: src/lang.c:713
+#: src/lang.c:619
 msgid	"Reset newsrc?"
 msgstr	"Réinitialiser newsrc ?"
 
-#: src/lang.c:714
+#: src/lang.c:620
 msgid	"Responses have been directed to the following newsgroups"
 msgstr	"Les réponses ont été redirigées vers les groupes suivants"
 
-#: src/lang.c:715
+#: src/lang.c:621
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
-msgstr	""
+msgstr	"Les réponses ont été redirigées à l'auteur. %s=mail, %s=poster, %s=quitter : "
 
-#: src/lang.c:716
+#: src/lang.c:622
 #, c-format
-msgid	"RespNo %3d of %3d%s"
-msgstr	"Nbre rép. %3d / %3d%s"
+msgid	"RespNo %4d of %4d%s"
+msgstr	"Nbre rép. %4d/%4d%s"
 
-#: src/lang.c:717
+#: src/lang.c:623
 msgid	"Press <RETURN> to continue..."
 msgstr	"Appuyez sur <RETOUR> pour continuer..."
 
-#: src/lang.c:718
+#: src/lang.c:625
+#, c-format
+msgid	"Select From    [%-*.*s] (y/n): "
+msgstr	""
+
+#: src/lang.c:626
+msgid	"Select Lines: (</>num): "
+msgstr	""
+
+#: src/lang.c:627
+msgid	"Auto-select Article Menu"
+msgstr	""
+
+#: src/lang.c:628
+#, c-format
+msgid	"Select Msg-Id  [%-*.*s] (f/l/o/n): "
+msgstr	""
+
+#: src/lang.c:629
+msgid	"Select pattern scope: "
+msgstr	""
+
+#: src/lang.c:630
+#, c-format
+msgid	"Select Subject [%-*.*s] (y/n): "
+msgstr	"Sél. Sujet [%-*.*s] (o/n)    : "
+
+#: src/lang.c:631
+msgid	"Select text pattern : "
+msgstr	""
+
+#: src/lang.c:632
+msgid	"Select time in days   : "
+msgstr	"Durée en jours        : "
+
+#: src/lang.c:633
+#, c-format
+msgid	"# %s server configuration file\n"
+	"# This file was automatically saved by %s %s %s (\"%s\")\n"
+	"#\n"
+	"# Do not edit while %s is running, since all your changes to this file\n"
+	"# will be overwritten when you leave %s.\n"
+	"# Do not edit at all if you don't know what you do.\n"
+	"############################################################################\n"
+	"\n"
+msgstr	""
+
+#: src/lang.c:639
+msgid	"Showing unread groups only"
+msgstr	"Afficher uniquement les groupes non lus"
+
+#: src/lang.c:640
+msgid	"Subject: line (ignore case)   "
+msgstr	"Ligne Sujet: (casse insensible)"
+
+#: src/lang.c:641
+msgid	"Subject: line (case sensitive)"
+msgstr	"Ligne Sujet: (casse sensible)  "
+
+#: src/lang.c:642
 msgid	"Save"
 msgstr	"Enregistrer"
 
-#: src/lang.c:719
+#: src/lang.c:643
 #, c-format
 msgid	"Save '%s' (%s/%s)?"
 msgstr	"Enregistrer '%s' (%s/%s) ?"
 
-#: src/lang.c:720
+#: src/lang.c:644
 msgid	"Save configuration before continuing?"
 msgstr	"Enregistrer la configuration avant de continuer ?"
 
-#: src/lang.c:721
+#: src/lang.c:645
 msgid	"Save filename> "
 msgstr	"Enregistrer sous le nom de fichier> "
 
-#: src/lang.c:722
+#: src/lang.c:646
 msgid	"Saved"
 msgstr	"Enregistré"
 
-#: src/lang.c:723
+#: src/lang.c:647
 #, c-format
 msgid	"%4d unread (%4d hot) %s in %s\n"
 msgstr	"%4d non lu (%4d sél.) %s dans %s\n"
 
-#: src/lang.c:724
+#: src/lang.c:648
 #, c-format
 msgid	"Saved %s...\n"
 msgstr	"Enregistrement de %s...\n"
 
-#: src/lang.c:725
+#: src/lang.c:649
 msgid	"Nothing was saved"
 msgstr	"Rien n'a été enregistré"
 
-#: src/lang.c:726
+#: src/lang.c:650
 #, c-format
 msgid	"\n"
 	"%s %d %s from %d %s\n"
 msgstr	"\n"
 	"%s %d %s de %d %s\n"
 
-#: src/lang.c:727
+#: src/lang.c:651
 #, c-format
 msgid	"-- %s saved to %s%s --"
 msgstr	"-- %s enregistré dans %s%s --"
 
-#: src/lang.c:728
+#: src/lang.c:652
 #, c-format
 msgid	"-- %s saved to %s - %s --"
 msgstr	"-- %s enregistré dans %s - %s --"
 
-#: src/lang.c:729
+#: src/lang.c:653
 msgid	"Saving..."
 msgstr	"Enregistrement..."
 
-#: src/lang.c:730
+#: src/lang.c:654
 #, c-format
 msgid	"%s: Screen initialization failed"
 msgstr	"%s : Échec de l'initialisation de l'écran"
 
-#: src/lang.c:731
+#: src/lang.c:655
 #, c-format
 msgid	"%s: screen is too small\n"
 msgstr	"%s : l'écran est trop petit\n"
 
-#: src/lang.c:732
+#: src/lang.c:656
 #, c-format
 msgid	"screen is too small, %s is exiting\n"
 msgstr	"l'écran est trop petit, %s quitte\n"
 
-#: src/lang.c:733
+#: src/lang.c:657
 #, c-format
 msgid	"Search backwards [%s]> "
 msgstr	"Recherche arrière [%s]> "
 
-#: src/lang.c:734
+#: src/lang.c:658
 #, c-format
 msgid	"Search body [%s]> "
 msgstr	"Rechercher dans le corps [%s]> "
 
-#: src/lang.c:735
+#: src/lang.c:659
 #, c-format
 msgid	"Search forwards [%s]> "
 msgstr	"Recherche avant [%s]> "
 
-#: src/lang.c:736
+#: src/lang.c:660
 msgid	"Searching..."
 msgstr	"Recherche..."
 
-#: src/lang.c:737
+#: src/lang.c:661
 #, c-format
 msgid	"Searching article %d of %d ('q' to abort)..."
 msgstr	"Recherche article %d sur %d ('q' pour annuler)..."
 
-#: src/lang.c:738
+#: src/lang.c:662
 msgid	"Select article> "
 msgstr	"Sélectionner l'article> "
 
 # TRANSLATION TOO LONG (75 chars max)
-#: src/lang.c:739
+#: src/lang.c:663
 msgid	"Select option number before text or use arrow keys and <CR>. 'q' to quit."
 msgstr	"Sélection n° avant le texte ou utiliser les flèches et <CR>. 'q' pour quitter."
 
-#: src/lang.c:740
+#: src/lang.c:664
 msgid	"Select group> "
 msgstr	"Sélectionner le groupe> "
 
-#: src/lang.c:741
+#: src/lang.c:665
 #, c-format
 msgid	"Enter selection pattern [%s]> "
 msgstr	"Entrez le critère de sélection [%s]> "
 
-#: src/lang.c:742
+#: src/lang.c:666
 msgid	"Select thread > "
-msgstr	"Sélectionner l'enfilade > "
+msgstr	"Sélectionner le fil > "
 
-#: src/lang.c:743
+#: src/lang.c:667
 #, c-format
 msgid	"%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n"
 msgstr	"%s %s %s (\"%s\") [%s]: envoi d'un rapport de bug DÉTAILLÉ à %s\n"
 
-#: src/lang.c:744
-#, c-format
-msgid	"Put the server name in the file %s,\n"
-	"or set the environment variable NNTPSERVER"
-msgstr	""
-
-#: src/lang.c:745
+#: src/lang.c:668
 msgid	"servers active-file"
-msgstr	""
-
-#: src/lang.c:747
-#, c-format
-msgid	"Shell Command (%s)"
-msgstr	""
-
-#: src/lang.c:748
-#, c-format
-msgid	"Enter shell command [%s]> "
-msgstr	""
+msgstr	"fichier active des serveurs"
 
-#: src/lang.c:750
+#: src/lang.c:669
 msgid	"Cannot move into new newsgroups. Subscribe first..."
-msgstr	""
+msgstr	"Déplacement dans nouveaux groupes impossible. Abonnez-vous d'abord..."
 
-#: src/lang.c:751
+#: src/lang.c:670
 msgid	"<SPACE>"
 msgstr	"<ESPACE>"
 
-#: src/lang.c:752
+#: src/lang.c:671
 #, c-format
 msgid	"Starting: (%s)"
 msgstr	"Démarrage : (%s)"
 
-#: src/lang.c:753
+#: src/lang.c:672
 #, c-format
 msgid	"List Thread (%d of %d)"
-msgstr	"Afficher l'enfilade (%d sur %d)"
+msgstr	"Afficher le fil (%d sur %d)"
 
-#: src/lang.c:754
+#: src/lang.c:673
 #, c-format
 msgid	"Thread (%.*s)"
-msgstr	"Enfilade (%.*s)"
+msgstr	"Fil (%.*s)"
 
-#: src/lang.c:755
+#: src/lang.c:674
 msgid	"Enter wildcard subscribe pattern> "
 msgstr	"Entrer un caractère joker comme critère> "
 
-#: src/lang.c:756
+#: src/lang.c:675
 #, c-format
 msgid	"subscribed to %d groups"
 msgstr	"Abonné à %d groupes"
 
-#: src/lang.c:757
+#: src/lang.c:676
 #, c-format
 msgid	"Subscribed to %s"
 msgstr	"Abonné à %s"
 
-#: src/lang.c:758
+#: src/lang.c:677
 msgid	"Subscribing... "
 msgstr	"Abonnement..."
 
-#: src/lang.c:759
+#: src/lang.c:678
 msgid	"Repost or supersede article(s) [%%.*s]? (%s/%s/%s): "
 msgstr	"Reposter ou remplacer le(s) article(s) [%%.*s]? (%s/%s/%s) : "
 
-#: src/lang.c:760
+#: src/lang.c:679
 #, c-format
 msgid	"Supersede article(s) to group(s) [%s]> "
 msgstr	"Remplacer le(s) article(s) du(es) groupe(s) [%s]> "
 
-#: src/lang.c:761
+#: src/lang.c:680
 msgid	"Superseding article ..."
 msgstr	"Remplacement de l'article..."
 
-#: src/lang.c:762
+#: src/lang.c:681
 #, c-format
 msgid	"\n"
 	"Stopped. Type 'fg' to restart %s\n"
 msgstr	"\n"
 	"Arrêté. Tapez 'fg' pour relancer %s\n"
 
-#: src/lang.c:763
+#: src/lang.c:683
+#, c-format
+msgid	"%d days"
+msgstr	"%d jours"
+
+#: src/lang.c:684
 msgid	"<TAB>"
 msgstr	"<TAB>"
 
-#: src/lang.c:764
+#: src/lang.c:685
 msgid	"Tagged article"
 msgstr	"Article marqué"
 
-#: src/lang.c:765
+#: src/lang.c:686
 msgid	"Tagged thread"
-msgstr	"Enfilade marquée"
-
-#: src/lang.c:768
-msgid	"# For color-adjust use the following numbers\n"
-	"#  0-black       1-red         2-green        3-brown\n"
-	"#  4-blue        5-pink        6-cyan         7-white\n"
-	"# These are *only* for foreground:\n"
-	"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
-	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
-	"# A '-1' is interpreted as default (foreground normally is white, and\n"
-	"# background black)\n"
-	"\n"
-msgstr	"# Pour ajuster les couleurs utilisez les nombres suivants\n"
-	"#  0-noir        1-rouge       2-vert         3-marron\n"
-	"#  4-bleu        5-rose        6-cyan         7-blanc\n"
-	"# Celles-là sont *uniquement* pour l'arrière-plan :\n"
-	"#  8-gris        9-rouge gras 10-vert gras   11-jaune\n"
-	"# 12-bleu gras  13-rose gras  14-cyan gras   15-blanc gras\n"
-	"# '-1' est interprété comme défaut (l'avant-plan est normalement blanc,\n"
-	"# et l'arrière-plan noir)\n"
-	"\n"
+msgstr	"Fil marqué"
 
-#: src/lang.c:778
+#: src/lang.c:687
 msgid	"# Default action/prompt strings\n"
-msgstr	""
+msgstr	"# Termes action/prompt par défaut\n"
 
-#: src/lang.c:779
+#: src/lang.c:688
 msgid	"# Defaults for quick (1 key) kill & auto-selection filters\n"
 	"# header=NUM  0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n"
 	"#             5=Message-ID: & last References: entry only\n"
@@ -2916,811 +2809,968 @@ msgid	"# Defaults for quick (1 key) kill
 	"# global=ON/OFF  ON=apply to all groups OFF=apply to current group\n"
 	"# case=ON/OFF    ON=filter case sensitive OFF=ignore case\n"
 	"# expire=ON/OFF  ON=limit to default_filter_days OFF=don't ever expire\n"
-msgstr	""
+msgstr	"# Réglages par défaut pour les filtres et filtres d'auto-sélection\n"
+	"# header=NUM  0,1=Subject: 2,3=From: 4=Message-ID: & ligne References: "
+	"complète\n"
+	"#             5=Message-ID: & dernière entrée dans References: seulement\n"
+	"#             6=Message-ID: entrée 7=Lines: seulement\n"
+	"# global=ON/OFF  ON=appliquer à tous les groups OFF=appliquer au groupe "
+	"actuel\n"
+	"# case=ON/OFF    ON=filtre sensible à la casse OFF=filtre insensible\n"
+	"# expire=ON/OFF  ON=durée d'après default_filter_days OFF=n'expire jamais\n"
 
-#: src/lang.c:794
+#: src/lang.c:701
 msgid	"# If ON use print current subject or newsgroup description in the last line\n"
-msgstr	""
+msgstr	"# Si ON affiche le sujet actuel ou la description du groupe dans la dernière "
+	"ligne\n"
 
-#: src/lang.c:795
+#: src/lang.c:702
 msgid	"# Host & time info used for detecting new groups (don't touch)\n"
-msgstr	""
+msgstr	"# Info sur l'hôte & l'heure utilisées pour détecter les nouveaux groupes (ne "
+	"pas toucher)\n"
 
-#: src/lang.c:796
-msgid	"Enter wildcard unsubscribe pattern> "
-msgstr	""
+#: src/lang.c:703
+msgid	"There is no news\n"
+msgstr	"Rien de neuf\n"
 
-#: src/lang.c:797
-#, c-format
-msgid	"View '%s' (%s/%s)?"
-msgstr	"Vue '%s' (%s/%s) ?"
+#: src/lang.c:704
+msgid	"Thread"
+msgstr	"Fil"
 
-#.
-#. * Special value used to override option-list behavior
-#.
-#: src/lang.c:802 src/lang.c:866
-msgid	"Default"
-msgstr	"Défaut"
+#: src/lang.c:705
+msgid	"Thread Level Commands"
+msgstr	"Commandes pour fil"
 
-#: src/lang.c:814 src/lang.c:839 src/lang.c:855 src/refs.c:266
-msgid	"None"
-msgstr	"Aucun"
+#: src/lang.c:706
+msgid	"Thread deselected"
+msgstr	"Fil désélectionné"
 
-#: src/lang.c:815
-msgid	"Subject"
-msgstr	"Sujet"
+#: src/lang.c:707
+msgid	"Thread selected"
+msgstr	"Fil sélectionné"
 
-#: src/lang.c:816
-msgid	"References"
-msgstr	"Références"
+#: src/lang.c:708
+msgid	"Thread range"
+msgstr	"Champ du fil"
 
-#: src/lang.c:817
-msgid	"Both Subject and References"
-msgstr	"Sujet & Références"
+#: src/lang.c:709
+#, c-format
+msgid	"%sThread %4s of %4s"
+msgstr	"%sFil %4s de %4s"
 
-#: src/lang.c:818
-msgid	"Multipart Subject"
-msgstr	"Sujet multiparties"
+#: src/lang.c:710
+msgid	"Threading articles..."
+msgstr	"Regroupement des articles..."
 
-#: src/lang.c:830 src/lang.c:941
-msgid	"No"
-msgstr	"Non"
+#: src/lang.c:711
+#, c-format
+msgid	"Toggled word highlighting %s"
+msgstr	"(Dés)activer surbrillance %s"
 
-#: src/lang.c:831 src/lang.c:943
-msgid	"Yes"
-msgstr	"Oui"
+#: src/lang.c:712
+msgid	"Toggled rot13 encoding"
+msgstr	"(Dés)activer codage rot13"
 
-#: src/lang.c:832
-msgid	"Hide All"
-msgstr	""
+#: src/lang.c:713
+#, c-format
+msgid	"Toggled german TeX encoding %s"
+msgstr	"(Dés)activer codage TeX Allemand %s"
 
-#: src/lang.c:840
-msgid	"Address"
-msgstr	"Adresse"
+#: src/lang.c:714
+#, c-format
+msgid	"Toggled tab-width to %d"
+msgstr	"(Dés)activer largeur de tabulation à %d"
 
-#: src/lang.c:841
-msgid	"Full Name"
-msgstr	"Nom complet"
+#: src/lang.c:715
+#, c-format
+msgid	"%d Trying to dotlock %s"
+msgstr	"%d essaye de déverrouiller %s"
 
-#: src/lang.c:842
-msgid	"Address and Name"
-msgstr	"Adresse et nom"
+#: src/lang.c:716
+#, c-format
+msgid	"%d Trying to lock %s"
+msgstr	"%d essaye de verrouiller %s"
 
-#: src/lang.c:849
-msgid	"Max"
-msgstr	"Max"
+#: src/lang.c:717
+msgid	"           h=help\n"
+msgstr	"           h=aide\n"
 
-#: src/lang.c:850
-msgid	"Sum"
-msgstr	"Sum"
+#: src/lang.c:719
+msgid	"Unlimited"
+msgstr	"Illimité"
 
-#: src/lang.c:851
-msgid	"Average"
-msgstr	"Moyenne"
+#: src/lang.c:720
+msgid	"Enter wildcard unsubscribe pattern> "
+msgstr	"Terme joker pour se désabonner> "
 
-#: src/lang.c:856
-msgid	"Lines"
-msgstr	"Lignes"
+#: src/lang.c:721
+#, c-format
+msgid	"Error decoding %s : %s"
+msgstr	"Erreur lors du décodage de %s : %s"
 
-#: src/lang.c:857
-msgid	"Score"
-msgstr	"Score"
+#: src/lang.c:722
+msgid	"No end."
+msgstr	"Pas de fin."
 
-#: src/lang.c:858
-msgid	"Lines & Score"
-msgstr	"Lignes & score"
+#: src/lang.c:723
+#, c-format
+msgid	"%s successfully decoded."
+msgstr	"%s décodé avec succès."
 
-#: src/lang.c:867
-msgid	"Black"
-msgstr	"Noir"
+#: src/lang.c:724
+#, c-format
+msgid	"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
+	"\n"
+msgstr	"%*s[-- %s/%s, %sfichier uuencodé, %d lignes, nom : %s --]\n"
+	"\n"
 
-#: src/lang.c:868
-msgid	"Red"
-msgstr	"Rouge"
+#: src/lang.c:725
+msgid	"unread "
+msgstr	"non lu"
 
-#: src/lang.c:869
-msgid	"Green"
-msgstr	"Vert"
+#: src/lang.c:726
+#, c-format
+msgid	"unsubscribed from %d groups"
+msgstr	"désabonné de %d groupes"
 
-#: src/lang.c:870
-msgid	"Brown"
-msgstr	"Marron"
+#: src/lang.c:727
+#, c-format
+msgid	"Unsubscribed from %s"
+msgstr	"Désabonné de %s"
 
-#: src/lang.c:871
-msgid	"Blue"
-msgstr	"Bleu"
+#: src/lang.c:728
+msgid	"Unsubscribing... "
+msgstr	"Désabonnement..."
 
-#: src/lang.c:872
-msgid	"Pink"
-msgstr	"Rose"
+#: src/lang.c:729
+msgid	"Untagged article"
+msgstr	"Article non marqué"
 
-#: src/lang.c:873
-msgid	"Cyan"
-msgstr	"Cyan"
+#: src/lang.c:730
+msgid	"Untagged thread"
+msgstr	"Fil non marqué"
 
-#: src/lang.c:874
-msgid	"White"
-msgstr	"Blanc"
+#: src/lang.c:731
+msgid	"Unthreading articles..."
+msgstr	"Dégroupement des articles..."
 
-#: src/lang.c:875
-msgid	"Gray"
-msgstr	"Gris"
+#: src/lang.c:732
+msgid	"Updated"
+msgstr	"Mis à jour"
 
-#: src/lang.c:876
-msgid	"Light Red"
-msgstr	"Rouge gras"
+#: src/lang.c:733
+msgid	"Updating"
+msgstr	"Rafraîchissement"
 
-#: src/lang.c:877
-msgid	"Light Green"
-msgstr	"Vert gras"
+#: src/lang.c:734
+#, c-format
+msgid	"Opening %s\n"
+msgstr	"Ouverture %s\n"
 
-#: src/lang.c:878
-msgid	"Yellow"
-msgstr	"Jaune"
+#: src/lang.c:735
+msgid	"No more URL's in this article"
+msgstr	"Plus d'URL dans cet article"
 
-#: src/lang.c:879
-msgid	"Light Blue"
-msgstr	"Bleu gras"
+#: src/lang.c:736
+msgid	"Use MIME display program for this message?"
+msgstr	"Utiliser le programme d'affichage MIME pour ce message ?"
 
-#: src/lang.c:880
-msgid	"Light Pink"
-msgstr	"Rose gras"
+#: src/lang.c:737
+msgid	"  -c       mark all news as read in subscribed newsgroups (batch mode)"
+msgstr	"  -c       marquer tous les articles lus dans les groupes abonnés (en tâche "
+	"de fond)"
 
-#: src/lang.c:881
-msgid	"Light Cyan"
-msgstr	"Cyan gras"
+#: src/lang.c:738
+msgid	"  -Z       return status indicating if any unread news (batch mode)"
+msgstr	"  -Z       retourne un statut indiquant s'il y a nouveaux articles (en tâche "
+	"de fond)"
 
-#: src/lang.c:882
-msgid	"Light White"
-msgstr	"Blanc gras"
+#: src/lang.c:739
+msgid	"  -q       don't check for new newsgroups"
+msgstr	"  -q       ne pas vérifier s'il y a des nouveaux groupes"
 
-#: src/lang.c:890 src/lang.c:947 src/lang.c:961
-msgid	"Nothing"
-msgstr	"Rien"
+#: src/lang.c:740
+msgid	"  -X       don't save any files on quit"
+msgstr	"  -X       ne pas enregistrer de fichiers à la fermeture"
 
-#: src/lang.c:891
-msgid	"Mark"
-msgstr	"Marque"
+#: src/lang.c:741
+msgid	"  -d       don't show newsgroup descriptions"
+msgstr	"  -d       ne pas afficher les descriptions des groupes"
 
-#: src/lang.c:892
-msgid	"Space"
-msgstr	"Espace"
+#: src/lang.c:742
+msgid	"  -G limit get only limit articles/group"
+msgstr	"  -G nombre d'articles par groupe limite"
 
-#: src/lang.c:899
-msgid	"Normal"
-msgstr	"Normal"
+#: src/lang.c:743
+#, c-format
+msgid	"  -H       help information about %s"
+msgstr	"  -H       aide à propos de %s"
 
-#: src/lang.c:900
-msgid	"Best highlighting"
-msgstr	"Meilleur surbrillance"
+#: src/lang.c:744
+msgid	"  -h       this help message"
+msgstr	"  -h       ce message d'aide"
 
-#: src/lang.c:901
-msgid	"Underline"
-msgstr	"Souligné"
+#: src/lang.c:745
+#, c-format
+msgid	"  -I dir   news index file directory [default=%s]"
+msgstr	"  -I rép.  dossier du fichier index [défaut=%s]"
 
-#: src/lang.c:902
-msgid	"Reverse video"
-msgstr	"Vidéo inversée"
+#: src/lang.c:746
+msgid	"  -u       update index files (batch mode)"
+msgstr	"  -u       màj des fichiers index (en tâche de fond)"
 
-#: src/lang.c:903
-msgid	"Blinking"
-msgstr	"Clignotement"
+#: src/lang.c:747
+#, c-format
+msgid	"  -m dir   mailbox directory [default=%s]"
+msgstr	"  -m rép.  dossier des bàl [défaut=%s]"
 
-#: src/lang.c:904
-msgid	"Half bright"
-msgstr	"Moins lumineux"
+#: src/lang.c:748
+#, c-format
+msgid	"\n"
+	"Mail bug reports/comments to %s"
+msgstr	"\n"
+	"Envoyez par mail vos rapports de bugs/suggestions à %s"
 
-#: src/lang.c:905
-msgid	"Bold"
-msgstr	"Gras"
+#: src/lang.c:749
+msgid	"  -N       mail new news to your posts (batch mode)"
+msgstr	"  -N       envoyer toute réponse à vos articles (en tâche de fond)"
 
-#: src/lang.c:910
-msgid	"none"
-msgstr	"aucun"
+#: src/lang.c:750
+msgid	"  -M user  mail new news to specified user (batch mode)"
+msgstr	"  -M util. envoyer tout nouvel article à une personne (en tâche de fond)"
 
-#: src/lang.c:911
-msgid	"commands"
-msgstr	"commandes"
+#: src/lang.c:751
+#, c-format
+msgid	"  -f file  subscribed to newsgroups file [default=%s]"
+msgstr	"  -f fich. abonné au fichier groupes [défaut=%s]"
 
-#: src/lang.c:912
-msgid	"select"
-msgstr	"sélection"
+#: src/lang.c:752
+msgid	"  -w       post an article and exit"
+msgstr	""
 
-#: src/lang.c:914
-msgid	"commands & quit"
-msgstr	"commandes & quitter"
+#: src/lang.c:753
+msgid	"  -o       post all postponed articles and exit"
+msgstr	"  -o       poster tous les brouillons puis quitter"
 
-#: src/lang.c:915
-msgid	"commands & select"
-msgstr	"commandes & sélection"
+#: src/lang.c:754
+msgid	"  -r       read news remotely from default NNTP server"
+msgstr	"  -r       lire les articles depuis le serveur NNTP par défaut"
 
-#: src/lang.c:916
-msgid	"quit & select"
-msgstr	"quitter & sélection"
+#: src/lang.c:755
+msgid	"  -R       read news saved by -S option"
+msgstr	"  -R       lire les articles enregistrés via l'option -S"
 
-#: src/lang.c:917
-msgid	"commands & quit & select"
-msgstr	"commandes, quitter & sélection"
+#: src/lang.c:756
+#, c-format
+msgid	"  -s dir   save news directory [default=%s]"
+msgstr	"  -s rép.  dossier où enregistrer les articles [défaut=%s]"
 
-#: src/lang.c:942
-msgid	"Shell archive"
-msgstr	"Archive shell"
+#: src/lang.c:757
+msgid	"  -S       save new news for later reading (batch mode)"
+msgstr	"  -S       enregistrer tout nouvel article pour lecture différée (en tâche de "
+	"fond)"
 
-#: src/lang.c:948
-msgid	"Subject: (descending)"
-msgstr	"Sujet : (descendant)"
+#: src/lang.c:758
+msgid	"  -z       start if any unread news"
+msgstr	"  -z       lancer si articles non lus"
 
-#: src/lang.c:949
-msgid	"Subject: (ascending)"
-msgstr	"Sujet : (ascendant)"
+#: src/lang.c:759
+#, c-format
+msgid	"A Usenet reader.\n"
+	"\n"
+	"Usage: %s [options] [newsgroup[,...]]"
+msgstr	"Un lecteur UseNet.\n"
+	"Usage : %s [options] [groupe[,...]]"
 
-#: src/lang.c:950
-msgid	"From: (descending)"
-msgstr	"De : (descendant)"
+#: src/lang.c:760
+msgid	"  -v       verbose output for batch mode options"
+msgstr	"  -v       sortie détaillée pour options en tâche de fond"
 
-#: src/lang.c:951
-msgid	"From: (ascending)"
-msgstr	"De : (ascendant)"
+#: src/lang.c:761
+msgid	"  -V       print version & date information"
+msgstr	"  -V       afficher infos date & version"
 
-#: src/lang.c:952
-msgid	"Date: (descending)"
-msgstr	"Date : (descendant)"
+#: src/lang.c:762
+#, c-format
+msgid	"%s only useful without batch mode operations\n"
+msgstr	"%s utile seulement sans opérations en tâche de fond\n"
 
-#: src/lang.c:953
-msgid	"Date: (ascending)"
-msgstr	"Date : (ascendant)"
+#: src/lang.c:763
+#, c-format
+msgid	"%s only useful for batch mode operations\n"
+msgstr	"%s utile seulement pour opérations en tâche de fond\n"
 
-#: src/lang.c:954 src/lang.c:962
-msgid	"Score (descending)"
-msgstr	"Score (descendant)"
+#: src/lang.c:765
+#, c-format
+msgid	"\n"
+	"%s%d out of range (0 - %d). Reset to 0"
+msgstr	"\n"
+	"%s%d expiré (0 - %d). Remis à 0"
 
-#: src/lang.c:955 src/lang.c:963
-msgid	"Score (ascending)"
-msgstr	"Score (ascendant)"
+#: src/lang.c:766
+#, c-format
+msgid	"View '%s' (%s/%s)?"
+msgstr	"Vue '%s' (%s/%s) ?"
 
-#: src/lang.c:956
-msgid	"Lines: (descending)"
-msgstr	"Lignes : (descendant)"
+#: src/lang.c:768
+#, c-format
+msgid	"\n"
+	"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
+	"%-100s\n"
+msgstr	"\n"
+	"Attention : message excédant %d colonnes. Ligne %d est la première dépassant "
+	":\n"
+	"%-100s\n"
 
-#: src/lang.c:957
-msgid	"Lines: (ascending)"
-msgstr	"Lignes : (ascendant)"
+#: src/lang.c:769
+msgid	"\n"
+	"Warning: article unchanged after editing\n"
+msgstr	"\n"
+	"Attention : article inchangé après son édition\n"
 
-#: src/lang.c:968
-msgid	"Always Keep"
-msgstr	"Toujours garder"
+#: src/lang.c:770
+msgid	"\n"
+	"Warning: \"Subject:\" contains only whitespaces.\n"
+msgstr	"\n"
+	"Attention : \"Subject:\" contient que des espaces.\n"
 
-#: src/lang.c:969
-msgid	"Always Remove"
-msgstr	"Toujours effacer"
+#: src/lang.c:771
+msgid	"\n"
+	"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n"
+msgstr	"\n"
+	"Attention : \"Subject:\" commence par \"Re: \" mais il n'y a pas de "
+	"\"References:\".\n"
 
-#: src/lang.c:970
-msgid	"Mark with D on selection screen"
-msgstr	"Marquer avec un D dans la vue sélection"
+#: src/lang.c:773
+msgid	"\n"
+	"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
+	"         with \"Re: \" and does not contain \"(was:\".\n"
+msgstr	"\n"
+	"Attention : L'article a \"References:\" mais \"Subject:\" ne commence\n"
+	"            avec \"Re: \" et ne contient pas \"(was:\".\n"
 
-#: src/lang.c:975
-msgid	"Kill only unread arts"
-msgstr	"Tuer uniquement les articles non lus"
+#: src/lang.c:776
+msgid	"Read carefully!\n"
+	"\n"
+	"  You are about to cancel an article seemingly written by you. This will "
+	"wipe\n"
+	"  the article from most  news servers  throughout the world,  but there is "
+	"no\n"
+	"  guarantee that it will work.\n"
+	"\n"
+	"This is the article you are about to cancel:\n"
+	"\n"
+msgstr	"Lisez ceci attentivement !\n"
+	"\n"
+	"  Vous êtes sur le point d'effacer un article apparemment écrit par vous. "
+	"Cela effacera\n"
+	"  cet article sur la plupart des serveurs UseNet du monde, mais il n'y a "
+	"aucune\n"
+	"  garantie que cela marche.\n"
+	"\n"
+	"Voici l'article que vous vous apprêtez à effacer :\n"
+	"\n"
 
-#: src/lang.c:976
-msgid	"Kill all arts & show with K"
-msgstr	"Tuer tous les articles & afficher avec un K"
+#: src/lang.c:780
+msgid	"\n"
+	"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
+	"         quoted-printable) and an external inews program to submit your\n"
+	"         article. If a signature is appended by that inews program it will\n"
+	"         not be encoded properly.\n"
+msgstr	"\n"
+	"Attention : Vous utilisez un encodage non correct (comme base64 ou\n"
+	"            quoted-printable) et un programme inews externe pour poster\n"
+	"            votre article. Si une signature y est ajoutée par cet inews,\n"
+	"            elle ne sera pas encodée correctement.\n"
 
-#: src/lang.c:977
-msgid	"Kill all arts and never show"
-msgstr	"Tuer tous les articles et ne jamais afficher"
+#: src/lang.c:785
+#, c-format
+msgid	"\n"
+	"\n"
+	"You are upgrading to tin %s from an earlier version.\n"
+	"Some values in your %s file have changed!\n"
+	"Read WHATSNEW, etc...\n"
+msgstr	"\n"
+	"\n"
+	"Vous passer à tin %s depuis une ancienne version.\n"
+	"Certaines valeurs dans votre fichier %s ont changé !\n"
+	"Lisez le fichier WHATSNEW, etc...\n"
 
-#: src/lang.c:982
-msgid	"Nothing special"
-msgstr	"Rien de spécial"
-
-#: src/lang.c:983
-msgid	"Compress quotes"
-msgstr	"Citations compressées"
-
-#: src/lang.c:984
-msgid	"Quote signatures"
-msgstr	"Citer les signatures"
-
-#: src/lang.c:985
-msgid	"Compress quotes, quote sigs"
-msgstr	"Compresser les citations, citer les signatures"
-
-#: src/lang.c:986
-msgid	"Quote empty lines"
-msgstr	"Citer les lignes vides"
-
-#: src/lang.c:987
-msgid	"Compress quotes, quote empty lines"
-msgstr	"Compresser les citations, citer les lignes vides"
+#: src/lang.c:787
+#, c-format
+msgid	"\n"
+	"\n"
+	"You are downgrading to tin %s from a more recent version!\n"
+	"Some values in your %s file may be ignored, others might have changed!\n"
+msgstr	"\n"
+	"\n"
+	"Vous repassez à tin %s depuis une version plus récente !\n"
+	"Certaines valeurs dans votre fichier %s peuvent être ignorés, d'autres\n"
+	"ont peut-être changés !\n"
 
-#: src/lang.c:988
-msgid	"Quote sigs & empty lines"
-msgstr	"Citer les signatures & les lignes vides"
+#: src/lang.c:790
+#, c-format
+msgid	"Warning: tin wrote fewer groups to your\n"
+	"\t%s\n"
+	"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
+	"this session this indicates an error and you should backup your %s\n"
+	"before you start tin once again!\n"
+msgstr	"Attention : tin a écrit quelque groupes dans votre\n"
+	"\t%s\n"
+	"qui est lu au lancement. Si vous ne vous êtes pas désabonné de %ld %s\n"
+	"lors de cette session, cela indique une erreur et vous devriez sauvegarder\n"
+	"votre %s avant de relancer tin !\n"
 
-#: src/lang.c:989
-msgid	"Comp. q., quote sigs & empty lines"
-msgstr	"Compr. les citations, citer les signatures & les lignes vides"
+#: src/lang.c:794
+#, c-format
+msgid	"\n"
+	"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
+msgstr	"\n"
+	"Attention : %d lignes '-- \\n' trouvées, cela peut prêter à confusion.\n"
 
-#: src/lang.c:1026
-msgid	"Print"
-msgstr	"Imprimer"
+#: src/lang.c:795
+#, c-format
+msgid	"Warning: Only %d out of %d articles were saved"
+msgstr	"Attention : Seul %d sur %d articles ont été enregistrés"
 
-#: src/lang.c:1027
-msgid	"Printing..."
-msgstr	"Impression..."
+#: src/lang.c:796
+#, c-format
+msgid	"\n"
+	"Warning: Your signature  is longer than %d lines.  Since signatures usually "
+	"do\n"
+	"         not  transport any  useful information,  they should be as  short "
+	"as\n"
+	"         possible.\n"
+msgstr	"\n"
+	"Attention : Votre signature est longue de plus de %d lignes. Comme les "
+	"signatures\n"
+	"            ne contiennent aucune information pertinente, elles se doivent "
+	"d'être\n"
+	"            le plus court possible.\n"
 
-#: src/lang.c:1032
+#: src/lang.c:800
 #, c-format
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon : "
+msgid	"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
+msgstr	"Attention : cette email peut contenir un piège à spam. %s=continuer, "
+	"%s=annuler ?"
 
-#: src/lang.c:1033
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
-msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=envoyer [%%.*s] : "
+#: src/lang.c:801
+msgid	"\n"
+	"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
+msgstr	"\n"
+	"Attention : Les signatures doivent commencer avec '-- \\n' et non par '-- "
+	"\\n'.\n"
 
-#: src/lang.c:1034
-msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=poster, %s=brouillon [%%.*s] : "
+#: src/lang.c:802
+msgid	"Writing attributes file..."
+msgstr	"Écriture du fichier attributes..."
 
-#: src/lang.c:1036
+#: src/lang.c:804
 #, c-format
-msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon : "
-
-#: src/lang.c:1037
-msgid	"%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
-msgstr	"%s=quitter, %s=éditer, %s=pgp, %s=envoyer [%%.*s] : "
-
-#: src/lang.c:1038
-msgid	"%s=quit, %s=edit, %s=pgp, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=quitter, %s=éditer, %s=pgp, %s=poster, %s=brouillon [%%.*s] : "
+msgid	"%d Responses%s"
+msgstr	"%d Réponses%s"
 
-#: src/lang.c:1042
+#: src/lang.c:806
 #, c-format
-msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon : "
+msgid	"Added %d %s"
+msgstr	"%d %s ajouté(s)"
 
-#: src/lang.c:1043
-msgid	"%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
-msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=envoyer [%%.*s] : "
+#: src/lang.c:807
+msgid	"No unsubscribed groups to show"
+msgstr	"Pas de groupes désabonnés à afficher"
 
-#: src/lang.c:1044
-msgid	"%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=poster, %s=brouillon [%%.*s] : "
+#: src/lang.c:808
+msgid	"Showing subscribed to groups only"
+msgstr	"Afficher uniquement les groupes abonnés"
 
-#: src/lang.c:1046
-#, c-format
-msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
-msgstr	"%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon : "
+#: src/lang.c:809
+msgid	"Yes "
+msgstr	"Oui "
 
-#: src/lang.c:1047
-msgid	"%s=quit, %s=edit, %s=send [%%.*s]: "
-msgstr	"%s=quitter, %s=éditer, %s=envoyer [%%.*s] : "
+#: src/lang.c:810
+msgid	"    You have mail\n"
+msgstr	"    Nouveau mail\n"
 
-#: src/lang.c:1048
-msgid	"%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: "
-msgstr	"%s=quitter, %s=éditer, %s=poster, %s=brouillon [%%.*s] : "
+#: src/lang.c:815
+#, c-format
+msgid	"\n"
+	"Warning: Posting is in %s and contains characters which are not\n"
+	"         in your selected MM_NETWORK_CHARSET: %s.\n"
+	"         These characters will be replaced by '?' if you post this\n"
+	"         article unchanged. To avoid garbling your article please either\n"
+	"         edit it and remove those characters or change the setting of\n"
+	"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
+	"         M)enu option.\n"
+msgstr	"\n"
+	"Attention : Votre article est en %s et contient des caractères qui ne\n"
+	"            sont pas dans votre MM_NETWORK_CHARSET: %s.\n"
+	"            Ces caractères seront remplacés par '?' si vous laissez cet\n"
+	"            article inchangé. Pour éviter de réduire en bouillie votre\n"
+	"            article, soit éditez-le, soit enlever les caractères posant\n"
+	"            problème, ou bien changer la valeur de MM_NETWORK_CHARSET\n"
+	"            via le M)enu.\n"
 
-#: src/lang.c:1052
+#: src/lang.c:826
 #, c-format
-msgid	" at %s"
-msgstr	" à %s"
+msgid	"Redefined key %s '%s' -> '%s'\n"
+msgstr	"Clé %s redéfinie '%s' -> '%s'\n"
 
-#: src/lang.c:1053
-msgid	"There is no news\n"
-msgstr	"Rien de neuf\n"
+#: src/lang.c:827
+msgid	"  -D       debug mode 1=NNTP 2=ALL"
+msgstr	"  -D       mode debug 1=NNTP 2=TOUS"
 
-#: src/lang.c:1054
-msgid	"Thread"
-msgstr	"Enfilade"
+#: src/lang.c:831
+msgid	"Read carefully!\n"
+	"\n"
+	"  You are about to cancel an article seemingly not written by you.  This "
+	"will\n"
+	"  wipe the article from lots of news servers throughout the world;\n"
+	"  Usenet's majority  considers this  rather inappropriate,  to say the "
+	"least.\n"
+	"  Only press 'd'  if you are  absolutely positive  that you are ready to "
+	"take\n"
+	"  the rap.\n"
+	"\n"
+	"This is the article you are about to cancel:\n"
+	"\n"
+msgstr	"Lisez ceci attentivement !\n"
+	"\n"
+	"  Vous vous apprêtez à effacer un article qui fut apparemment écrit par "
+	"vous.Cela\n"
+	"  effacera l'article sur de nombreux serveurs UseNet répartis sur el globe;\n"
+	"  La mojorité d'UseNet considère cela comme inapproprié, pour ne pas dire "
+	"complètement.\n"
+	"  Appuyez sur 'd' si vous vous sentez apte à subir les conséquences de ce\n"
+	"geste.\n"
+	"\n"
+	"Voici l'article que vous vous apprêtez a effacer :\n"
+	"\n"
 
-#: src/lang.c:1055
-msgid	"Thread Level Commands"
-msgstr	"Commandes pour enfilade"
+#: src/lang.c:840
+msgid	"toggle color"
+msgstr	"(dés)activer la couleur"
 
-#: src/lang.c:1056
-msgid	"Thread deselected"
-msgstr	"Enfilade désélectionnée"
+#: src/lang.c:841
+msgid	"# For color-adjust use the following numbers\n"
+	"#  0-black       1-red         2-green        3-brown\n"
+	"#  4-blue        5-pink        6-cyan         7-white\n"
+	"# These are *only* for foreground:\n"
+	"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
+	"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
+	"# A '-1' is interpreted as default (foreground normally is white, and\n"
+	"# background black)\n"
+	"\n"
+msgstr	"# Pour ajuster les couleurs utilisez les nombres suivants\n"
+	"#  0-noir        1-rouge       2-vert         3-marron\n"
+	"#  4-bleu        5-rose        6-cyan         7-blanc\n"
+	"# Celles-là sont *uniquement* pour l'arrière-plan :\n"
+	"#  8-gris        9-rouge gras 10-vert gras   11-jaune\n"
+	"# 12-bleu gras  13-rose gras  14-cyan gras   15-blanc gras\n"
+	"# '-1' est interprété comme défaut (l'avant-plan est normalement blanc,\n"
+	"# et l'arrière-plan noir)\n"
+	"\n"
 
-#: src/lang.c:1057
-msgid	"Thread selected"
-msgstr	"Enfilade sélectionnée"
+#: src/lang.c:849
+msgid	"  -a       toggle color flag"
+msgstr	"  -a       change la couleur"
 
-#: src/lang.c:1058
-msgid	"Thread range"
-msgstr	"Champ de l'enfilade"
+#: src/lang.c:853
+msgid	"\n"
+	"Error: Followup-To set to more than one newsgroup!\n"
+msgstr	"\n"
+	"Erreur : Suivi positionné sur plus d'un groupe !\n"
 
-#: src/lang.c:1059
+#: src/lang.c:854
 #, c-format
-msgid	"%sThread %4s of %4s"
-msgstr	"%sFil %4s de %4s"
-
-#: src/lang.c:1060
-msgid	"Threading articles..."
-msgstr	"Regroupement des articles..."
+msgid	"\n"
+	"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
+msgstr	"\n"
+	"Erreur : multi-postage vers %d groupes et pas de ligne Followup-To !\n"
 
-#: src/lang.c:1061
+#: src/lang.c:855
 #, c-format
-msgid	"Toggled word highlighting %s"
-msgstr	"(Dés)activer surbrillance %s"
+msgid	"\n"
+	"Error: \"%s\" is not a valid newsgroup!\n"
+msgstr	"\n"
+	"Erreur : \"%s\" n'est pas un groupe valide !\n"
 
-#: src/lang.c:1062
-msgid	"Toggled rot13 encoding"
-msgstr	"(Dés)activer codage rot13"
+#: src/lang.c:857
+msgid	"\n"
+	"Warning: Followup-To set to more than one newsgroup!\n"
+msgstr	"\n"
+	"Attention : Suivi positionné sur plus d'un groupe !\n"
 
-#: src/lang.c:1063
+#: src/lang.c:858
 #, c-format
-msgid	"Toggled german TeX encoding %s"
-msgstr	"(Dés)activer codage TeX Allemand %s"
+msgid	"\n"
+	"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
+msgstr	"\n"
+	"Attention : multi-postage vers %d groupes et aucun suivi !\n"
 
-#: src/lang.c:1064
+#: src/lang.c:859
 #, c-format
-msgid	"Toggled tab-width to %d"
-msgstr	"(Dés)activer largeur de tabulation à %d"
+msgid	"\n"
+	"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
+msgstr	"\n"
+	"Attention : \"%s\" n'est pas dans votre newsrc, votre article peut ne\n"
+	"            apparaître dans ce groupe !\n"
+	"\n"
 
-#: src/lang.c:1065
+#: src/lang.c:860
 #, c-format
-msgid	"Trying %s"
-msgstr	"Essai %s"
+msgid	"\n"
+	"Warning: \"%s\" is not a valid newsgroup at this site!\n"
+msgstr	"\n"
+	"Attention : \"%s\" n'est pas un groupe valide !\n"
 
-#: src/lang.c:1066
+#: src/lang.c:864
 #, c-format
-msgid	"%d Trying to dotlock %s"
-msgstr	"%d essaye de déverrouiller %s"
+msgid	"%d files successfully written from %d articles. %d %s occurred."
+msgstr	"%d fichiers des %d articles écrits avec succès. %d %s est survenu."
 
-#: src/lang.c:1067
-#, c-format
-msgid	"%d Trying to lock %s"
-msgstr	"%d essaye de verrouiller %s"
+#: src/lang.c:865
+msgid	"Missing parts."
+msgstr	"Parties manquantes"
 
-#: src/lang.c:1068
-msgid	"           h=help\n"
-msgstr	"           h=aide\n"
+#: src/lang.c:866
+msgid	"No beginning."
+msgstr	"Pas de début."
 
-#: src/lang.c:1069
-msgid	"unread "
-msgstr	"non lu"
+#: src/lang.c:867
+msgid	"No data."
+msgstr	"Pas de données."
 
-#: src/lang.c:1070
-#, c-format
-msgid	"unsubscribed from %d groups"
-msgstr	"désabonné de %d groupes"
+#: src/lang.c:868
+msgid	"Unknown error."
+msgstr	"Erreur inconnue."
 
-#: src/lang.c:1071
+#: src/lang.c:870
 #, c-format
-msgid	"Unsubscribed from %s"
-msgstr	"Désabonné de %s"
-
-#: src/lang.c:1072
-msgid	"Unsubscribing... "
-msgstr	"Désabonnement..."
+msgid	"\tChecksum of %s (%ld %s)"
+msgstr	"\tSomme de contrôle de %s (%ld %s)"
 
-#: src/lang.c:1073
-msgid	"Untagged article"
-msgstr	"Article non marqué"
+#: src/lang.c:874
+msgid	"Reading mail active file... "
+msgstr	"Lecture du fichier active mail... "
 
-#: src/lang.c:1074
-msgid	"Untagged thread"
-msgstr	"Enfilade non marquée"
+#: src/lang.c:875
+msgid	"Reading mailgroups file... "
+msgstr	"Lecture du fichier mailgroups... "
 
-#: src/lang.c:1075
-msgid	"Unthreading articles..."
-msgstr	"Dégroupement des articles..."
+#: src/lang.c:879
+msgid	"perform PGP operations on article"
+msgstr	"effectuer des opérations PGP sur l'article"
 
-#: src/lang.c:1076
-msgid	"Updated"
-msgstr	"Mis à jour"
+#: src/lang.c:880
+msgid	"Add key(s) to public keyring?"
+msgstr	"Ajouter les clé(s) au cercle public ?"
 
-#: src/lang.c:1077
-msgid	"Updating"
-msgstr	"Rafraîchissement"
-
-#: src/lang.c:1078
+#: src/lang.c:881
 #, c-format
-msgid	"Opening %s\n"
-msgstr	"Ouverture %s\n"
-
-#: src/lang.c:1079
-msgid	"No more URL's in this article"
-msgstr	"Plus d'URL dans cet article"
-
-#: src/lang.c:1080
-msgid	"Use MIME display program for this message?"
-msgstr	"Utiliser le programme d'affichage MIME pour ce message ?"
+msgid	"%s=encrypt, %s=sign, %s=both, %s=quit: "
+msgstr	"%s=encodé, %s=signer, %s=les deux, %s=quitter : "
 
-#: src/lang.c:1081
-msgid	"  -c       mark all news as read in subscribed newsgroups (batch mode)"
-msgstr	""
+#: src/lang.c:882
+#, c-format
+msgid	"%s=sign, %s=sign & include public key, %s=quit: "
+msgstr	"%s=signer, %s=sig. & inclure clé publique, %s=quitter : "
 
-#: src/lang.c:1082
-msgid	"  -Z       return status indicating if any unread news (batch mode)"
-msgstr	"  -Z       return status indicating if any unread news (batch mode)"
+#: src/lang.c:883
+#, c-format
+msgid	"PGP has not been set up (can't open %s)"
+msgstr	"PGP n'a pas été configuré (ouverture de %s impossible)"
 
-#: src/lang.c:1083
-msgid	"  -q       don't check for new newsgroups"
-msgstr	""
+#: src/lang.c:884
+msgid	"Article not signed and no public keys found"
+msgstr	"Article non signé et pas de clés publiques trouvées"
 
-#: src/lang.c:1084
-msgid	"  -X       don't save any files on quit"
-msgstr	""
+#: src/lang.c:886
+#, c-format
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
+msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon : "
 
-#: src/lang.c:1085
-msgid	"  -d       don't show newsgroup descriptions"
-msgstr	""
+#: src/lang.c:887
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
+msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=envoyer [%%.*s] : "
 
-#: src/lang.c:1086
-msgid	"  -G limit get only limit articles/group"
-msgstr	""
+#: src/lang.c:888
+msgid	"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon "
+	"[%%.*s]: "
 
-#: src/lang.c:1087
+#: src/lang.c:890
 #, c-format
-msgid	"  -H       help information about %s"
-msgstr	""
+msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
+msgstr	"%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon : "
 
-#: src/lang.c:1088
-msgid	"  -h       this help message"
-msgstr	""
+#: src/lang.c:891
+msgid	"%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
+msgstr	"%s=quitter, %s=éditer, %s=pgp, %s=envoyer [%%.*s] : "
+
+#: src/lang.c:892
+msgid	"%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon [%%.*s]: "
 
-#: src/lang.c:1089
+#: src/lang.c:896
 #, c-format
-msgid	"  -I dir   news index file directory [default=%s]"
-msgstr	""
+msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
+msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon : "
 
-#: src/lang.c:1090
-msgid	"  -u       update index files (batch mode)"
-msgstr	""
+#: src/lang.c:897
+msgid	"%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
+msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=envoyer [%%.*s] : "
 
-#: src/lang.c:1091
-#, c-format
-msgid	"  -m dir   mailbox directory [default=%s]"
-msgstr	""
+#: src/lang.c:898
+msgid	"%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon [%%.*s]: "
 
-#: src/lang.c:1092
+#: src/lang.c:900
 #, c-format
-msgid	"\n"
-	"Mail bug reports/comments to %s"
-msgstr	"\n"
-	"Envoyez par mail vos rapports de bugs/suggestions à %s"
+msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
+msgstr	"%s=quitter, %s=éditer, %s=menu, %s=poster, %s=brouillon : "
 
-#: src/lang.c:1093
-msgid	"  -N       mail new news to your posts (batch mode)"
-msgstr	""
+#: src/lang.c:901
+msgid	"%s=quit, %s=edit, %s=send [%%.*s]: "
+msgstr	"%s=quitter, %s=éditer, %s=envoyer [%%.*s] : "
 
-#: src/lang.c:1094
-msgid	"  -M user  mail new news to specified user (batch mode)"
-msgstr	""
+#: src/lang.c:902
+msgid	"%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr	"%s=quitter, %s=éditer, %s=menu, %s=poster, %s=brouillon [%%.*s]: "
 
-#: src/lang.c:1095
+#: src/lang.c:908
 #, c-format
-msgid	"  -f file  subscribed to newsgroups file [default=%s]"
-msgstr	""
+msgid	"Environment variable %s not found. Set and retry..."
+msgstr	"Variable d'environnemeent %s introuvable. En choisir une puis réessayez..."
 
-#: src/lang.c:1096
-msgid	"  -w       post an article and exit"
+#: src/lang.c:909
+msgid	"  -B       BBS mode. File operations limited to home directories."
 msgstr	""
 
-#: src/lang.c:1097
-msgid	"  -o       post all postponed articles and exit"
+#: src/lang.c:917
+msgid	"Try cache_overview_files to speed up things.\n"
 msgstr	""
 
-#: src/lang.c:1098
-msgid	"  -r       read news remotely from default NNTP server"
+#: src/lang.c:918
+msgid	"Tin will use local index files instead.\n"
 msgstr	""
 
-#: src/lang.c:1099
-msgid	"  -R       read news saved by -S option"
-msgstr	""
+#: src/lang.c:919
+msgid	"Cannot find NNTP server name"
+msgstr	"Nom du serveur NNTP introuvable"
 
-#: src/lang.c:1100
+#: src/lang.c:920
 #, c-format
-msgid	"  -s dir   save news directory [default=%s]"
-msgstr	""
+msgid	"Connecting to %s:%d..."
+msgstr	"Connexion à %s:%d..."
 
-#: src/lang.c:1101
-msgid	"  -S       save new news for later reading (batch mode)"
-msgstr	""
+#: src/lang.c:921
+msgid	"Disconnecting from server...\n"
+msgstr	"Déconnexion du serveur...\n"
 
-#: src/lang.c:1102
-msgid	"  -z       start if any unread news"
-msgstr	""
+#: src/lang.c:922
+#, c-format
+msgid	"Wrong newsgroup name in response of GROUP command, %s for %s"
+msgstr	"Nom de groupe erroné dans la réponse de la cmd GROUP, %s pour %s"
 
-#: src/lang.c:1103
+#: src/lang.c:923
 #, c-format
-msgid	"A Usenet reader.\n"
-	"\n"
-	"Usage: %s [options] [newsgroup[,...]]"
-msgstr	""
+msgid	"Failed to connect to NNTP server %s. Exiting..."
+msgstr	"Échec de la connexion au serveur NNTP %s. Fermeture..."
 
-#: src/lang.c:1105
-msgid	"  -a       toggle color flag"
-msgstr	""
+#: src/lang.c:924 src/nntplib.c:975
+msgid	"205  Closing connection"
+msgstr	"205 Fermeture de la connexion"
 
-#: src/lang.c:1107
-msgid	"  -v       verbose output for batch mode options"
-msgstr	""
+#: src/lang.c:925
+msgid	"Your server does not support the NNTP XOVER or OVER command.\n"
+msgstr	"Votre serveur ne supporte pas la commande NNTP XOVER ou OVER.\n"
 
-#: src/lang.c:1108
-msgid	"  -V       print version & date information"
-msgstr	""
+#: src/lang.c:926
+msgid	"Connection to news server has timed out. Reconnect?"
+msgstr	"Connexion au serveur de nouvelles expirée. Se reconnecter ?"
 
-#: src/lang.c:1109
+#: src/lang.c:927
 #, c-format
-msgid	"%s only useful without batch mode operations\n"
-msgstr	""
+msgid	"Put the server name in the file %s,\n"
+	"or set the environment variable NNTPSERVER"
+msgstr	"Mettez le nom du serveur dans le fichier %s,\n"
+	"ou utilisez la variable d'environnement NNTPSERVER"
 
-#: src/lang.c:1110
-#, c-format
-msgid	"%s only useful for batch mode operations\n"
-msgstr	""
+#: src/lang.c:928
+msgid	"  -A       force authentication on connect"
+msgstr	"  -A       force l'authentication à la connexion"
 
-#: src/lang.c:1111
+#: src/lang.c:929
 #, c-format
-msgid	"\n"
-	"%s%d out of range (0 - %d). Reset to 0"
-msgstr	"\n"
-	"%s%d expiré (0 - %d). Remis à 0"
+msgid	"  -g serv  read news from NNTP server serv [default=%s]"
+msgstr	"  -g serv  lire depuis le serveur NNTP serv [défaut=%s]"
 
-#: src/lang.c:1112
+#: src/lang.c:930
 #, c-format
-msgid	"\n"
-	"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
-	"%-100s\n"
-msgstr	"\n"
-	"Attention : message excédant %d colonnes. Ligne %d est la première dépassant "
-	":\n"
-	"%-100s\n"
+msgid	"  -p port  use port as NNTP port [default=%d]"
+msgstr	"  -p port  utiliser port comme port NNTP [défaut=%d]"
 
-#: src/lang.c:1113
-msgid	"\n"
-	"Warning: article unchanged after editing\n"
-msgstr	"\n"
-	"Attention : article inchangé après son édition\n"
+#: src/lang.c:931
+msgid	"  -Q       quick start. Same as -nqd"
+msgstr	"  -Q       démarrage rapide. Idem que -npd"
 
-#: src/lang.c:1114
-msgid	"\n"
-	"Warning: \"Subject:\" contains only whitespaces.\n"
-msgstr	"\n"
-	"Attention : \"Subject:\" contient que des espaces.\n"
+#: src/lang.c:932
+msgid	"  -l       use only LIST instead of GROUP (-n) command"
+msgstr	"  -l       utilise seulement LIST plutôt que GROUP (n-)"
+
+#: src/lang.c:933
+msgid	"  -n       only read subscribed .newsrc groups from NNTP server"
+msgstr	"  -n       lire seulement groupes abonnés du .newsrc depuis le serveur NNTP"
 
-#: src/lang.c:1116
+#: src/lang.c:935
 #, c-format
-msgid	"\n"
-	"Warning: Posting is in %s and contains characters which are not\n"
-	"         in your selected MM_NETWORK_CHARSET: %s.\n"
-	"         These characters will be replaced by '?' if you post this\n"
-	"         article unchanged. To avoid garbling your article please either\n"
-	"         edit it and remove those characters or change the setting of\n"
-	"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
-	"         M)enu option.\n"
-msgstr	""
+msgid	"%s/tcp: Unknown service.\n"
+msgstr	"%s/tcp : Service inconnu.\n"
 
-#: src/lang.c:1125
+#: src/lang.c:938
 msgid	"\n"
-	"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n"
+	"socket or connect problem\n"
 msgstr	"\n"
-	"Attention : \"Subject:\" commence par \"Re: \" mais il n'y a pas de "
-	"\"References:\".\n"
+	"problème de socket ou de connexion\n"
 
-#: src/lang.c:1127
+#: src/lang.c:940
+#, c-format
 msgid	"\n"
-	"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
-	"         with \"Re: \" and does not contain \"(was:\".\n"
+	"Connection to %s: "
 msgstr	"\n"
-	"Attention : L'article a \"References:\" mais \"Subject:\" ne commence\n"
-	"            avec \"Re: \" et ne contient pas \"(was:\".\n"
+	"Connexion à %s : "
 
-#: src/lang.c:1130
-msgid	"Read carefully!\n"
-	"\n"
-	"  You are about to cancel an article seemingly written by you. This will "
-	"wipe\n"
-	"  the article from most  news servers  throughout the world,  but there is "
-	"no\n"
-	"  guarantee that it will work.\n"
-	"\n"
-	"This is the article you are about to cancel:\n"
-	"\n"
-msgstr	"Lisez ceci attentivement !\n"
-	"\n"
-	"  Vous êtes sur le point d'effacer un article apparemment écrit par vous. "
-	"Cela effacera\n"
-	"  cet article sur la plupart des serveurs de nouvelles du monde, mais il n'y "
-	"a aucune\n"
-	"  garantie que cela marche.\n"
-	"\n"
-	"Voici l'article que vous vous apprêtez à effacer :\n"
-	"\n"
+#: src/lang.c:941
+msgid	"Giving up...\n"
+msgstr	"Abandon...\n"
 
-#: src/lang.c:1134
-msgid	"\n"
-	"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
-	"         quoted-printable) and an external inews program to submit your\n"
-	"         article. If a signature is appended by that inews program it will\n"
-	"         not be encoded properly.\n"
-msgstr	""
+#: src/lang.c:944
+msgid	"Your server does not have Xref: in its XOVER information.\n"
+	"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
+msgstr	"Votre serveur n'a pas d'Xref: dans son information XOVER.\n"
+	"Tin essayera d'utiliser XHDR XREF à la place (plus lent).\n"
 
-#: src/lang.c:1141
-#, c-format
-msgid	"\n"
-	"Warning: The \"%s:\" line is continued in the next line.\n"
-	"         This is a very new feature and may not be accepted by all servers.\n"
-	"         To avoid trouble please write all newsgroups into a single line.\n"
-msgstr	""
+#: src/lang.c:947
+msgid	"Your server does not have Xref: in its XOVER information.\n"
+msgstr	"Votre serveur n'a pas d'Xref: dans son information XOVER.\n"
 
-#: src/lang.c:1145
+#: src/lang.c:950
 #, c-format
-msgid	"\n"
-	"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
-msgstr	""
+msgid	"Can't open %s. Try %s -r to read news via NNTP.\n"
+msgstr	"Ouverture de %s impossible. Essayez %s -r pour lire via NNTP.\n"
 
-#: src/lang.c:1149
-#, c-format
-msgid	"\n"
-	"\n"
-	"You are upgrading to tin %s from an earlier version.\n"
-	"Some values in your %s file have changed!\n"
-	"Read WHATSNEW, etc...\n"
-msgstr	""
+#: src/lang.c:953
+msgid	"  -Q       quick start. Same as -qd"
+msgstr	"  -Q       démarrage rapide. Idem que -qd"
 
-#: src/lang.c:1152
-#, c-format
-msgid	"\n"
-	"\n"
-	"You are downgrading to tin %s from a more recent version!\n"
-	"Some values in your %s file may be ignored, others might have changed!\n"
-msgstr	""
+#: src/lang.c:954
+msgid	"  -l       read only active file instead of scanning spool (-n) command"
+msgstr	"  -l       lire seulement le fichier active plutôt que le spool (-n)"
 
-#: src/lang.c:1157
-#, c-format
-msgid	"Warning: tin wrote fewer groups to your\n"
-	"\t%s\n"
-	"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
-	"this session this indicates an error and you should backup your %s\n"
-	"before you start tin once again!\n"
-msgstr	""
+#: src/lang.c:955
+msgid	"  -n       only read subscribed .newsrc groups from spool"
+msgstr	"  -n       lire seulement groupes abonnés du .newsrc depuis le spool"
 
-#: src/lang.c:1163
-msgid	"Read carefully!\n"
-	"\n"
-	"  You are about to cancel an article seemingly not written by you.  This "
-	"will\n"
-	"  wipe the article from lots of news servers throughout the world;\n"
-	"  Usenet's majority  considers this  rather inappropriate,  to say the "
-	"least.\n"
-	"  Only press 'd'  if you are  absolutely positive  that you are ready to "
-	"take\n"
-	"  the rap.\n"
-	"\n"
-	"This is the article you are about to cancel:\n"
-	"\n"
-msgstr	""
+#: src/lang.c:956
+msgid	"Your server does not have Xref: in its NOV-files.\n"
+msgstr	"Votre serveur n'a pas d'Xref: dans son fichier NOV.\n"
+
+#: src/lang.c:960
+msgid	"Posting using external inews failed. Use built in inews instead?"
+msgstr	"Le postage avec l'inews externe à échoué. Utiliser l'inews intégré ?"
+
+#: src/lang.c:961
+msgid	"It worked! Should I always use my built in inews from now on?"
+msgstr	"Ca a marché ! Devrais-je toujours utiliser mon inews intégré à présent ?"
+
+#: src/lang.c:969
+#, c-format
+msgid	"%d %s printed"
+msgstr	"%d %s imprimé"
+
+#: src/lang.c:970
+msgid	"output article/thread/hot/pattern/tagged articles to printer"
+msgstr	"envoyer article/fil/sél./articles marqués à l'imprimante"
+
+#: src/lang.c:971
+msgid	"Print"
+msgstr	"Imprimer"
+
+#: src/lang.c:972
+msgid	"Printing..."
+msgstr	"Impression..."
+
+#: src/lang.c:976
+msgid	"pipe article/thread/hot/pattern/tagged articles into command"
+msgstr	"passer article/fil/sél./articles marqués à une commande"
+
+#: src/lang.c:977
+msgid	"No command"
+msgstr	"Pas de commande"
+
+#: src/lang.c:978
+msgid	"Pipe"
+msgstr	"Passer (pipe)"
 
-#: src/lang.c:1172
+#: src/lang.c:979
+#, c-format
+msgid	"Pipe to command [%.*s]> "
+msgstr	"Passer à la commande [%.*s]> "
+
+#: src/lang.c:980
+msgid	"Piping..."
+msgstr	"Passage..."
+
+#: src/lang.c:982
+msgid	"Piping not enabled."
+msgstr	"Passage non activé."
+
+#: src/lang.c:986
+#, c-format
 msgid	"\n"
-	"Warning: Followup-To set to more than one newsgroup!\n"
+	"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
+	"       The only allowable  space is the one  separating the colon (:)\n"
+	"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
+	"       newsgroup names.\n"
 msgstr	"\n"
-	"Suivi positionné sur plus d'un groupe !\n"
+	"Erreur : La ligne \"%s:\" contient des espaces qui DOIVENT être retirés.\n"
+	"         Le seul espace autorisé est celui séparant le séparateur (:)\n"
+	"         du contenu. Utilisez une virgule (,) pour séparer de multiples\n"
+	"         noms de groupes.\n"
 
-#: src/lang.c:1173
+#: src/lang.c:991
 #, c-format
 msgid	"\n"
-	"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
-msgstr	""
+	"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
+	"       the line  may not  contain  whitespace,  this is  not allowed.\n"
+	"       Please write all newsgroups into a single line.\n"
+msgstr	"\n"
+	"Erreur : La ligne \"%s:\" n'est pas discontinue dans la ligne suivante.\n"
+	"         Comme la ligne ne contient pas d'espace, ce n'est pas autorisé.\n"
+	"         Inscrivez svp tous les groupes sur une seule ligne.\n"
 
-#: src/lang.c:1174
+#: src/lang.c:996
 #, c-format
 msgid	"\n"
-	"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
-msgstr	""
+	"Warning: The \"%s:\" line is continued in the next line.\n"
+	"         This is a very new feature and may not be accepted by all servers.\n"
+	"         To avoid trouble please write all newsgroups into a single line.\n"
+msgstr	"\n"
+	"Attention : La ligne \"%s:\" continue sur la ligne suivante.\n"
+	"            C'est une nouvelle fonctionnalité et peut ne pas être\n"
+	"            acceptée par tous les serveurs.\n"
+	"            Pour éviter les problèmes, indiquez tous les groupes sur une\n"
+	"            seule ligne.\n"
 
-#: src/lang.c:1175
+#: src/lang.c:1000
 #, c-format
 msgid	"\n"
-	"Warning: \"%s\" is not a valid newsgroup at this site!\n"
-msgstr	""
+	"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
+msgstr	"\n"
+	"Attention : La ligne \"%s:\" contient un ou des espaces qui DOIVENT\n"
+	"            être enlevés.\n"
 
-#: src/lang.c:1179
+#: src/lang.c:1005
 msgid	"\n"
 	"  If your article contains quoted text  please take some time to pare it "
 	"down\n"
@@ -3739,738 +3789,835 @@ msgid	"\n"
 	"  aren't  careful  and considerate  in  formatting  your posting, people  "
 	"are\n"
 	"  likely to ignore it completely.  It's a crowded net out there.\n"
-msgstr	""
+msgstr	"\n"
+	"  Si votre article contient du texte cité prenez s'il vous plaît un peu de "
+	"temps pour le nettoyer\n"
+	"  afin de répondre en dessous du texte cité, ou bien les personnes penseront "
+	"que vous êtes un peu bête !\n"
+	"  La plupart des gens ont la bonne idée d'effacer les parties inutiles du "
+	"texte cité.\n"
+	"  Formattez votre article afin qu'aucune ligne ne dépasse 80 caractères, afin "
+	"de respecter les usages (72 est un bon choix car il vous permet d'éviter\n"
+	"  d'excéder la limite). Si vos lignes sont trop longues, elles seront coupées "
+	"de façons aléatoires\n"
+	"  rendant la lecture difficile voir impossible. Si vous ne respectez pas ces "
+	"simples\n"
+	"  règles, pratiquement toutes les personnes ignoreront vos articles.\n"
+
+#: src/lang.c:1018
+msgid	"shell escape"
+msgstr	"accéder à un shell"
 
-#: src/lang.c:1191
+#: src/lang.c:1019
 #, c-format
-msgid	"\n"
-	"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
-msgstr	""
+msgid	"Shell Command (%s)"
+msgstr	"Commande shell (%s)"
 
-#: src/lang.c:1192
+#: src/lang.c:1020
 #, c-format
-msgid	"Warning: Only %d out of %d articles were saved"
-msgstr	"Attention : Seul %d sur %d articles ont été enregistrés"
+msgid	"Enter shell command [%s]> "
+msgstr	"Commande shell [%s]> "
 
-#: src/lang.c:1193
+#: src/lang.c:1024
 #, c-format
-msgid	"\n"
-	"Warning: Your signature  is longer than %d lines.  Since signatures usually "
-	"do\n"
-	"         not  transport any  useful information,  they should be as  short "
-	"as\n"
-	"         possible.\n"
-msgstr	""
+msgid	"%s: Can't get entry for TERM\n"
+msgstr	"%s : Entrée pour TERM introuvable\n"
 
-#: src/lang.c:1197
+#: src/lang.c:1028
 #, c-format
-msgid	"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
-msgstr	""
+msgid	"Group %.*s ('q' to quit)..."
+msgstr	"Groupe %.*s ('q' pour quitter)..."
 
-#: src/lang.c:1198
-msgid	"\n"
-	"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
-msgstr	""
+#: src/lang.c:1030
+#, c-format
+msgid	"Group %.*s..."
+msgstr	"Groupe %.*s..."
 
-#: src/lang.c:1199
-msgid	"Writing attributes file..."
-msgstr	"Écriture du fichier d'attributs..."
+#: src/lang.c:1034
+msgid	"Server unavailable\n"
+msgstr	"Service indisponible\n"
 
-#: src/lang.c:1200
+# TRANSLATION TOO LONG
+#: src/lang.c:1040
 #, c-format
-msgid	"%d Responses%s"
-msgstr	"%d Réponses%s"
+msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
+	"%s=post"
+msgstr	"%s=pipe; %s=mail; %s=imprimer; %s=quitter; %s=voir lu/non lu; %s=enregistrer; "
+	"%s=marquer; %s=poster"
 
-#: src/lang.c:1201
+# TRANSLATION TOO LONG
+#: src/lang.c:1041
 #, c-format
-msgid	"Added %d %s"
-msgstr	"%d %s ajouté(s)"
+msgid	"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=pipe; %s=mail; %s=imprimer; %s=quitter; %s=répondre; %s=enregistrer; "
+	"%s=marquer; %s=poster"
 
-#: src/lang.c:1202
-msgid	"No unsubscribed groups to show"
-msgstr	"Pas de groupes désabonnés à afficher"
+#: src/lang.c:1043
+#, c-format
+msgid	"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=mail; %s=imprimer; %s=quitter; %s=voir lu/non lu; %s=enregistrer; "
+	"%s=marquer; %s=poster"
 
-#: src/lang.c:1203
-msgid	"Showing subscribed to groups only"
-msgstr	"Afficher uniquement les groupes abonnés"
+#: src/lang.c:1044
+#, c-format
+msgid	"%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=mail; %s=imprimer; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; "
+	"%s=poster"
 
-#: src/lang.c:1204
-msgid	"Showing unread groups only"
-msgstr	"Afficher uniquement les groupes non lus"
+#: src/lang.c:1048
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=pipe; %s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=marquer; "
+	"%s=poster"
 
-#: src/lang.c:1205
-msgid	"Yes "
-msgstr	"Oui "
+#: src/lang.c:1049
+#, c-format
+msgid	"%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=pipe; %s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; "
+	"%s=poster"
 
-#: src/lang.c:1206
-msgid	"    You have mail\n"
-msgstr	"    Nouveau mail\n"
+#: src/lang.c:1051
+#, c-format
+msgid	"%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr	"%s=mail; %s=quitter; %s=voir lu/non lu; %s=enregistrer; %s=marquer; %s=poster"
 
-#: src/lang.c:1207
-msgid	"All groups"
-msgstr	"Tous les groupes"
+#: src/lang.c:1052
+#, c-format
+msgid	"%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr	"%s=mail; %s=quitter; %s=répondre; %s=enregistrer; %s=marquer; %s=poster"
 
-#: src/lang.c:1208
-msgid	"Comment (optional)  : "
-msgstr	"Commentaire (optionnel) : "
+#: src/lang.c:1058
+msgid	"Terminal does not support color"
+msgstr	"Terminal ne supporte pas les couleurs"
 
-#: src/lang.c:1209
-msgid	"Apply pattern to    : "
-msgstr	"Appliquer le réglage à  : "
+#: src/lang.c:1063
+#, c-format
+msgid	"Trying %s"
+msgstr	"Essai %s"
 
-#: src/lang.c:1210
-msgid	"From: line (ignore case)      "
-msgstr	"Ligne De : (ignorer la casse) "
+#: src/lang.c:1077 src/lang.c:1102 src/lang.c:1118 src/refs.c:266
+msgid	"None"
+msgstr	"Aucun"
+
+#: src/lang.c:1078
+msgid	"Subject"
+msgstr	"Sujet"
+
+#: src/lang.c:1079
+msgid	"References"
+msgstr	"Références"
+
+#: src/lang.c:1080
+msgid	"Both Subject and References"
+msgstr	"Sujet & Références"
+
+#: src/lang.c:1081
+msgid	"Multipart Subject"
+msgstr	"Sujet multiparties"
+
+#: src/lang.c:1093 src/lang.c:1204
+msgid	"No"
+msgstr	"Non"
+
+#: src/lang.c:1094 src/lang.c:1206
+msgid	"Yes"
+msgstr	"Oui"
+
+#: src/lang.c:1095
+msgid	"Hide All"
+msgstr	"Tout masquer"
+
+#: src/lang.c:1103
+msgid	"Address"
+msgstr	"Adresse"
+
+#: src/lang.c:1104
+msgid	"Full Name"
+msgstr	"Nom complet"
+
+#: src/lang.c:1105
+msgid	"Address and Name"
+msgstr	"Adresse et Nom"
+
+#: src/lang.c:1112
+msgid	"Max"
+msgstr	"Max"
+
+#: src/lang.c:1113
+msgid	"Sum"
+msgstr	"Sum"
+
+#: src/lang.c:1114
+msgid	"Average"
+msgstr	"Moyenne"
+
+#: src/lang.c:1119
+msgid	"Lines"
+msgstr	"Lignes"
+
+#: src/lang.c:1120
+msgid	"Score"
+msgstr	"Score"
+
+#: src/lang.c:1121
+msgid	"Lines & Score"
+msgstr	"Lignes & Score"
+
+#: src/lang.c:1130
+msgid	"Black"
+msgstr	"Noir"
+
+#: src/lang.c:1131
+msgid	"Red"
+msgstr	"Rouge"
+
+#: src/lang.c:1132
+msgid	"Green"
+msgstr	"Vert"
+
+#: src/lang.c:1133
+msgid	"Brown"
+msgstr	"Marron"
+
+#: src/lang.c:1134
+msgid	"Blue"
+msgstr	"Bleu"
+
+#: src/lang.c:1135
+msgid	"Pink"
+msgstr	"Rose"
+
+#: src/lang.c:1136
+msgid	"Cyan"
+msgstr	"Cyan"
+
+#: src/lang.c:1137
+msgid	"White"
+msgstr	"Blanc"
+
+#: src/lang.c:1138
+msgid	"Gray"
+msgstr	"Gris"
+
+#: src/lang.c:1139
+msgid	"Light Red"
+msgstr	"Rouge gras"
+
+#: src/lang.c:1140
+msgid	"Light Green"
+msgstr	"Vert gras"
+
+#: src/lang.c:1141
+msgid	"Yellow"
+msgstr	"Jaune"
+
+#: src/lang.c:1142
+msgid	"Light Blue"
+msgstr	"Bleu gras"
+
+#: src/lang.c:1143
+msgid	"Light Pink"
+msgstr	"Rose gras"
+
+#: src/lang.c:1144
+msgid	"Light Cyan"
+msgstr	"Cyan gras"
+
+#: src/lang.c:1145
+msgid	"Light White"
+msgstr	"Blanc gras"
+
+#: src/lang.c:1153 src/lang.c:1210 src/lang.c:1224
+msgid	"Nothing"
+msgstr	"Rien"
+
+#: src/lang.c:1154
+msgid	"Mark"
+msgstr	"Marque"
+
+#: src/lang.c:1155
+msgid	"Space"
+msgstr	"Espace"
+
+#: src/lang.c:1162
+msgid	"Normal"
+msgstr	"Normal"
+
+#: src/lang.c:1163
+msgid	"Best highlighting"
+msgstr	"Meilleure surbrillance"
+
+#: src/lang.c:1164
+msgid	"Underline"
+msgstr	"Souligné"
+
+#: src/lang.c:1165
+msgid	"Reverse video"
+msgstr	"Vidéo inversée"
+
+#: src/lang.c:1166
+msgid	"Blinking"
+msgstr	"Clignotement"
+
+#: src/lang.c:1167
+msgid	"Half bright"
+msgstr	"Moins lumineux"
+
+#: src/lang.c:1168
+msgid	"Bold"
+msgstr	"Gras"
+
+#: src/lang.c:1173
+msgid	"none"
+msgstr	"aucun"
+
+#: src/lang.c:1174
+msgid	"commands"
+msgstr	"commandes"
+
+#: src/lang.c:1175
+msgid	"select"
+msgstr	"sélection"
+
+#: src/lang.c:1177
+msgid	"commands & quit"
+msgstr	"commandes & quitter"
+
+#: src/lang.c:1178
+msgid	"commands & select"
+msgstr	"commandes & sélection"
+
+#: src/lang.c:1179
+msgid	"quit & select"
+msgstr	"quitter & sélection"
+
+#: src/lang.c:1180
+msgid	"commands & quit & select"
+msgstr	"commandes, quitter & sélection"
+
+#: src/lang.c:1205
+msgid	"Shell archive"
+msgstr	"Archive shell"
 
 #: src/lang.c:1211
-msgid	"From: line (case sensitive)   "
-msgstr	"Ligne De : (casse sensible)   "
+msgid	"Subject: (descending)"
+msgstr	"Sujet : (descendant)"
 
 #: src/lang.c:1212
-msgid	"One or more lines of comment. <CR> to add a line or proceed if line is empty."
-msgstr	""
+msgid	"Subject: (ascending)"
+msgstr	"Sujet : (ascendant)"
 
 #: src/lang.c:1213
-msgid	"From: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgid	"From: (descending)"
+msgstr	"De : (descendant)"
 
 #: src/lang.c:1214
-msgid	"Linecount of articles to be filtered. < for less, > for more, = for equal."
-msgstr	""
+msgid	"From: (ascending)"
+msgstr	"De : (ascendant)"
 
 #: src/lang.c:1215
-msgid	"Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgid	"Date: (descending)"
+msgstr	"Date : (descendant)"
 
 #: src/lang.c:1216
-msgid	"Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgid	"Date: (ascending)"
+msgstr	"Date : (ascendant)"
 
-#: src/lang.c:1217
-msgid	"Enter text pattern to filter if Subject: & From: lines are not what you want."
-msgstr	""
+#: src/lang.c:1217 src/lang.c:1225
+msgid	"Score (descending)"
+msgstr	"Score (descendant)"
 
-#: src/lang.c:1218
-msgid	"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
-msgstr	""
+#: src/lang.c:1218 src/lang.c:1226
+msgid	"Score (ascending)"
+msgstr	"Score (ascendant)"
 
 #: src/lang.c:1219
-msgid	"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgid	"Lines: (descending)"
+msgstr	"Lignes : (descendant)"
 
 #: src/lang.c:1220
-msgid	"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
-msgstr	""
-
-#: src/lang.c:1221
-msgid	"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
-msgstr	""
-
-#: src/lang.c:1222
-#, c-format
-msgid	"Kill From:     [%-*.*s] (y/n): "
-msgstr	""
-
-#: src/lang.c:1223
-msgid	"Kill Lines: (</>num): "
-msgstr	""
-
-#: src/lang.c:1224
-msgid	"Kill Article Menu"
-msgstr	""
-
-#: src/lang.c:1225
-#, c-format
-msgid	"Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
-msgstr	""
-
-#: src/lang.c:1226
-msgid	"Kill pattern scope  : "
-msgstr	""
-
-#: src/lang.c:1227
-#, c-format
-msgid	"Kill Subject:  [%-*.*s] (y/n): "
-msgstr	""
-
-#: src/lang.c:1228
-msgid	"Kill text pattern   : "
-msgstr	""
-
-#: src/lang.c:1229
-msgid	"Kill time in days   : "
-msgstr	""
-
-#: src/lang.c:1230
-msgid	"Message-ID: line              "
-msgstr	""
+msgid	"Lines: (ascending)"
+msgstr	"Lignes : (ascendant)"
 
 #: src/lang.c:1231
-#, c-format
-msgid	"Select From    [%-*.*s] (y/n): "
-msgstr	""
+msgid	"Always Keep"
+msgstr	"Toujours garder"
 
 #: src/lang.c:1232
-msgid	"Select Lines: (</>num): "
-msgstr	""
+msgid	"Always Remove"
+msgstr	"Toujours effacer"
 
 #: src/lang.c:1233
-msgid	"Auto-select Article Menu"
-msgstr	""
-
-#: src/lang.c:1234
-#, c-format
-msgid	"Select Msg-Id  [%-*.*s] (f/l/o/n): "
-msgstr	""
-
-#: src/lang.c:1235
-msgid	"Select pattern scope: "
-msgstr	""
-
-#: src/lang.c:1236
-#, c-format
-msgid	"Select Subject [%-*.*s] (y/n): "
-msgstr	""
-
-#: src/lang.c:1237
-msgid	"Select text pattern : "
-msgstr	""
+msgid	"Mark with D on selection screen"
+msgstr	"Marquer avec un D dans la vue sélection"
 
 #: src/lang.c:1238
-msgid	"Select time in days   : "
-msgstr	""
+msgid	"Kill only unread arts"
+msgstr	"Filtrer uniquement les articles non lus"
 
 #: src/lang.c:1239
-msgid	"Subject: line (ignore case)   "
-msgstr	""
+msgid	"Kill all arts & show with K"
+msgstr	"Filtrer tous les articles & afficher avec un K"
 
+#. TODO: s/K/art_marked_killed/
 #: src/lang.c:1240
-msgid	"Subject: line (case sensitive)"
-msgstr	""
-
-#: src/lang.c:1241
-#, c-format
-msgid	"%d days"
-msgstr	"%d jours"
-
-#: src/lang.c:1242
-msgid	"Unlimited"
-msgstr	"Illimité"
-
-#: src/lang.c:1243
-msgid	"Full"
-msgstr	"Complet"
-
-#: src/lang.c:1244
-msgid	"Last"
-msgstr	"Dernier"
+msgid	"Kill all arts and never show"
+msgstr	"Filtrer tous les articles et ne jamais afficher"
 
 #: src/lang.c:1245
-msgid	"Only"
-msgstr	"Uniquement"
+msgid	"Nothing special"
+msgstr	"Rien de spécial"
 
 #: src/lang.c:1246
-msgid	"# Format:\n"
-	"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
-	"placed\n"
-	"#                     at the beginning of a rule, or they will be moved to "
-	"the\n"
-	"#                     next rule. '#' is not a valid keyword for a comment!\n"
-	"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
-	"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
-	"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
-	"#     score=NUM         A number (e.g. 70). Or:\n"
-	"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
-	"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
-	"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
-	"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n"
-	"#                     full references.\n"
-	"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
-	"#   msgid_only=STRING Optional. Like above, but without references.\n"
-	"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
-	"without\n"
-	"#                     Message-ID:\n"
-	"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
-	"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
-	"opt.\n"
-	"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
-	"#   time=NUM          Optional. time_t value when rule expires\n"
-	"#\n"
-msgstr	""
-
-#: src/lang.c:1267
-#, c-format
-msgid	"Enter score for rule (default=%d): "
-msgstr	""
-
-#: src/lang.c:1268
-#, c-format
-msgid	"Enter the score weight (range 0 < score <= %d)"
-msgstr	""
-
-#. SCORE_MAX
-#: src/lang.c:1270
-msgid	"Article deleted."
-msgstr	"Article effacé"
-
-#: src/lang.c:1271
-msgid	"Article undeleted."
-msgstr	"Article non effacé"
-
-#: src/lang.c:1272
-msgid	"Processing mail messages marked for deletion."
-msgstr	"Traitement des emails enregistrés marqués pour effacement."
-
-#: src/lang.c:1273
-msgid	"Processing saved articles marked for deletion."
-msgstr	"Traitement des articles enregistrés marqués pour effacement."
+msgid	"Compress quotes"
+msgstr	"Citations compressées"
 
-#: src/lang.c:1276
-#, c-format
-msgid	"Environment variable %s not found. Set and retry..."
-msgstr	"Variable d'environnemeent %s introuvable. En choisir une puis réessayez..."
+#: src/lang.c:1247
+msgid	"Quote signatures"
+msgstr	"Citer les signatures"
 
-#: src/lang.c:1277
-msgid	"  -B       BBS mode. File operations limited to home directories."
-msgstr	""
+#: src/lang.c:1248
+msgid	"Compress quotes, quote sigs"
+msgstr	"Compresser les citations, citer les signatures"
 
-#: src/lang.c:1281
-msgid	"\n"
-	"Error: Followup-To set to more than one newsgroup!\n"
-msgstr	"\n"
-	"Erreur : Suivi positionné sur plus d'un groupe !\n"
+#: src/lang.c:1249
+msgid	"Quote empty lines"
+msgstr	"Citer les lignes vides"
 
-#: src/lang.c:1282
-#, c-format
-msgid	"\n"
-	"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
-msgstr	"\n"
-	"Erreur : multi-postage vers %d groupes et pas de ligne Followup-To !\n"
+#: src/lang.c:1250
+msgid	"Compress quotes, quote empty lines"
+msgstr	"Compresser les citations, citer les lignes vides"
 
-#: src/lang.c:1283
-#, c-format
-msgid	"\n"
-	"Error: \"%s\" is not a valid newsgroup!\n"
-msgstr	"\n"
-	"Erreur : \"%s\" n'est pas un groupe valide !\n"
+#: src/lang.c:1251
+msgid	"Quote sigs & empty lines"
+msgstr	"Citer les signatures & les lignes vides"
 
-#: src/lang.c:1287
-msgid	"Your server does not have Xref: in its XOVER information.\n"
-	"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
-msgstr	"Votre serveur n'a pas d'Xref: dans son information XOVER.\n"
-	"Tin essayera d'utiliser XHDR XREF à la place (plus lent).\n"
+#: src/lang.c:1252
+msgid	"Comp. q., quote sigs & empty lines"
+msgstr	"Compr. les citations, citer les signatures & les lignes vides"
 
 #: src/lang.c:1290
-msgid	"Your server does not have Xref: in its XOVER information.\n"
-msgstr	"Votre serveur n'a pas d'Xref: dans son information XOVER.\n"
-
-#: src/lang.c:1295
 msgid	"Display Options"
 msgstr	"Options d'affichage"
 
-#: src/lang.c:1301
+#: src/lang.c:1296
 msgid	"Color Options"
 msgstr	"Options des couleurs"
 
-#: src/lang.c:1307
+#: src/lang.c:1302
 msgid	"Article-Limiting Options"
 msgstr	"Options des articles"
 
-#: src/lang.c:1313
+#: src/lang.c:1308
 msgid	"Posting/Mailing Options"
 msgstr	"Options de postage/messagerie"
 
-#: src/lang.c:1319
+#: src/lang.c:1314
 msgid	"Saving/Printing Options"
 msgstr	"Options d'enregistrement/d'impression"
 
-#: src/lang.c:1325
+#: src/lang.c:1320
 msgid	"Expert Options"
 msgstr	"Options avancées"
 
-#: src/lang.c:1331
+#: src/lang.c:1326
 msgid	"Filtering Options"
 msgstr	"Options de filtrage"
 
-#: src/lang.c:1336 src/lang.c:1362 src/lang.c:1368 src/lang.c:1375 src/lang.c:1407
-#: src/lang.c:1413 src/lang.c:1421 src/lang.c:1441 src/lang.c:1516 src/lang.c:1678
-#: src/lang.c:1684 src/lang.c:1690 src/lang.c:1702 src/lang.c:1709 src/lang.c:1760
-#: src/lang.c:1769 src/lang.c:1775 src/lang.c:1781 src/lang.c:1787 src/lang.c:1793
-#: src/lang.c:1799 src/lang.c:1805 src/lang.c:1811 src/lang.c:1817 src/lang.c:1823
-#: src/lang.c:1829 src/lang.c:1835 src/lang.c:1841 src/lang.c:1847 src/lang.c:1853
-#: src/lang.c:1859 src/lang.c:1865 src/lang.c:1871 src/lang.c:1877 src/lang.c:1883
-#: src/lang.c:1890 src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1920
-#: src/lang.c:1926 src/lang.c:1932 src/lang.c:1938 src/lang.c:1944 src/lang.c:1958
-#: src/lang.c:1970 src/lang.c:2004 src/lang.c:2056 src/lang.c:2063 src/lang.c:2069
-#: src/lang.c:2094 src/lang.c:2111 src/lang.c:2164 src/lang.c:2197 src/lang.c:2217
-#: src/lang.c:2252 src/lang.c:2260 src/lang.c:2285 src/lang.c:2297
+#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 src/lang.c:1402
+#: src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 src/lang.c:1511 src/lang.c:1673
+#: src/lang.c:1679 src/lang.c:1685 src/lang.c:1697 src/lang.c:1704 src/lang.c:1755
+#: src/lang.c:1764 src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788
+#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 src/lang.c:1818
+#: src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 src/lang.c:1842 src/lang.c:1848
+#: src/lang.c:1854 src/lang.c:1860 src/lang.c:1866 src/lang.c:1872 src/lang.c:1878
+#: src/lang.c:1885 src/lang.c:1891 src/lang.c:1897 src/lang.c:1904 src/lang.c:1915
+#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 src/lang.c:1953
+#: src/lang.c:1965 src/lang.c:1999 src/lang.c:2051 src/lang.c:2058 src/lang.c:2064
+#: src/lang.c:2089 src/lang.c:2106 src/lang.c:2159 src/lang.c:2192 src/lang.c:2212
+#: src/lang.c:2247 src/lang.c:2255 src/lang.c:2280 src/lang.c:2292
 msgid	"<SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	"<ESPACE> changer, <CR> régler, <ESC> annuler."
 
-#: src/lang.c:1337
+#: src/lang.c:1332
 msgid	"Show mini menu & posting etiquette :"
 msgstr	"Afficher menu & intitulé du postage:"
 
-#: src/lang.c:1338
+#: src/lang.c:1333
 msgid	"# If ON show a mini menu of useful commands at each level\n"
 	"# and posting etiquette after composing an article\n"
-msgstr	""
+msgstr	"# Si ON affiche un mini menu des commandes utiles pour chaque\n"
+	"# niveaux et affiche les détails après la composition d'un article\n"
 
-#: src/lang.c:1343
+#: src/lang.c:1338
 msgid	"Show short description for each newsgroup. <SPACE> toggles & <CR> sets."
 msgstr	"Afficher une brève description pour chaque groupe. <ESPACE> changer & <CR> "
 	"régler."
 
-#: src/lang.c:1344
+#: src/lang.c:1339
 msgid	"Show description of each newsgroup :"
 msgstr	"Voir description de chaque groupe  :"
 
-#: src/lang.c:1345
+#: src/lang.c:1340
 msgid	"# If ON show group description text after newsgroup name at\n"
 	"# group selection level\n"
 msgstr	"# Si ON affiche une description du groupe après son nom dans\n"
 	"# la vue de sélection des groupes\n"
 
-#: src/lang.c:1350
+#: src/lang.c:1345
 msgid	"Show Subject & From (author) fields in group menu. <SPACE> toggles & <CR> "
 	"sets."
-msgstr	""
+msgstr	"Afficher les champs Sujet & De (auteur) dans le menu groupe. <ESPACE> change "
+	"& <CR> règle."
 
-#: src/lang.c:1351
+#: src/lang.c:1346
 msgid	"In group menu, show author by      :"
 msgstr	"Dans vue groupe, voir auteur par   :"
 
-#: src/lang.c:1352
+#: src/lang.c:1347
 msgid	"# Part of from field to display 0) none 1) address 2) full name 3) both\n"
 msgstr	"# Partie du champ from à afficher 0) aucun 1) adresse 2) nom complet\n"
 	"# 3) les deux\n"
 
-#: src/lang.c:1356
+#: src/lang.c:1351
 msgid	"Draw -> or highlighted bar for selection. <SPACE> toggles & <CR> sets."
 msgstr	"Afficher -> ou une ligne pour la sélection. <ESPACE> change & <CR> règle."
 
-#: src/lang.c:1357
+#: src/lang.c:1352
 msgid	"Draw -> instead of highlighted bar :"
 msgstr	"Afficher -> plutôt qu'une ligne    :"
 
-#: src/lang.c:1358
+#: src/lang.c:1353
 msgid	"# If ON use -> otherwise highlighted bar for selection\n"
-msgstr	""
+msgstr	"# Si ON utilise -> sinon barre en surbrillance pour la sélection\n"
 
-#: src/lang.c:1363
+#: src/lang.c:1358
 msgid	"Use inverse video for page headers :"
 msgstr	"Vidéo inversée pour les en-têtes   :"
 
-#: src/lang.c:1364
+#: src/lang.c:1359
 msgid	"# If ON use inverse video for page headers at different levels\n"
-msgstr	"# Si On utilise la vidéo inversée pour les en-têtes dans les différentes "
+msgstr	"# Si ON utilise la vidéo inversée pour les en-têtes dans les différentes "
 	"vues\n"
 
-#: src/lang.c:1369
+#: src/lang.c:1364
 msgid	"Thread articles by                 :"
 msgstr	"Regrouper les articles par         :"
 
-#: src/lang.c:1370
+#: src/lang.c:1365
 msgid	"# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n"
 	"# 4=(Multipart Subject).\n"
 msgstr	"# Regrouper les articles sur 0=(rien) 1=(Sujet) 2=(Références) 3=(Les deux)\n"
 	"# 4=(Sujet multi-parties).\n"
 
-#: src/lang.c:1376
+#: src/lang.c:1371
 msgid	"Score of a thread                  :"
-msgstr	"Score d'une enfilade               :"
+msgstr	"Score d'un fil                     :"
 
-#: src/lang.c:1377
+#: src/lang.c:1372
 msgid	"# Thread score 0=(Max) 1=(Sum) 2=(Average)\n"
-msgstr	"# Score d'une enfilade 0=(Max) 1=(Sum) 2=(Moyen)\n"
+msgstr	"# Score d'un fil 0=(Max) 1=(Sum) 2=(Moyen)\n"
 
-#: src/lang.c:1381
+#: src/lang.c:1376
 msgid	"Sort articles by Subject, From, Date or Score. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgstr	"Trier les articles par Sujet, De, Date ou Score. <ESPACE> change & <CR> règle."
 
-#: src/lang.c:1382
+#: src/lang.c:1377
 msgid	"Sort articles by                   :"
 msgstr	"Trier les articles par             :"
 
-#: src/lang.c:1383
+#: src/lang.c:1378
 msgid	"# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n"
 	"# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n"
 	"# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n"
-msgstr	""
+msgstr	"# Trie les article par 0=(rien) 1=(Sujet descendant) 2=(Sujet ascendant)\n"
+	"# 3=(De descendant) 4=(De ascendant) 5=(Date descendant) 6=(Date ascendant)\n"
+	"# 7=(Score descendant) 8=(Score ascendant) 9=(Lignes descendant) 10=(Lignes "
+	"ascendant)\n"
 
-#: src/lang.c:1389
+#: src/lang.c:1384
 msgid	"Sort threads by Nothing or Score. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgstr	"Trier les fils par Rien ou Score. <ESPACE> change & <CR> règle."
 
-#: src/lang.c:1390
+#: src/lang.c:1385
 msgid	"Sort threads by                    :"
-msgstr	""
+msgstr	"Trier les fils par                 :"
 
-#: src/lang.c:1391
+#: src/lang.c:1386
 msgid	"# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n"
-msgstr	""
+msgstr	"# Trie le fil par 0=(rien) 1=(Score descendant) 2=(Score ascendant)\n"
 
-#: src/lang.c:1395
+#: src/lang.c:1390
 msgid	"Put cursor at first/last unread art in groups. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgstr	"Place le curseur sur le 1er article non lu. <ESPACE> change & <CR> règle."
 
-#: src/lang.c:1396
+#: src/lang.c:1391
 msgid	"Goto first unread article in group :"
-msgstr	""
+msgstr	"Aller au 1er art. non lu du groupe :"
 
-#: src/lang.c:1397
+#: src/lang.c:1392
 msgid	"# If ON put cursor at first unread art in group otherwise last art\n"
-msgstr	""
+msgstr	"# Si ON place le curseur sur le 1er article non lu sinon sur le dernier\n"
 
-#: src/lang.c:1401
+#: src/lang.c:1396
 msgid	"Show all articles or only unread articles. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgstr	"Affiche tous les articles ou seulement ceux non lus. <ESPACE> change & <CR> "
+	"règle."
 
-#: src/lang.c:1402
+#: src/lang.c:1397
 msgid	"Show only unread articles          :"
-msgstr	""
+msgstr	"Afficher articles non lus seulement:"
 
-#: src/lang.c:1403
+#: src/lang.c:1398
 msgid	"# If ON show only new/unread articles otherwise show all.\n"
-msgstr	""
+msgstr	"# Si ON affiche seulement les articles non lus sinon les affiche tous.\n"
 
-#: src/lang.c:1408
+#: src/lang.c:1403
 msgid	"Show only groups with unread arts  :"
-msgstr	""
+msgstr	"Voir groupes avec articles non lus :"
 
-#: src/lang.c:1409
+#: src/lang.c:1404
 msgid	"# If ON show only subscribed to groups that contain unread articles.\n"
-msgstr	""
+msgstr	"# Si ON affiche seulement les groupes ayant des articles non lus.\n"
 
-#: src/lang.c:1414
+#: src/lang.c:1409
 msgid	"Filter which articles              :"
-msgstr	""
+msgstr	"Filtrer quels articles             :"
 
-#: src/lang.c:1415
+#: src/lang.c:1410
 msgid	"# 0=(Only kill unread articles)\n"
 	"# 1=(Kill all articles and show in threads marked with K)\n"
 	"# 2=(Kill all articles and never show them).\n"
-msgstr	""
+msgstr	"# 0=(Filtrer seulement les articles non lus)\n"
+	"# 1=(Tout filtrer et les afficher dans les fils précédés d'un K)\n"
+	"# 2=(Tout filtrer et ne pas les afficher)\n"
 
-#: src/lang.c:1422
+#: src/lang.c:1417
 msgid	"Tab goes to next unread article    :"
-msgstr	""
+msgstr	"Tab va au prochain article non lu  :"
 
-#: src/lang.c:1423
+#: src/lang.c:1418
 msgid	"# If ON the TAB command will go to next unread article at article viewer "
 	"level\n"
-msgstr	""
+msgstr	"# Si ON TAB ira au prochain article non lu directement depuis le visual iseur "
+	"d'article\n"
 
-#: src/lang.c:1427
+#: src/lang.c:1422
 msgid	"Scrolling with <SPACE> past the end of an art. jumps to the next unread one."
-msgstr	""
+msgstr	"Défiler avec <ESPACE> passera le fin d'un article et ira au prochain non lu."
 
-#: src/lang.c:1428
+#: src/lang.c:1423
 msgid	"Space goes to next unread article  :"
-msgstr	""
+msgstr	"Espace va au prochain art. non lu  :"
 
-#: src/lang.c:1429
+#: src/lang.c:1424
 msgid	"# If ON the SPACE command will go to next unread article at article viewer\n"
 	"# level when the end of the article is reached (rn-style pager)\n"
-msgstr	""
+msgstr	"# Si ON ESPACE ira au prochain article non lu dans le visualiseur d'article\n"
+	"# lorsque la fin d'un article sera atteinte (page style rn)\n"
 
-#: src/lang.c:1434
+#: src/lang.c:1429
 msgid	"Scrolling with <PGDN>/<DOWN> past the end of an art. jumps to the unread one."
-msgstr	""
+msgstr	"Défiler avec <PGDN>/<BAS> passera la fin d'un article et ira au prochain non "
+	"lu."
 
-#: src/lang.c:1435
+#: src/lang.c:1430
 msgid	"PgDn goes to next unread article   :"
-msgstr	""
+msgstr	"PgDn ira au prochain article non lu:"
 
-#: src/lang.c:1436
+#: src/lang.c:1431
 msgid	"# If ON the PGDN or DOWN command will go to next unread article when\n"
 	"# pressed at end of message\n"
-msgstr	""
+msgstr	"# Si ON PGDN ou BAS ira au prochain article non lu lorsqu'elle sera\n"
+	"# utilisée à la fin d'un article.\n"
 
-#: src/lang.c:1442
+#: src/lang.c:1437
 msgid	"List thread using right arrow key  :"
-msgstr	""
+msgstr	"Lister le fil via la flèche droite :"
 
-#: src/lang.c:1443
+#: src/lang.c:1438
 msgid	"# If ON automatically list thread when entering it using right arrow key.\n"
-msgstr	""
+msgstr	"# Si ON listera automatiquement le fil lors de l'utilisation de la flèche "
+	"droite.\n"
 
-#: src/lang.c:1447
+#: src/lang.c:1442
 msgid	"Enter character to indicate deleted articles. <CR> sets, <ESC> cancels."
-msgstr	""
+msgstr	"Caractère indiquant les articles effacés. <CR> règle, <ESC> annule."
 
-#: src/lang.c:1448
+#: src/lang.c:1443
 msgid	"Character to show deleted articles :"
-msgstr	""
+msgstr	"Caractère pour les articles effacés:"
 
-#: src/lang.c:1449
+#: src/lang.c:1444
 msgid	"# Character used to show that an art was deleted (default 'D')\n"
 	"# _ is turned into ' '\n"
-msgstr	""
+msgstr	"# Caractère utilisé pour indiquer qu'un article a été supprimé (défaut 'D')\n"
+	"# _ est transformé en ' '\n"
 
-#: src/lang.c:1454
+#: src/lang.c:1449
 msgid	"Enter character to indicate articles in a range. <CR> sets, <ESC> cancels."
-msgstr	""
+msgstr	"Caractère indiquant les articles inclus. <CR> règle, <ESC> annule."
 
-#: src/lang.c:1455
+#: src/lang.c:1450
 msgid	"Character to show inrange articles :"
-msgstr	""
+msgstr	"Caractère pour art. non inclus     :"
 
-#: src/lang.c:1456
+#: src/lang.c:1451
 msgid	"# Character used to show that an art is in a range (default '#')\n"
 	"# _ is turned into ' '\n"
-msgstr	""
+msgstr	"# Caractère utilisé pour indiquer qu'un article est inclus (défaut '#')\n"
+	"# _ est transformé en ' '\n"
 
-#: src/lang.c:1461
+#: src/lang.c:1456
 msgid	"Enter character to indicate that article will return. <CR> sets, <ESC> "
 	"cancels."
 msgstr	""
 
-#: src/lang.c:1462
+#: src/lang.c:1457
 msgid	"Character to show returning arts   :"
 msgstr	""
 
-#: src/lang.c:1463
+#: src/lang.c:1458
 msgid	"# Character used to show that an art will return (default '-')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1468
+#: src/lang.c:1463
 msgid	"Enter character to indicate selected articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1469
+#: src/lang.c:1464
 msgid	"Character to show selected articles:"
 msgstr	""
 
-#: src/lang.c:1470
+#: src/lang.c:1465
 msgid	"# Character used to show that an art was auto-selected (default '*')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1475
+#: src/lang.c:1470
 msgid	"Enter character to indicate recent articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1476
+#: src/lang.c:1471
 msgid	"Character to show recent articles  :"
 msgstr	""
 
-#: src/lang.c:1477
+#: src/lang.c:1472
 msgid	"# Character used to show that an art is recent (default 'o')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1482
+#: src/lang.c:1477
 msgid	"Enter character to indicate unread articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1483
+#: src/lang.c:1478
 msgid	"Character to show unread articles  :"
 msgstr	""
 
-#: src/lang.c:1484
+#: src/lang.c:1479
 msgid	"# Character used to show that an art is unread (default '+')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1489
+#: src/lang.c:1484
 msgid	"Enter character to indicate read articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1490
+#: src/lang.c:1485
 msgid	"Character to show read articles    :"
 msgstr	""
 
-#: src/lang.c:1491
+#: src/lang.c:1486
 msgid	"# Character used to show that an art was read (default ' ')\n"
 	"# _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1496
+#: src/lang.c:1491
 msgid	"Enter character to indicate killed articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1497
+#: src/lang.c:1492
 msgid	"Character to show killed articles  :"
 msgstr	""
 
-#: src/lang.c:1498
+#: src/lang.c:1493
 msgid	"# Character used to show that an art was killed (default 'K')\n"
 	"# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1503
+#: src/lang.c:1498
 msgid	"Enter character to indicate read selected articles. <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1504
+#: src/lang.c:1499
 msgid	"Character to show readselected arts:"
 msgstr	""
 
-#: src/lang.c:1505
+#: src/lang.c:1500
 msgid	"# Character used to show that an art was selected before read (default ':')\n"
 	"# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr	""
 
-#: src/lang.c:1510
+#: src/lang.c:1505
 msgid	"Enter maximum length of newsgroup names displayed. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1511
+#: src/lang.c:1506
 msgid	"Max. length of group names shown   :"
 msgstr	""
 
-#: src/lang.c:1512
+#: src/lang.c:1507
 msgid	"# Maximum length of the names of newsgroups displayed\n"
 msgstr	""
 
-#: src/lang.c:1517
+#: src/lang.c:1512
 msgid	"Show lines/score in listings       :"
 msgstr	""
 
-#: src/lang.c:1518
+#: src/lang.c:1513
 msgid	"# What informations should be displayed in article/thread listing\n"
 	"# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n"
 msgstr	""
 
-#: src/lang.c:1523
+#: src/lang.c:1518
 msgid	"0 = full page scrolling, -1 = show previous last line as first on next page, "
 	"-2 = half page"
 msgstr	""
 
-#: src/lang.c:1524
+#: src/lang.c:1519
 msgid	"Number of lines to scroll in pager :"
 msgstr	""
 
-#: src/lang.c:1525
+#: src/lang.c:1520
 msgid	"# Number of lines that cursor-up/down will scroll in article pager\n"
 	"# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n"
 	"# -1 = the top/bottom line is carried over onto the next page,\n"
 	"# -2 = half-page scrolling\n"
 msgstr	""
 
-#: src/lang.c:1532
+#: src/lang.c:1527
 msgid	"Display signatures. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1533
+#: src/lang.c:1528
 msgid	"Display signatures                 :"
-msgstr	""
+msgstr	"Afficher les signatures            :"
 
-#: src/lang.c:1534
+#: src/lang.c:1529
 msgid	"# If OFF don't show signatures when displaying articles\n"
 msgstr	""
 
-#: src/lang.c:1538
+#: src/lang.c:1533
 msgid	"Display uuencoded data as tagged attachments. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1539
+#: src/lang.c:1534
 msgid	"Display uue data as an attachment  :"
-msgstr	""
+msgstr	"Afficher donnée uue comme PJ       :"
 
-#: src/lang.c:1540
+#: src/lang.c:1535
 msgid	"# Handling of uuencoded data in the pager\n"
 	"# 0 = display raw uuencoded data\n"
 	"# 1 = uuencoded data will be condensed to a single tag line showing\n"
@@ -4479,28 +4626,28 @@ msgid	"# Handling of uuencoded data in t
 	"#     into a tag line.\n"
 msgstr	""
 
-#: src/lang.c:1549
+#: src/lang.c:1544
 msgid	"Decode German style TeX umlaut codes to ISO. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1550
+#: src/lang.c:1545
 msgid	"Display \"a as Umlaut-a             :"
 msgstr	""
 
-#: src/lang.c:1551
+#: src/lang.c:1546
 msgid	"# If ON decode German style TeX umlaut codes to ISO and\n"
 	"# show \"a as Umlaut-a, etc.\n"
 msgstr	""
 
-#: src/lang.c:1556 src/lang.c:1566
+#: src/lang.c:1551 src/lang.c:1561
 msgid	"Space separated list of header fields"
 msgstr	""
 
-#: src/lang.c:1557
+#: src/lang.c:1552
 msgid	"Display these header fields (or *) :"
 msgstr	""
 
-#: src/lang.c:1558
+#: src/lang.c:1553
 msgid	"# Which news headers you wish to see. If you want to see _all_ the headers,\n"
 	"# place an '*' as this value. This is the only way a wildcard can be used.\n"
 	"# If you enter 'X-' as the value, you will see all headers beginning with\n"
@@ -4509,11 +4656,11 @@ msgid	"# Which news headers you wish to 
 	"# spaces. Not defining anything turns off this option.\n"
 msgstr	""
 
-#: src/lang.c:1567
+#: src/lang.c:1562
 msgid	"Do not display these header fields :"
 msgstr	""
 
-#: src/lang.c:1568
+#: src/lang.c:1563
 msgid	"# Same as 'news_headers_to_display' except it denotes the opposite.\n"
 	"# An example of using both options might be if you thought X- headers were\n"
 	"# A Good Thing(tm), but thought Alan and Pape were miscreants...well then "
@@ -4524,503 +4671,503 @@ msgid	"# Same as 'news_headers_to_displa
 	"# Not defining anything turns off this option.\n"
 msgstr	""
 
-#: src/lang.c:1578
+#: src/lang.c:1573
 msgid	"Do you want to enable automatic handling of multipart/alternative articles?"
 msgstr	""
 
-#: src/lang.c:1579
+#: src/lang.c:1574
 msgid	"Skip multipart/alternative parts   :"
 msgstr	""
 
-#: src/lang.c:1580
+#: src/lang.c:1575
 msgid	"# If ON strip multipart/alternative messages automatically\n"
 msgstr	""
 
-#: src/lang.c:1585
+#: src/lang.c:1580
 msgid	"A regex used to decide which lines to show in col_quote."
 msgstr	""
 
-#: src/lang.c:1586
+#: src/lang.c:1581
 msgid	"Regex used to show quoted lines    :"
 msgstr	""
 
-#: src/lang.c:1587
+#: src/lang.c:1582
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted when viewing articles. Quoted lines are shown in col_quote.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1593
+#: src/lang.c:1588
 msgid	"A regex used to decide which lines to show in col_quote2."
 msgstr	""
 
-#: src/lang.c:1594
+#: src/lang.c:1589
 msgid	"Regex used to show twice quoted l. :"
 msgstr	""
 
-#: src/lang.c:1595
+#: src/lang.c:1590
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted twice. Twice quoted lines are shown in col_quote2.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1601
+#: src/lang.c:1596
 msgid	"A regex used to decide which lines to show in col_quote3."
 msgstr	""
 
-#: src/lang.c:1602
+#: src/lang.c:1597
 msgid	"Regex used to show >= 3 times q.l. :"
 msgstr	""
 
-#: src/lang.c:1603
+#: src/lang.c:1598
 msgid	"# A regular expression that tin will use to decide which lines are\n"
 	"# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1610
+#: src/lang.c:1605
 msgid	"A regex used to decide which words to show in col_markslashes."
 msgstr	""
 
-#: src/lang.c:1611
+#: src/lang.c:1606
 msgid	"Regex used to highlight /slashes/  :"
 msgstr	""
 
-#: src/lang.c:1612
+#: src/lang.c:1607
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '/' are to be shown in col_markslashes.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1618
+#: src/lang.c:1613
 msgid	"A regex used to decide which words to show in col_markstars."
 msgstr	""
 
-#: src/lang.c:1619
+#: src/lang.c:1614
 msgid	"Regex used to highlight *stars*    :"
 msgstr	""
 
-#: src/lang.c:1620
+#: src/lang.c:1615
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '*' are to be shown in col_markstars.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1626
+#: src/lang.c:1621
 msgid	"A regex used to decide which words to show in col_markstroke."
 msgstr	""
 
-#: src/lang.c:1627
+#: src/lang.c:1622
 msgid	"Regex used to highlight -strokes-  :"
 msgstr	""
 
-#: src/lang.c:1628
+#: src/lang.c:1623
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '-' are to be shown in col_markstroke.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1634
+#: src/lang.c:1629
 msgid	"A regex used to decide which words to show in col_markdash."
 msgstr	""
 
-#: src/lang.c:1635
+#: src/lang.c:1630
 msgid	"Regex used to highlight _underline_:"
 msgstr	""
 
-#: src/lang.c:1636
+#: src/lang.c:1631
 msgid	"# A regular expression that tin will use to decide which words\n"
 	"# bounded by '_' are to be shown in col_markdash.\n"
 	"# If you leave this blank, tin will use a built in default.\n"
 msgstr	""
 
-#: src/lang.c:1642
+#: src/lang.c:1637
 msgid	"A regex used to find Subject prefixes to remove.  Use '|' as separator."
 msgstr	""
 
-#: src/lang.c:1643
+#: src/lang.c:1638
 msgid	"Regex with Subject prefixes        :"
 msgstr	""
 
-#: src/lang.c:1644
+#: src/lang.c:1639
 msgid	"# A regular expression that tin will use to find Subject prefixes\n"
 	"# which will be removed before showing the header.\n"
 msgstr	""
 
-#: src/lang.c:1649
+#: src/lang.c:1644
 msgid	"A regex used to find Subject suffixes to remove.  Use '|' as separator."
 msgstr	""
 
-#: src/lang.c:1650
+#: src/lang.c:1645
 msgid	"Regex with Subject suffixes        :"
 msgstr	""
 
-#: src/lang.c:1651
+#: src/lang.c:1646
 msgid	"# A regular expression that tin will use to find Subject suffixes\n"
 	"# which will be removed when replying or posting followup.\n"
 msgstr	""
 
-#: src/lang.c:1656
+#: src/lang.c:1651
 msgid	"Enter name and options for external MIME viewer, --internal for built-in "
 	"viewer"
 msgstr	""
 
-#: src/lang.c:1657
+#: src/lang.c:1652
 msgid	"MIME binary content viewer         :"
 msgstr	""
 
-#: src/lang.c:1658
+#: src/lang.c:1653
 msgid	"# If --internal automatically use the built in MIME viewer for non-text\n"
 	"# parts of articles.\n"
 	"# Otherwise specify an external viewer program (eg, metamail) or leave blank\n"
 	"# for no automatic viewing\n"
 msgstr	""
 
-#: src/lang.c:1665
+#: src/lang.c:1660
 msgid	"Confirm before starting non-text viewing program"
 msgstr	""
 
-#: src/lang.c:1666
+#: src/lang.c:1661
 msgid	"Ask before using MIME viewer       :"
 msgstr	""
 
-#: src/lang.c:1667
+#: src/lang.c:1662
 msgid	"# If ON tin will ask before using metamail to display MIME messages\n"
 	"# this only happens if metamail_prog is set to something\n"
 msgstr	""
 
-#: src/lang.c:1672
+#: src/lang.c:1667
 msgid	"Ask to mark groups read when quitting. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1673
+#: src/lang.c:1668
 msgid	"Catchup read groups when quitting  :"
 msgstr	""
 
-#: src/lang.c:1674
+#: src/lang.c:1669
 msgid	"# If ON ask user if read groups should all be marked read\n"
 msgstr	""
 
-#: src/lang.c:1679
+#: src/lang.c:1674
 msgid	"Catchup group using left key       :"
 msgstr	""
 
-#: src/lang.c:1680
+#: src/lang.c:1675
 msgid	"# If ON catchup group/thread when leaving with the left arrow key.\n"
 msgstr	""
 
-#: src/lang.c:1685
+#: src/lang.c:1680
 msgid	"Catchup thread by using left key   :"
 msgstr	""
 
-#: src/lang.c:1691
+#: src/lang.c:1686
 msgid	"Which actions require confirmation :"
 msgstr	""
 
-#: src/lang.c:1692
+#: src/lang.c:1687
 msgid	"# What should we ask confirmation for.\n"
 msgstr	""
 
-#: src/lang.c:1696
+#: src/lang.c:1691
 msgid	"Program to run to open URL's, <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:1697
+#: src/lang.c:1692
 msgid	"Program that opens URL's           :"
 msgstr	""
 
-#: src/lang.c:1698
+#: src/lang.c:1693
 msgid	"# The program used to open URL's. The actual URL will be appended\n"
 msgstr	""
 
-#: src/lang.c:1703
+#: src/lang.c:1698
 msgid	"Use mouse in xterm                 :"
 msgstr	""
 
-#: src/lang.c:1704
+#: src/lang.c:1699
 msgid	"# If ON enable mouse key support on xterm terminals\n"
 msgstr	""
 
-#: src/lang.c:1710
+#: src/lang.c:1705
 msgid	"Use scroll keys on keypad          :"
 msgstr	""
 
-#: src/lang.c:1711
+#: src/lang.c:1706
 msgid	"# If ON enable scroll keys on terminals that support it\n"
 msgstr	""
 
-#: src/lang.c:1716
+#: src/lang.c:1711
 msgid	"Enter maximum number of article to get. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1717
+#: src/lang.c:1712
 msgid	"Number of articles to get          :"
 msgstr	""
 
-#: src/lang.c:1718
+#: src/lang.c:1713
 msgid	"# Number of articles to get (0=no limit), if negative sets maximum number\n"
 	"# of already read articles to be read before first unread one\n"
 msgstr	""
 
-#: src/lang.c:1723
+#: src/lang.c:1718
 msgid	"Enter number of days article is considered recent. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1724
+#: src/lang.c:1719
 msgid	"Article recentness time limit      :"
 msgstr	""
 
-#: src/lang.c:1725
+#: src/lang.c:1720
 msgid	"# Number of days in which article is considered recent, (0=OFF)\n"
 msgstr	""
 
-#: src/lang.c:1729
+#: src/lang.c:1724
 msgid	"WILDMAT for normal wildcards, REGEX for full regular expression matching."
 msgstr	""
 
-#: src/lang.c:1730
+#: src/lang.c:1725
 msgid	"Wildcard matching                  :"
 msgstr	""
 
-#: src/lang.c:1731
+#: src/lang.c:1726
 msgid	"# Wildcard matching 0=(wildmat) 1=(regex)\n"
 msgstr	""
 
-#: src/lang.c:1735
+#: src/lang.c:1730
 msgid	"Enter minimal score before an article is marked killed. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1736
+#: src/lang.c:1731
 msgid	"Score limit (kill)                 :"
 msgstr	""
 
-#: src/lang.c:1737
+#: src/lang.c:1732
 msgid	"# Score limit before an article is marked killed\n"
 msgstr	""
 
-#: src/lang.c:1741
+#: src/lang.c:1736
 msgid	"Enter default score to kill articles. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1742
+#: src/lang.c:1737
 msgid	"Default score to kill articles     :"
 msgstr	""
 
-#: src/lang.c:1743
+#: src/lang.c:1738
 msgid	"# Default score to kill articles\n"
 msgstr	""
 
-#: src/lang.c:1747
+#: src/lang.c:1742
 msgid	"Enter minimal score before an article is marked hot. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1748
+#: src/lang.c:1743
 msgid	"Score limit (select)               :"
 msgstr	""
 
-#: src/lang.c:1749
+#: src/lang.c:1744
 msgid	"# Score limit before an article is marked hot\n"
 msgstr	""
 
-#: src/lang.c:1753
+#: src/lang.c:1748
 msgid	"Enter default score to select articles. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1754
+#: src/lang.c:1749
 msgid	"Default score to select articles   :"
 msgstr	""
 
-#: src/lang.c:1755
+#: src/lang.c:1750
 msgid	"# Default score to select articles\n"
 msgstr	""
 
-#: src/lang.c:1761
+#: src/lang.c:1756
 msgid	"Use slrnface to show ''X-Face:''s  :"
 msgstr	""
 
-#: src/lang.c:1762
+#: src/lang.c:1757
 msgid	"# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n"
 	"# Only useful when running in an xterm.\n"
 msgstr	""
 
-#: src/lang.c:1770
+#: src/lang.c:1765
 msgid	"Use ANSI color                     :"
 msgstr	""
 
-#: src/lang.c:1771
+#: src/lang.c:1766
 msgid	"# If ON using ANSI-color\n"
 msgstr	""
 
-#: src/lang.c:1776
+#: src/lang.c:1771
 msgid	"Standard foreground color          :"
 msgstr	""
 
-#: src/lang.c:1777
+#: src/lang.c:1772
 msgid	"# Standard foreground color\n"
 msgstr	""
 
-#: src/lang.c:1782
+#: src/lang.c:1777
 msgid	"Standard background color          :"
 msgstr	""
 
-#: src/lang.c:1783
+#: src/lang.c:1778
 msgid	"# Standard-Background-Color\n"
 msgstr	""
 
-#: src/lang.c:1788
+#: src/lang.c:1783
 msgid	"Color for inverse text (background):"
 msgstr	""
 
-#: src/lang.c:1789
+#: src/lang.c:1784
 msgid	"# Color of background for inverse text\n"
 msgstr	""
 
-#: src/lang.c:1794
+#: src/lang.c:1789
 msgid	"Color for inverse text (foreground):"
 msgstr	""
 
-#: src/lang.c:1795
+#: src/lang.c:1790
 msgid	"# Color of foreground for inverse text\n"
 msgstr	""
 
-#: src/lang.c:1800
+#: src/lang.c:1795
 msgid	"Color of text lines                :"
 msgstr	""
 
-#: src/lang.c:1801
+#: src/lang.c:1796
 msgid	"# Color of text-lines\n"
 msgstr	""
 
-#: src/lang.c:1806
+#: src/lang.c:1801
 msgid	"Color of mini help menu            :"
 msgstr	""
 
-#: src/lang.c:1807
+#: src/lang.c:1802
 msgid	"# Color of mini help menu\n"
 msgstr	""
 
-#: src/lang.c:1812
+#: src/lang.c:1807
 msgid	"Color of help text                 :"
 msgstr	""
 
-#: src/lang.c:1813
+#: src/lang.c:1808
 msgid	"# Color of help pages\n"
 msgstr	""
 
-#: src/lang.c:1818
+#: src/lang.c:1813
 msgid	"Color of status messages           :"
 msgstr	""
 
-#: src/lang.c:1819
+#: src/lang.c:1814
 msgid	"# Color of messages in last line\n"
 msgstr	""
 
-#: src/lang.c:1824
+#: src/lang.c:1819
 msgid	"Color of quoted lines              :"
 msgstr	""
 
-#: src/lang.c:1825
+#: src/lang.c:1820
 msgid	"# Color of quote-lines\n"
 msgstr	""
 
-#: src/lang.c:1830
+#: src/lang.c:1825
 msgid	"Color of twice quoted line         :"
 msgstr	""
 
-#: src/lang.c:1831
+#: src/lang.c:1826
 msgid	"# Color of twice quoted lines\n"
 msgstr	""
 
-#: src/lang.c:1836
+#: src/lang.c:1831
 msgid	"Color of =>3 times quoted line     :"
 msgstr	""
 
-#: src/lang.c:1837
+#: src/lang.c:1832
 msgid	"# Color of >=3 times quoted lines\n"
 msgstr	""
 
-#: src/lang.c:1842
+#: src/lang.c:1837
 msgid	"Color of article header lines      :"
 msgstr	""
 
-#: src/lang.c:1843
+#: src/lang.c:1838
 msgid	"# Color of header-lines\n"
 msgstr	""
 
-#: src/lang.c:1848
+#: src/lang.c:1843
 msgid	"Color of actual news header fields :"
 msgstr	""
 
-#: src/lang.c:1849
+#: src/lang.c:1844
 msgid	"# Color of actual news header fields\n"
 msgstr	""
 
-#: src/lang.c:1854
+#: src/lang.c:1849
 msgid	"Color of article subject lines     :"
 msgstr	""
 
-#: src/lang.c:1855
+#: src/lang.c:1850
 msgid	"# Color of article subject\n"
 msgstr	""
 
-#: src/lang.c:1860
+#: src/lang.c:1855
 msgid	"Color of response counter          :"
 msgstr	""
 
-#: src/lang.c:1861
+#: src/lang.c:1856
 msgid	"# Color of response counter\n"
 msgstr	""
 
-#: src/lang.c:1866
+#: src/lang.c:1861
 msgid	"Color of sender (From:)            :"
 msgstr	""
 
-#: src/lang.c:1867
+#: src/lang.c:1862
 msgid	"# Color of sender (From:)\n"
 msgstr	""
 
-#: src/lang.c:1872
+#: src/lang.c:1867
 msgid	"Color of help/mail sign            :"
 msgstr	""
 
-#: src/lang.c:1873
+#: src/lang.c:1868
 msgid	"# Color of Help/Mail-Sign\n"
 msgstr	""
 
-#: src/lang.c:1878
+#: src/lang.c:1873
 msgid	"Color of signatures                :"
 msgstr	""
 
-#: src/lang.c:1879
+#: src/lang.c:1874
 msgid	"# Color of signature\n"
 msgstr	""
 
-#: src/lang.c:1884
+#: src/lang.c:1879
 msgid	"Color of highlighting with *stars* :"
 msgstr	""
 
-#: src/lang.c:1885
+#: src/lang.c:1880
 msgid	"# Color of word highlighting. There are four possibilities\n"
 	"# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n"
 msgstr	""
 
-#: src/lang.c:1891
+#: src/lang.c:1886
 msgid	"Color of highlighting with _dash_  :"
 msgstr	""
 
-#: src/lang.c:1897
+#: src/lang.c:1892
 msgid	"Color of highlighting with /slash/ :"
 msgstr	""
 
-#: src/lang.c:1903
+#: src/lang.c:1898
 msgid	"Color of highlighting with -stroke-:"
 msgstr	""
 
-#: src/lang.c:1910
+#: src/lang.c:1905
 msgid	"Attr. of highlighting with *stars* :"
 msgstr	""
 
-#: src/lang.c:1911
+#: src/lang.c:1906
 msgid	"# Attribute of word highlighting on mono terminals.\n"
 	"# There are four possibilities in articles:\n"
 	"# *stars*, /slashes/, _underdashes_ and -strokes-.\n"
@@ -5029,85 +5176,85 @@ msgid	"# Attribute of word highlighting 
 	"# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n"
 msgstr	""
 
-#: src/lang.c:1921
+#: src/lang.c:1916
 msgid	"Attr. of highlighting with _dash_  :"
 msgstr	""
 
-#: src/lang.c:1927
+#: src/lang.c:1922
 msgid	"Attr. of highlighting with /slash/ :"
 msgstr	""
 
-#: src/lang.c:1933
+#: src/lang.c:1928
 msgid	"Attr. of highlighting with -stroke-:"
 msgstr	""
 
-#: src/lang.c:1939
+#: src/lang.c:1934
 msgid	"Word highlighting in message body  :"
 msgstr	""
 
-#: src/lang.c:1940
+#: src/lang.c:1935
 msgid	"# Enable word highlighting?\n"
 msgstr	""
 
-#: src/lang.c:1945
+#: src/lang.c:1940
 msgid	"What to display instead of mark    :"
 msgstr	""
 
-#: src/lang.c:1946
+#: src/lang.c:1941
 msgid	"# Should the leading and ending stars and dashes also be displayed,\n"
 	"# even when they are highlighting marks?\n"
 	"# 0 - no    1 - yes, display mark    2 - print a space instead\n"
 msgstr	""
 
-#: src/lang.c:1952
+#: src/lang.c:1947
 msgid	"Enter column number to wrap article lines to in the pager. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1953
+#: src/lang.c:1948
 msgid	"Page line wrap column              :"
 msgstr	""
 
-#: src/lang.c:1954
+#: src/lang.c:1949
 msgid	"# Wrap article lines at column\n"
 msgstr	""
 
-#: src/lang.c:1959
+#: src/lang.c:1954
 msgid	"Wrap around threads on next unread :"
 msgstr	""
 
-#: src/lang.c:1960
+#: src/lang.c:1955
 msgid	"# If ON wrap around threads on searching next unread article\n"
 msgstr	""
 
-#: src/lang.c:1964
+#: src/lang.c:1959
 msgid	"Enter default mail address (and fullname). <CR> sets."
 msgstr	""
 
-#: src/lang.c:1965
+#: src/lang.c:1960
 msgid	"Mail address (and fullname)        :"
 msgstr	""
 
-#: src/lang.c:1966
+#: src/lang.c:1961
 msgid	"# User's mail address (and fullname), if not username@host (fullname)\n"
 msgstr	""
 
-#: src/lang.c:1971
+#: src/lang.c:1966
 msgid	"Show empty Followup-To in editor   :"
 msgstr	""
 
-#: src/lang.c:1972
+#: src/lang.c:1967
 msgid	"# If ON show empty Followup-To header when editing an article\n"
 msgstr	""
 
-#: src/lang.c:1976
+#: src/lang.c:1971
 msgid	"Enter path/! command/--none to create your default signature. <CR> sets."
 msgstr	""
 
-#: src/lang.c:1977
+#: src/lang.c:1972
 msgid	"Create signature from path/command :"
 msgstr	""
 
-#: src/lang.c:1978
+#: src/lang.c:1973
 msgid	"# Signature path (random sigs)/file to be used when posting/replying\n"
 	"# default_sigfile=file       appends file as signature\n"
 	"# default_sigfile=!command   executes external command to generate a "
@@ -5115,48 +5262,48 @@ msgid	"# Signature path (random sigs)/fi
 	"# default_sigfile=--none     don't append a signature\n"
 msgstr	""
 
-#: src/lang.c:1985
+#: src/lang.c:1980
 msgid	"Prepend signature with \"-- \" on own line. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1986
+#: src/lang.c:1981
 msgid	"Prepend signature with \"-- \"       :"
 msgstr	""
 
-#: src/lang.c:1987
+#: src/lang.c:1982
 msgid	"# If ON prepend the signature with dashes '\\n-- \\n'\n"
 msgstr	""
 
-#: src/lang.c:1991
+#: src/lang.c:1986
 msgid	"Add signature when reposting articles. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:1992
+#: src/lang.c:1987
 msgid	"Add signature when reposting       :"
 msgstr	""
 
-#: src/lang.c:1993
+#: src/lang.c:1988
 msgid	"# If ON add signature to reposted articles\n"
 msgstr	""
 
-#: src/lang.c:1997
+#: src/lang.c:1992
 msgid	"Enter quotation marks, %s or %S for author's initials."
 msgstr	""
 
-#: src/lang.c:1998
+#: src/lang.c:1993
 msgid	"Characters used as quote-marks     :"
 msgstr	""
 
-#: src/lang.c:1999
+#: src/lang.c:1994
 msgid	"# Characters used in quoting to followups and replies.\n"
 	"# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n"
 msgstr	""
 
-#: src/lang.c:2005
+#: src/lang.c:2000
 msgid	"Quoting behavior                   :"
 msgstr	""
 
-#: src/lang.c:2006
+#: src/lang.c:2001
 msgid	"# How quoting should be handled when following up or replying.\n"
 	"# 0 = Nothing special\n"
 	"# 1 = Compress quotes\n"
@@ -5168,49 +5315,49 @@ msgid	"# How quoting should be handled w
 	"# 7 = Compress quotes, quote signatures, quote empty lines\n"
 msgstr	""
 
-#: src/lang.c:2018 src/lang.c:2026 src/lang.c:2032
+#: src/lang.c:2013 src/lang.c:2021 src/lang.c:2027
 msgid	"%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name"
 msgstr	""
 
-#: src/lang.c:2019
+#: src/lang.c:2014
 msgid	"Quote line when following up       :"
 msgstr	""
 
-#: src/lang.c:2020
+#: src/lang.c:2015
 msgid	"# Format of quote line when mailing/posting/following-up an article\n"
 	"# %%A Address    %%D Date   %%F Addr+Name   %%G Groupname   %%M Message-ID\n"
 	"# %%N Full Name  %%C First Name   %%I Initials\n"
 msgstr	""
 
-#: src/lang.c:2027
+#: src/lang.c:2022
 msgid	"Quote line when cross-posting      :"
 msgstr	""
 
-#: src/lang.c:2033
+#: src/lang.c:2028
 msgid	"Quote line when mailing            :"
 msgstr	""
 
-#: src/lang.c:2038
+#: src/lang.c:2033
 msgid	"If ON, include User-Agent: header. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2039
+#: src/lang.c:2034
 msgid	"Insert 'User-Agent:'-header        :"
 msgstr	""
 
-#: src/lang.c:2040
+#: src/lang.c:2035
 msgid	"# If ON include advertising User-Agent: header\n"
 msgstr	""
 
-#: src/lang.c:2044
+#: src/lang.c:2039
 msgid	"Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), <CR> to set."
 msgstr	""
 
-#: src/lang.c:2045
+#: src/lang.c:2040
 msgid	"MM_CHARSET                         :"
 msgstr	""
 
-#: src/lang.c:2046
+#: src/lang.c:2041
 msgid	"# Charset supported locally which is also used for MIME header and\n"
 	"# Content-Type header.\n"
 	"# If not set, the value of the environment variable MM_CHARSET is used.\n"
@@ -5219,27 +5366,27 @@ msgid	"# Charset supported locally which
 	"# mm_charset is considered not displayable and represented as '?'.\n"
 msgstr	""
 
-#: src/lang.c:2057
+#: src/lang.c:2052
 msgid	"MM_NETWORK_CHARSET                 :"
 msgstr	""
 
-#: src/lang.c:2058
+#: src/lang.c:2053
 msgid	"# Charset used for MIME (Content-Type) header in postings.\n"
 msgstr	""
 
-#: src/lang.c:2064
+#: src/lang.c:2059
 msgid	"Mailbox format                     :"
 msgstr	""
 
-#: src/lang.c:2065
+#: src/lang.c:2060
 msgid	"# Format of the mailbox.\n"
 msgstr	""
 
-#: src/lang.c:2070
+#: src/lang.c:2065
 msgid	"MIME encoding in news messages     :"
 msgstr	""
 
-#: src/lang.c:2071
+#: src/lang.c:2066
 msgid	"# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n"
 	"# for mails and posts, if necessary. QP is efficient for most European\n"
 	"# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n"
@@ -5247,42 +5394,42 @@ msgid	"# MIME encoding (8bit, base64, qu
 	"# Russian charsets with a lot of 8bit characters.\n"
 msgstr	""
 
-#: src/lang.c:2079 src/lang.c:2100
+#: src/lang.c:2074 src/lang.c:2095
 msgid	"Don't change unless you know what you are doing. <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:2080
+#: src/lang.c:2075
 msgid	"Use 8bit characters in news headers:"
 msgstr	""
 
-#: src/lang.c:2081
+#: src/lang.c:2076
 msgid	"# If ON, 8bit characters in news headers are NOT encoded.\n"
 	"# default is OFF. Thus 8bit characters are encoded by default.\n"
 	"# 8bit chars in header are encoded regardless of the value of this\n"
 	"# parameter unless post_mime_encoding is 8bit as well.\n"
 msgstr	""
 
-#: src/lang.c:2088
+#: src/lang.c:2083
 msgid	"Auto-view post-processed files <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:2089
+#: src/lang.c:2084
 msgid	"View post-processed files          :"
 msgstr	""
 
-#: src/lang.c:2090
+#: src/lang.c:2085
 msgid	"# If set, post processed files will be opened in a viewer\n"
 msgstr	""
 
-#: src/lang.c:2095
+#: src/lang.c:2090
 msgid	"MIME encoding in mail messages     :"
 msgstr	""
 
-#: src/lang.c:2101
+#: src/lang.c:2096
 msgid	"Use 8bit characters in mail headers:"
 msgstr	""
 
-#: src/lang.c:2102
+#: src/lang.c:2097
 msgid	"# If ON, 8bit characters in mail headers are NOT encoded.\n"
 	"# default is OFF. Thus 8bit characters are encoded by default.\n"
 	"# 8bit chars in headers are encoded regardless of the value of this "
@@ -5292,601 +5439,601 @@ msgid	"# If ON, 8bit characters in mail 
 	"# turn it ON unless you have some compelling reason.\n"
 msgstr	""
 
-#: src/lang.c:2112
+#: src/lang.c:2107
 msgid	"Strip blanks of end of lines       :"
 msgstr	""
 
-#: src/lang.c:2113
+#: src/lang.c:2108
 msgid	"# If ON strip blanks from end of lines to speedup display on slow terminals\n"
 msgstr	""
 
-#: src/lang.c:2118
+#: src/lang.c:2113
 msgid	"If ON, use transliteration. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2119
+#: src/lang.c:2114
 msgid	"Transliteration                    :"
 msgstr	""
 
-#: src/lang.c:2120
+#: src/lang.c:2115
 msgid	"# If ON, use //TRANSLIT extension. This means that when a character cannot\n"
 	"# be represented in the in the target character set, it can be approximated\n"
 	"# through one or several similarly looking characters.\n"
 msgstr	""
 
-#: src/lang.c:2127
+#: src/lang.c:2122
 msgid	"Send you a carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2128
+#: src/lang.c:2123
 msgid	"Send you a cc automatically        :"
 msgstr	""
 
-#: src/lang.c:2129
+#: src/lang.c:2124
 msgid	"# If ON automatically put your name in the Cc: field when mailing an article\n"
 msgstr	""
 
-#: src/lang.c:2133
+#: src/lang.c:2128
 msgid	"Send you a blind carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2134
+#: src/lang.c:2129
 msgid	"Send you a blind cc automatically  :"
 msgstr	""
 
-#: src/lang.c:2135
+#: src/lang.c:2130
 msgid	"# If ON automatically put your name in the Bcc: field when mailing an "
 	"article\n"
 msgstr	""
 
-#: src/lang.c:2139
+#: src/lang.c:2134
 msgid	"Enter address elements about which you want to be warned. <CR> sets."
 msgstr	""
 
-#: src/lang.c:2140
+#: src/lang.c:2135
 msgid	"Spamtrap warning address parts     :"
 msgstr	""
 
-#: src/lang.c:2141
+#: src/lang.c:2136
 msgid	"# A comma-delimited list of address-parts you want to be warned\n"
 	"# about when trying to reply by email.\n"
 msgstr	""
 
-#: src/lang.c:2146
+#: src/lang.c:2141
 msgid	"Enter default number of days a filter entry will be valid. <CR> sets."
 msgstr	""
 
-#: src/lang.c:2147
+#: src/lang.c:2142
 msgid	"No. of days a filter entry is valid:"
 msgstr	""
 
-#: src/lang.c:2148
+#: src/lang.c:2143
 msgid	"# Number of days a short term filter will be active\n"
 msgstr	""
 
-#: src/lang.c:2152
+#: src/lang.c:2147
 msgid	"Add posted articles to filter. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2153
+#: src/lang.c:2148
 msgid	"Add posted articles to filter      :"
 msgstr	""
 
-#: src/lang.c:2154
+#: src/lang.c:2149
 msgid	"# If ON add posted articles which start a new thread to filter for\n"
 	"# highlighting follow-ups\n"
 msgstr	""
 
-#: src/lang.c:2158
+#: src/lang.c:2153
 msgid	"The directory where articles/threads are to be saved in mailbox format."
 msgstr	""
 
-#: src/lang.c:2159
+#: src/lang.c:2154
 msgid	"Mail directory                     :"
 msgstr	""
 
-#: src/lang.c:2160
+#: src/lang.c:2155
 msgid	"# (-m) directory where articles/threads are saved in mailbox format\n"
 msgstr	""
 
-#: src/lang.c:2165
+#: src/lang.c:2160
 msgid	"Save articles in batch mode (-S)   :"
 msgstr	""
 
-#: src/lang.c:2166
+#: src/lang.c:2161
 msgid	"# If ON articles/threads will be saved in batch mode when save -S\n"
 	"# or mail (-M/-N) is specified on the command line\n"
 msgstr	""
 
-#: src/lang.c:2171
+#: src/lang.c:2166
 msgid	"The directory where you want articles/threads saved."
 msgstr	""
 
-#: src/lang.c:2172
+#: src/lang.c:2167
 msgid	"Directory to save arts/threads in  :"
 msgstr	""
 
-#: src/lang.c:2173
+#: src/lang.c:2168
 msgid	"# Directory where articles/threads are saved\n"
 msgstr	""
 
-#: src/lang.c:2177
+#: src/lang.c:2172
 msgid	"Auto save article/thread by Archive-name: header. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2178
+#: src/lang.c:2173
 msgid	"Use Archive-name: header for save  :"
 msgstr	""
 
-#: src/lang.c:2179
+#: src/lang.c:2174
 msgid	"# If ON articles/threads with Archive-name: in mail header will\n"
 	"# be automatically saved with the Archive-name & part/patch no.\n"
 msgstr	""
 
-#: src/lang.c:2184
+#: src/lang.c:2179
 msgid	"Mark saved articles/threads as read. <SPACE> toggles, <CR> sets, <ESC> "
 	"cancels."
 msgstr	""
 
-#: src/lang.c:2185
+#: src/lang.c:2180
 msgid	"Mark saved articles/threads as read:"
 msgstr	""
 
-#: src/lang.c:2186
+#: src/lang.c:2181
 msgid	"# If ON mark articles that are saved as read\n"
 msgstr	""
 
-#: src/lang.c:2190
+#: src/lang.c:2185
 msgid	"Do post processing (eg. extract attachments) for saved articles."
 msgstr	""
 
-#: src/lang.c:2191
+#: src/lang.c:2186
 msgid	"Post process saved articles        :"
 msgstr	""
 
-#: src/lang.c:2192
+#: src/lang.c:2187
 msgid	"# Perform post processing (saving binary attachments) from saved articles.\n"
 	"# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n"
 msgstr	""
 
-#: src/lang.c:2198
+#: src/lang.c:2193
 msgid	"Process only unread articles       :"
 msgstr	""
 
-#: src/lang.c:2199
+#: src/lang.c:2194
 msgid	"# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n"
 msgstr	""
 
-#: src/lang.c:2204
+#: src/lang.c:2199
 msgid	"Print all or just part of header. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2205
+#: src/lang.c:2200
 msgid	"Print all headers when printing    :"
 msgstr	""
 
-#: src/lang.c:2206
+#: src/lang.c:2201
 msgid	"# If ON print all of article header otherwise just the important lines\n"
 msgstr	""
 
-#: src/lang.c:2210
+#: src/lang.c:2205
 msgid	"The printer program with options that is to be used to print articles/threads."
 msgstr	""
 
-#: src/lang.c:2211
+#: src/lang.c:2206
 msgid	"Printer program with options       :"
 msgstr	""
 
-#: src/lang.c:2212
+#: src/lang.c:2207
 msgid	"# Print program with parameters used to print articles/threads\n"
 msgstr	""
 
-#: src/lang.c:2218
+#: src/lang.c:2213
 msgid	"Force redraw after certain commands:"
 msgstr	""
 
-#: src/lang.c:2219
+#: src/lang.c:2214
 msgid	"# If ON a screen redraw will always be done after certain external commands\n"
 msgstr	""
 
-#: src/lang.c:2223
+#: src/lang.c:2218
 msgid	"Start editor with line offset. <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr	""
 
-#: src/lang.c:2224
+#: src/lang.c:2219
 msgid	"Start editor with line offset      :"
 msgstr	""
 
-#: src/lang.c:2225
+#: src/lang.c:2220
 msgid	"# If ON editor will be started with cursor offset into the file\n"
 	"# otherwise the cursor will be positioned at the first line\n"
 msgstr	""
 
-#: src/lang.c:2230
+#: src/lang.c:2225
 msgid	"Enter %E for editor, %F for filename, %N for line-number, <CR> to set."
 msgstr	""
 
-#: src/lang.c:2231
+#: src/lang.c:2226
 msgid	"Invocation of your editor          :"
 msgstr	""
 
-#: src/lang.c:2232
+#: src/lang.c:2227
 msgid	"# Format of editor line including parameters\n"
 	"# %%E Editor  %%F Filename  %%N Linenumber\n"
 msgstr	""
 
-#: src/lang.c:2237
+#: src/lang.c:2232
 msgid	"Enter name and options for external-inews, --internal for internal inews"
 msgstr	""
 
-#: src/lang.c:2238
+#: src/lang.c:2233
 msgid	"External inews                     :"
 msgstr	""
 
-#: src/lang.c:2239
+#: src/lang.c:2234
 msgid	"# If --internal use the built in mini inews for posting via NNTP\n"
 	"# otherwise use an external inews program\n"
 msgstr	""
 
-#: src/lang.c:2243
+#: src/lang.c:2238
 msgid	"Enter %M for mailer, %S for subject, %T for to, %F for filename, <CR> to set."
 msgstr	""
 
-#: src/lang.c:2244
+#: src/lang.c:2239
 msgid	"Invocation of your mail command    :"
 msgstr	""
 
-#: src/lang.c:2245
+#: src/lang.c:2240
 msgid	"# Format of mailer line including parameters\n"
 	"# %%M Mailer  %%S Subject  %%T To  %%F Filename  %%U User (AmigaDOS)\n"
 	"# ie. to use elm as your mailer:    elm -s \"%%S\" \"%%T\" < %%F\n"
 	"# ie. elm interactive          :    elm -i %%F -s \"%%S\" \"%%T\"\n"
 msgstr	""
 
-#: src/lang.c:2253
+#: src/lang.c:2248
 msgid	"Use interactive mail reader        :"
 msgstr	""
 
-#: src/lang.c:2254
+#: src/lang.c:2249
 msgid	"# Interactive mailreader: if ON mailreader will be invoked earlier for\n"
 	"# reply so you can use more of its features (eg. MIME, pgp, ...)\n"
 	"# this option has to suit default_mailer_format\n"
 msgstr	""
 
-#: src/lang.c:2261
+#: src/lang.c:2256
 msgid	"Remove ~/.article after posting    :"
 msgstr	""
 
-#: src/lang.c:2262
+#: src/lang.c:2257
 msgid	"# If ON remove ~/.article after posting.\n"
 msgstr	""
 
-#: src/lang.c:2266
+#: src/lang.c:2261
 msgid	"Filename for all posted articles, <CR> sets, no filename=do not save."
 msgstr	""
 
-#: src/lang.c:2267
+#: src/lang.c:2262
 msgid	"Filename for posted articles       :"
 msgstr	""
 
-#: src/lang.c:2268
+#: src/lang.c:2263
 msgid	"# Filename where to keep all postings (default posted)\n"
 	"# If no filename is set then postings will not be saved\n"
 msgstr	""
 
-#: src/lang.c:2273
+#: src/lang.c:2268
 msgid	"Keep all failed articles in ~/dead.articles. <SPACE> toggles & <CR> sets."
 msgstr	""
 
-#: src/lang.c:2274
+#: src/lang.c:2269
 msgid	"Keep failed arts in ~/dead.articles:"
 msgstr	""
 
-#: src/lang.c:2275
+#: src/lang.c:2270
 msgid	"# If ON keep all failed postings in ~/dead.articles\n"
 msgstr	""
 
-#: src/lang.c:2279
+#: src/lang.c:2274
 msgid	"Do you want to strip unsubscribed groups from .newsrc"
 msgstr	""
 
-#: src/lang.c:2280
+#: src/lang.c:2275
 msgid	"No unsubscribed groups in newsrc   :"
 msgstr	""
 
-#: src/lang.c:2281
+#: src/lang.c:2276
 msgid	"# If ON strip unsubscribed groups from newsrc\n"
 msgstr	""
 
-#: src/lang.c:2286
+#: src/lang.c:2281
 msgid	"Remove bogus groups from newsrc    :"
 msgstr	""
 
-#: src/lang.c:2287
+#: src/lang.c:2282
 msgid	"# What to do with bogus groups in newsrc file\n"
 	"# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n"
 msgstr	""
 
-#: src/lang.c:2291
+#: src/lang.c:2286
 msgid	"Enter number of seconds until active file will be reread. <CR> sets."
 msgstr	""
 
-#: src/lang.c:2292
+#: src/lang.c:2287
 msgid	"Interval in secs to reread active  :"
 msgstr	""
 
-#: src/lang.c:2293
+#: src/lang.c:2288
 msgid	"# Time interval in seconds between rereading the active file (0=never)\n"
 msgstr	""
 
-#: src/lang.c:2298
+#: src/lang.c:2293
 msgid	"Reconnect to server automatically  :"
-msgstr	""
+msgstr	"Reconnexion automatique au serveur :"
 
-#: src/lang.c:2299
+#: src/lang.c:2294
 msgid	"# If ON automatically reconnect to NNTP server if the connection is broken\n"
 msgstr	""
 
-#: src/lang.c:2303
+#: src/lang.c:2298
 msgid	"Create local copies of NNTP overview files. <SPACE> toggles & <CR> sets."
-msgstr	""
+msgstr	"Créer des copies locales des en-têtes NNTP. <ESPACE> change & <CR> choisi."
 
-#: src/lang.c:2304
+#: src/lang.c:2299
 msgid	"Cache NNTP overview files locally  :"
-msgstr	""
+msgstr	"Cache local des en-têtes NNTP      :"
 
-#: src/lang.c:2305
+#: src/lang.c:2300
 msgid	"# If ON, create local copies of NNTP overview files.\n"
-msgstr	""
+msgstr	"# Si ON, crée une copie locale des en-têtes NNTP.\n"
 
-#: src/main.c:627
+#: src/main.c:619
 #, c-format
 msgid	"Version: %s release %s (\"%s\") %s %s"
-msgstr	""
+msgstr	"Version : %s release %s (\"%s\") %s %s"
 
-#: src/main.c:630
+#: src/main.c:622
 #, c-format
 msgid	"Version: %s release %s (\"%s\")"
-msgstr	""
+msgstr	"Version : %s release %s (\"%s\")"
 
-#: src/nntplib.c:795
+#: src/nntplib.c:804
 #, c-format
 msgid	"\n"
 	"Server timed out, trying reconnect # %d\n"
 msgstr	"\n"
 	"Connexion au serveur expirée, reconnexion # %d\n"
 
-#: src/nntplib.c:813
+#: src/nntplib.c:822
 msgid	"Rejoin current group\n"
 msgstr	"Rejoindre l'actuel groupe\n"
 
-#: src/nntplib.c:820
+#: src/nntplib.c:829
 #, c-format
 msgid	"Read (%s)\n"
 msgstr	"Lecture (%s)\n"
 
-#: src/nntplib.c:822
+#: src/nntplib.c:831
 #, c-format
 msgid	"Resend last command (%s)\n"
 msgstr	"Réenvoyer la dernière commande (%s)\n"
 
-#: src/nntplib.c:942
+#: src/nntplib.c:951
 msgid	"100  Help text on way"
 msgstr	"100 L'aide arrive"
 
-#: src/nntplib.c:946
+#: src/nntplib.c:955
 msgid	"180  Authorization capabilities"
 msgstr	"180 Capacités d'autorisation"
 
-#: src/nntplib.c:950
+#: src/nntplib.c:959
 msgid	"199  Debug output"
 msgstr	"199 Sortie du déboguage"
 
-#: src/nntplib.c:954
+#: src/nntplib.c:963
 msgid	"200  Hello; you can post"
 msgstr	"200 Salut; vous pouvez poster"
 
-#: src/nntplib.c:958
+#: src/nntplib.c:967
 msgid	"201  Hello; you can't post"
 msgstr	"201 Salut; vous ne pouvez pas poster"
 
-#: src/nntplib.c:962
+#: src/nntplib.c:971
 msgid	"202  Slave status noted"
 msgstr	"202 Statut de l'esclave noté"
 
-#: src/nntplib.c:970
+#: src/nntplib.c:979
 msgid	"211  Group selected"
 msgstr	"211 Groupe sélectionné"
 
-#: src/nntplib.c:975
+#: src/nntplib.c:984
 msgid	"215  Newsgroups follow"
 msgstr	"215 Les groupes arrivent"
 
-#: src/nntplib.c:980
+#: src/nntplib.c:989
 msgid	"218  Group index file follows"
 msgstr	"218 L'index du groupe arrive"
 
-#: src/nntplib.c:985
+#: src/nntplib.c:994
 msgid	"220  Article (head & body) follows"
 msgstr	"220 L'article (corps & en-tête) arrive"
 
-#: src/nntplib.c:989
+#: src/nntplib.c:998
 msgid	"221  Head follows"
 msgstr	"221 L'en-tête arrive"
 
-#: src/nntplib.c:993
+#: src/nntplib.c:1002
 msgid	"222  Body follows"
 msgstr	"222 Le corps arrive"
 
-#: src/nntplib.c:997
+#: src/nntplib.c:1006
 msgid	"223  No text sent -- stat, next, last"
 msgstr	"223 Pas de texte envoyé -- stat, next, last"
 
-#: src/nntplib.c:1001
+#: src/nntplib.c:1010
 msgid	"230  New articles by message-id follow"
 msgstr	"230 Les nouveaux articles pas message-id arrivent"
 
-#: src/nntplib.c:1005
+#: src/nntplib.c:1014
 msgid	"231  New newsgroups follow"
 msgstr	"231 Les nouveaux groupes arrivent"
 
-#: src/nntplib.c:1009
+#: src/nntplib.c:1018
 msgid	"235  Article transferred successfully"
 msgstr	"235 Article transféré avec succès"
 
-#: src/nntplib.c:1013
+#: src/nntplib.c:1022
 msgid	"240  Article posted successfully"
 msgstr	"240 Article posté avec succès"
 
-#: src/nntplib.c:1017
+#: src/nntplib.c:1026
 msgid	"280  Authorization system ok"
 msgstr	"280 Autorisation système ok"
 
-#: src/nntplib.c:1021
+#: src/nntplib.c:1030
 msgid	"281  Authorization (user/pass) ok"
 msgstr	"281 Autorisation (utilisateur/mdp) ok"
 
-#: src/nntplib.c:1025
+#: src/nntplib.c:1034
 msgid	"282  binary data follows"
 msgstr	"282 les données binaires arrivent"
 
-#: src/nntplib.c:1029
+#: src/nntplib.c:1038
 msgid	"283  spooldir list follows"
 msgstr	"283 la liste des spooldir arrive"
 
-#: src/nntplib.c:1033
+#: src/nntplib.c:1042
 msgid	"284  Switching to a different spooldir"
 msgstr	"284 Passage à un autre spooldir"
 
-#: src/nntplib.c:1037
+#: src/nntplib.c:1046
 msgid	"285  Still using same spooldir"
 msgstr	"285 Utilisation du même spooldir"
 
-#: src/nntplib.c:1041
+#: src/nntplib.c:1050
 msgid	"286  Current spooldir"
 msgstr	"286 Spooldir actuel"
 
-#: src/nntplib.c:1045
+#: src/nntplib.c:1054
 msgid	"287  Available spooldir"
 msgstr	"287 Spooldir disponible"
 
-#: src/nntplib.c:1049
+#: src/nntplib.c:1058
 msgid	"288  Unavailable spooldir or invalid entry"
 msgstr	"288 Spooldir indisponible ou entrée invalide"
 
-#: src/nntplib.c:1053
+#: src/nntplib.c:1062
 msgid	"335  Continue to send article"
 msgstr	"335 Continuer l'envoi de l'article"
 
-#: src/nntplib.c:1057
+#: src/nntplib.c:1066
 msgid	"340  Continue to post article"
 msgstr	"340 Continuer le postage de l'article"
 
-#: src/nntplib.c:1061
+#: src/nntplib.c:1070
 msgid	"380  authorization is required"
 msgstr	"380 une autorisation est requise"
 
-#: src/nntplib.c:1065
+#: src/nntplib.c:1074
 msgid	"381  <type> authorization data required"
 msgstr	"381 <type> données d'autorisation requises"
 
-#: src/nntplib.c:1069
+#: src/nntplib.c:1078
 msgid	"400  Have to hang up for some reason"
 msgstr	"400 Déconnexion pour une raison quelconque"
 
-#: src/nntplib.c:1073
+#: src/nntplib.c:1082
 msgid	"411  No such newsgroup"
 msgstr	"411 Pas de groupe de ce type"
 
-#: src/nntplib.c:1077
+#: src/nntplib.c:1086
 msgid	"412  Not currently in newsgroup"
 msgstr	"412 N'est pas actuellement dans ce groupe"
 
-#: src/nntplib.c:1081
+#: src/nntplib.c:1090
 msgid	"418  No index file for this group"
 msgstr	"418 Pas d'index pour ce groupe"
 
-#: src/nntplib.c:1085
+#: src/nntplib.c:1094
 msgid	"420  No current article selected"
 msgstr	"420 Pas d'article actuellement sélectionné"
 
-#: src/nntplib.c:1089
+#: src/nntplib.c:1098
 msgid	"421  No next article in this group"
 msgstr	"421 Pas d'article suivant dans ce groupe"
 
-#: src/nntplib.c:1093
+#: src/nntplib.c:1102
 msgid	"422  No previous article in this group"
 msgstr	"422 Pas d'article précédent dans ce groupe"
 
-#: src/nntplib.c:1097
+#: src/nntplib.c:1106
 msgid	"423  No such article in this group"
 msgstr	"423 Pas d'article de ce type dans ce groupe"
 
-#: src/nntplib.c:1101
+#: src/nntplib.c:1110
 msgid	"430  No such article at all"
 msgstr	"430 Pas d'article de ce type"
 
-#: src/nntplib.c:1105
+#: src/nntplib.c:1114
 msgid	"435  Already got that article, don't send"
 msgstr	"435 Article déjà présent, ne pas réenvoyer"
 
-#: src/nntplib.c:1109
+#: src/nntplib.c:1118
 msgid	"436  Transfer failed"
 msgstr	"436 Échec du transfert"
 
-#: src/nntplib.c:1113
+#: src/nntplib.c:1122
 msgid	"437  Article rejected, don't resend"
 msgstr	"437 Article rejeté, ne pas réenvoyer"
 
-#: src/nntplib.c:1117
+#: src/nntplib.c:1126
 msgid	"440  Posting not allowed"
 msgstr	"440 Postage non autorisé"
 
-#: src/nntplib.c:1121
+#: src/nntplib.c:1130
 msgid	"441  Posting failed"
 msgstr	"441 Échec du postage"
 
-#: src/nntplib.c:1125
+#: src/nntplib.c:1134
 msgid	"480  authorization required for command"
 msgstr	"480 autorisation requise pour la commande"
 
-#: src/nntplib.c:1129
+#: src/nntplib.c:1138
 msgid	"481  Authorization system invalid"
 msgstr	"481 Autorisation système invalide"
 
-#: src/nntplib.c:1133
+#: src/nntplib.c:1142
 msgid	"482  Authorization data rejected"
 msgstr	"482 Données de l'autorisation rejetées"
 
-#: src/nntplib.c:1137
+#: src/nntplib.c:1146
 msgid	"483  Invalid alias on spooldir cmd"
 msgstr	"483 Alias invalide de la commande spooldir"
 
-#: src/nntplib.c:1141
+#: src/nntplib.c:1150
 msgid	"484  No spooldir file found"
 msgstr	"484 Fichier du spooldir introuvable"
 
-#: src/nntplib.c:1145
+#: src/nntplib.c:1154
 msgid	"500  Command not recognized"
 msgstr	"500 Commande non reconnue"
 
-#: src/nntplib.c:1149
+#: src/nntplib.c:1158
 msgid	"501  Command syntax error"
 msgstr	"501 Erreur sur la syntaxe de la commande"
 
-#: src/nntplib.c:1153
+#: src/nntplib.c:1162
 msgid	"502  Access to server denied"
 msgstr	"502 Accès au serveur refusé"
 
-#: src/nntplib.c:1158
+#: src/nntplib.c:1167
 msgid	"503  Program fault, command not performed"
 msgstr	"503 Faute du programme, commande non exécutée"
 
-#: src/nntplib.c:1162
+#: src/nntplib.c:1171
 msgid	"580  Authorization Failed"
 msgstr	"580 Échec de l'autorisation"
 
-#: src/nntplib.c:1166
+#: src/nntplib.c:1175
 msgid	"Unknown NNTP response code"
 msgstr	"Code NNTP donné inconnu"
 
@@ -5895,23 +6042,23 @@ msgstr	"Code NNTP donné inconnu"
 msgid	"couldn't expand %s\n"
 msgstr	"impossible de décompacter %s\n"
 
-#: src/open.c:1103
+#: src/open.c:1040
 msgid	"Unreachable?\n"
 msgstr	"Inacessible ?\n"
 
-#: src/post.c:1712
+#: src/post.c:1749
 #, c-format
 msgid	"%s is bogus"
 msgstr	"%s pose problème"
 
-#: src/post.c:1903
+#: src/post.c:1940
 #, c-format
 msgid	"Posting: %.*s ..."
 msgstr	"Postage : %.*s ..."
 
 # TRANSLATION MISSING
 #. TODO: -> lang.c
-#: src/post.c:4012
+#: src/post.c:4037
 #, c-format
 msgid	"Rereading %s..."
 msgstr	""
@@ -5981,14 +6128,20 @@ msgstr	""
 
 #: src/xface.c:123
 msgid	"Can't run slrnface: couldn't construct fifo name."
-msgstr	""
+msgstr	"Lancement de Slrnface impossible : création du nom fifo impossible."
 
-#: src/xface.c:151
+#: src/xface.c:162
 #, c-format
 msgid	"Slrnface abnormally exited, code %d."
-msgstr	""
+msgstr	"Fermeture anormale de Slrnface, code %d."
 
-#: src/xface.c:195
+#: src/xface.c:206
 #, c-format
 msgid	"Slrnface failed: %s."
-msgstr	""
+msgstr	"Échec de Slrnface : %s."
+
+#~ msgid	"%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: "
+#~ msgstr	"%s=quitter, %s=éditer, %s=ispell, %s=poster, %s=brouillon [%%.*s] : "
+
+#~ msgid	"%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: "
+#~ msgstr	"%s=quitter, %s=éditer, %s=poster, %s=brouillon [%%.*s] : "
diff -Nurp tin-1.5.18/po/tin.pot tin-1.6.0/po/tin.pot
--- tin-1.5.18/po/tin.pot	Mon Jun  2 14:54:14 2003
+++ tin-1.6.0/po/tin.pot	Mon Jul 14 17:24:08 2003
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-06-02 14:53+0200\n"
+"POT-Creation-Date: 2003-07-14 17:23+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"
@@ -230,31 +230,39 @@ msgstr ""
 msgid "1 Response%s"
 msgstr ""
 
-#: src/lang.c:45
+#: src/lang.c:46
 #, c-format
 msgid ""
 "\n"
 "%s contains no newsgroups. Exiting."
 msgstr ""
 
-#: src/lang.c:46
-#, c-format
-msgid "File %s exists. %s=append, %s=overwrite, %s=quit: "
-msgstr ""
-
 #: src/lang.c:47
 msgid "all "
 msgstr ""
 
 #: src/lang.c:48
-msgid "Article cancelled (deleted)."
+msgid "All groups"
 msgstr ""
 
 #: src/lang.c:49
-msgid "Article cannot be cancelled (deleted)."
+#, c-format
+msgid "File %s exists. %s=append, %s=overwrite, %s=quit: "
 msgstr ""
 
 #: src/lang.c:50
+msgid "Article cancelled (deleted)."
+msgstr ""
+
+#: src/lang.c:51
+msgid "Article cannot be cancelled (deleted)."
+msgstr ""
+
+#: src/lang.c:52
+msgid "Article deleted."
+msgstr ""
+
+#: src/lang.c:53
 #, c-format
 msgid ""
 "\n"
@@ -263,580 +271,541 @@ msgid ""
 "will be posted to the following %s:\n"
 msgstr ""
 
-#: src/lang.c:51
+#: src/lang.c:54
 msgid "Article not posted!"
 msgstr ""
 
-#: src/lang.c:52
+#: src/lang.c:55
 msgid "Article not saved"
 msgstr ""
 
-#: src/lang.c:53
+#: src/lang.c:56
 msgid "Article Level Commands"
 msgstr ""
 
-#: src/lang.c:54
+#: src/lang.c:57
+msgid "Article has no parent"
+msgstr ""
+
+#: src/lang.c:58
+msgid "Parent article has been killed"
+msgstr ""
+
+#: src/lang.c:59
+msgid "Parent article is unavailable"
+msgstr ""
+
+#: src/lang.c:60
 #, c-format
 msgid "Article posted: %s"
 msgstr ""
 
-#: src/lang.c:55
+#: src/lang.c:61
 #, c-format
 msgid "Article rejected (saved to %s)"
 msgstr ""
 
-#: src/lang.c:56
+#: src/lang.c:62
 #, c-format
 msgid ""
 "%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: "
 msgstr ""
 
-#: src/lang.c:57
+#: src/lang.c:63
 msgid "Article unavailable"
 msgstr ""
 
-#: src/lang.c:58
-msgid "Article has no parent"
-msgstr ""
-
-#: src/lang.c:59
-msgid "Parent article has been killed"
-msgstr ""
-
-#: src/lang.c:60
-msgid "Parent article is unavailable"
+#: src/lang.c:64
+msgid "Article undeleted."
 msgstr ""
 
-#: src/lang.c:62
+#: src/lang.c:66
 msgid "articles"
 msgstr ""
 
-#: src/lang.c:63
+#: src/lang.c:67
 msgid "This is a repost of the following article:"
 msgstr ""
 
-#: src/lang.c:64
+#: src/lang.c:68
 msgid "article"
 msgstr ""
 
-#: src/lang.c:65
+#: src/lang.c:69
 msgid "Article"
 msgstr ""
 
-#: src/lang.c:66
+#: src/lang.c:70
 #, c-format
 msgid "-- %d %s mailed --"
 msgstr ""
 
-#: src/lang.c:68
+#: src/lang.c:71
 #, c-format
-msgid "%d %s printed"
+msgid " at %s"
 msgstr ""
 
-#: src/lang.c:70
+#: src/lang.c:72
 #, c-format
 msgid "%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n"
 msgstr ""
 
-#: src/lang.c:71
+#: src/lang.c:73
 msgid ", charset: "
 msgstr ""
 
-#: src/lang.c:72
+#: src/lang.c:74
 #, c-format
 msgid "%*s[-- Description: %s --]\n"
 msgstr ""
 
-#: src/lang.c:73
-#, c-format
-msgid ""
-"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
-"\n"
-msgstr ""
-
-#: src/lang.c:74
+#: src/lang.c:75
 #, c-format
 msgid "%d Authentication failed"
 msgstr ""
 
-#: src/lang.c:75
+#: src/lang.c:76
 msgid "Server expects authentication.\n"
 msgstr ""
 
-#: src/lang.c:76
+#: src/lang.c:77
 msgid "    Please enter password: "
 msgstr ""
 
-#: src/lang.c:77
+#: src/lang.c:78
 msgid "    Please enter username: "
 msgstr ""
 
-#: src/lang.c:78
+#: src/lang.c:79
 #, c-format
 msgid "Author search backwards [%s]> "
 msgstr ""
 
-#: src/lang.c:79
+#: src/lang.c:80
 #, c-format
 msgid "Author search forwards [%s]> "
 msgstr ""
 
-#: src/lang.c:80
+#: src/lang.c:81
 #, c-format
 msgid "Authorized for user: %s\n"
 msgstr ""
 
-#: src/lang.c:81
+#: src/lang.c:82
 #, c-format
 msgid "Authorization failed for user: %s\n"
 msgstr ""
 
-#: src/lang.c:82
+#: src/lang.c:83
 #, c-format
 msgid ""
 "\n"
 "Autosubscribed to %s"
 msgstr ""
 
-#: src/lang.c:83
+#: src/lang.c:84
 msgid "Autosubscribing groups...\n"
 msgstr ""
 
-#: src/lang.c:84
+#: src/lang.c:85
 #, c-format
 msgid "Autoselecting articles (use '%s' to see all unread) ..."
 msgstr ""
 
-#: src/lang.c:85
+#: src/lang.c:87
 #, c-format
 msgid "Active file corrupt - %s"
 msgstr ""
 
-#: src/lang.c:86
+#: src/lang.c:88
 #, c-format
 msgid ""
 "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: "
 msgstr ""
 
-#: src/lang.c:87
+#: src/lang.c:89
 #, c-format
 msgid "Unrecognized attribute: %s"
 msgstr ""
 
-#: src/lang.c:88
+#: src/lang.c:90
 #, c-format
 msgid "Bad command. Type '%s' for help."
 msgstr ""
 
-#: src/lang.c:90
+#: src/lang.c:92
 msgid "Base article"
 msgstr ""
 
-#: src/lang.c:91
+#: src/lang.c:93
 msgid "Base article range"
 msgstr ""
 
-#: src/lang.c:92
+#: src/lang.c:94
 #, c-format
 msgid "%s: Updating of index files not supported\n"
 msgstr ""
 
-#: src/lang.c:93
+#: src/lang.c:95
 msgid "*** Beginning of article ***"
 msgstr ""
 
-#: src/lang.c:94
+#: src/lang.c:97
 msgid "Cancel (delete) or supersede (overwrite) article [%%.*s]? (%s/%s/%s): "
 msgstr ""
 
-#: src/lang.c:95
+#: src/lang.c:98
 msgid "Cancelling article..."
 msgstr ""
 
-#: src/lang.c:97
+#: src/lang.c:100
 #, c-format
 msgid "Cannot create %s"
 msgstr ""
 
-#: src/lang.c:98
-#, c-format
-msgid "Can't find base article %d"
-msgstr ""
-
-#: src/lang.c:99
-msgid "Cannot find NNTP server name"
-msgstr ""
-
 #: src/lang.c:101
 #, c-format
-msgid "%s: Can't get entry for TERM\n"
+msgid "Can't find base article %d"
 msgstr ""
 
-#: src/lang.c:103
+#: src/lang.c:102
 #, c-format
 msgid "Can't open %s"
 msgstr ""
 
-#: src/lang.c:105
-#, c-format
-msgid "Can't open %s. Try %s -r to read news via NNTP.\n"
-msgstr ""
-
-#: src/lang.c:107
+#: src/lang.c:103
 #, c-format
 msgid "Couldn't open %s for saving"
 msgstr ""
 
-#: src/lang.c:108
+#: src/lang.c:104
 msgid "*** Posting not allowed ***"
 msgstr ""
 
-#: src/lang.c:109
+#: src/lang.c:105
 #, c-format
 msgid "Posting is not allowed to %s"
 msgstr ""
 
-#: src/lang.c:110
+#: src/lang.c:106
 #, c-format
 msgid "Can't retrieve %s"
 msgstr ""
 
-#: src/lang.c:111
-#, c-format
-msgid "Can't write index %s"
-msgstr ""
-
-#: src/lang.c:112
+#: src/lang.c:107
 #, c-format
 msgid "%s is a directory"
 msgstr ""
 
-#: src/lang.c:113
+#: src/lang.c:108
 msgid "Catchup"
 msgstr ""
 
-#: src/lang.c:114
+#: src/lang.c:109
 #, c-format
 msgid "Catchup %s..."
 msgstr ""
 
-#: src/lang.c:115
+#: src/lang.c:110
 msgid "Catchup all groups entered during this session?"
 msgstr ""
 
-#: src/lang.c:116
+#: src/lang.c:111
 msgid "You have tagged articles in this group - catchup anyway?"
 msgstr ""
 
-#: src/lang.c:117
+#: src/lang.c:112
 #, c-format
 msgid "%s %d %s in %lu seconds\n"
 msgstr ""
 
-#: src/lang.c:118
+#: src/lang.c:113
 msgid "Caughtup"
 msgstr ""
 
-#: src/lang.c:119
+#: src/lang.c:114
 msgid "Check Prepared Article"
 msgstr ""
 
-#: src/lang.c:120
+#: src/lang.c:115
 msgid "Checking for new groups... "
 msgstr ""
 
-#: src/lang.c:121
+#: src/lang.c:116
 msgid "Checking for news..."
 msgstr ""
 
-#: src/lang.c:123
-#, c-format
-msgid "\tChecksum of %s (%ld %s)"
-msgstr ""
-
-#: src/lang.c:125
+#: src/lang.c:117
 #, c-format
 msgid "Post-process %s=no, %s=yes, %s=shar, %s=quit: "
 msgstr ""
 
-#: src/lang.c:126
+#: src/lang.c:118
 msgid "ANSI color disabled"
 msgstr ""
 
-#: src/lang.c:127
+#: src/lang.c:119
 msgid "ANSI color enabled"
 msgstr ""
 
-#: src/lang.c:128
+#: src/lang.c:120
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/lang.c:129
+#: src/lang.c:121
 msgid "Mark not selected articles read?"
 msgstr ""
 
-#: src/lang.c:130
+#: src/lang.c:122
 #, c-format
 msgid "Connecting to %s..."
 msgstr ""
 
-#: src/lang.c:131
-#, c-format
-msgid "Connecting to %s:%d..."
-msgstr ""
-
-#: src/lang.c:132
-#, c-format
-msgid ""
-"\n"
-"Connection to %s: "
-msgstr ""
-
-#: src/lang.c:146
+#: src/lang.c:123
 msgid "<CR>"
 msgstr ""
 
-#: src/lang.c:147
+#: src/lang.c:124
 msgid "Creating active file for saved groups...\n"
 msgstr ""
 
-#: src/lang.c:148
+#: src/lang.c:125
 msgid "Creating newsrc file...\n"
 msgstr ""
 
-#: src/lang.c:149
-msgid "Delete saved files that have been post processed?"
+#: src/lang.c:127 src/lang.c:1129
+msgid "Default"
 msgstr ""
 
-#: src/lang.c:150
-msgid "Deleting temporary files..."
+#: src/lang.c:128
+msgid "Delete saved files that have been post processed?"
 msgstr ""
 
-#: src/lang.c:151
-msgid "Disconnecting from server...\n"
+#: src/lang.c:129
+msgid "Deleting temporary files..."
 msgstr ""
 
-#: src/lang.c:152
+#: src/lang.c:131
 msgid "*** End of article ***"
 msgstr ""
 
-#: src/lang.c:153
+#: src/lang.c:132
 msgid "*** End of articles ***"
 msgstr ""
 
-#: src/lang.c:154
+#: src/lang.c:133
 msgid "*** End of groups ***"
 msgstr ""
 
-#: src/lang.c:155
+#: src/lang.c:134
 msgid "*** End of thread ***"
 msgstr ""
 
-#: src/lang.c:156
+#: src/lang.c:135
 msgid "Enter limit of articles to get> "
 msgstr ""
 
-#: src/lang.c:157
+#: src/lang.c:136
 msgid "Enter Message-ID to go to> "
 msgstr ""
 
-#: src/lang.c:158
+#: src/lang.c:137
 msgid " and enter next unread thread"
 msgstr ""
 
-#: src/lang.c:159
+#: src/lang.c:138
 msgid " and enter next unread group"
 msgstr ""
 
-#: src/lang.c:160
+#: src/lang.c:139
 msgid "Enter option number> "
 msgstr ""
 
-#: src/lang.c:161
+#: src/lang.c:140
 #, c-format
 msgid "Enter range [%s]> "
 msgstr ""
 
-#: src/lang.c:162
+#: src/lang.c:141
 msgid ""
 "\n"
 "Warning: Approved: header used.\n"
 msgstr ""
 
-#: src/lang.c:164
+#: src/lang.c:143
 msgid ""
 "\n"
 "Error: Bad address in Approved: header.\n"
 msgstr ""
 
-#: src/lang.c:165
+#: src/lang.c:144
 msgid ""
 "\n"
 "Error: Bad address in From: header.\n"
 msgstr ""
 
-#: src/lang.c:166
+#: src/lang.c:145
 msgid ""
 "\n"
 "Error: Bad address in Reply-To: header.\n"
 msgstr ""
 
-#: src/lang.c:167
+#: src/lang.c:146
 msgid ""
 "\n"
 "Error: Bad FQDN in Message-ID: header.\n"
 msgstr ""
 
-#: src/lang.c:168
+#: src/lang.c:147
 #, c-format
 msgid "Can't unlock %s"
 msgstr ""
 
-#: src/lang.c:170
+#: src/lang.c:149
 #, c-format
 msgid "Corrupted file %s"
 msgstr ""
 
-#: src/lang.c:171
+#: src/lang.c:150
 #, c-format
 msgid "Couldn't dotlock %s - article not appended!"
 msgstr ""
 
-#: src/lang.c:172
+#: src/lang.c:151
 #, c-format
 msgid "Couldn't lock %s - article not appended!"
 msgstr ""
 
-#: src/lang.c:174
+#: src/lang.c:153
 msgid "Internal error in GNKSA routine - send bug report.\n"
 msgstr ""
 
-#: src/lang.c:175
+#: src/lang.c:154
 msgid "Left angle bracket missing in route address.\n"
 msgstr ""
 
-#: src/lang.c:176
+#: src/lang.c:155
 msgid "Left parenthesis missing in old-style address.\n"
 msgstr ""
 
-#: src/lang.c:177
+#: src/lang.c:156
 msgid "Right parenthesis missing in old-style address.\n"
 msgstr ""
 
-#: src/lang.c:178
+#: src/lang.c:157
 msgid "At-sign missing in mail address.\n"
 msgstr ""
 
-#: src/lang.c:179
+#: src/lang.c:158
 msgid "Single component FQDN is not allowed. Add your domain.\n"
 msgstr ""
 
-#: src/lang.c:180
+#: src/lang.c:159
 msgid ""
 "Invalid domain. Send bug report if your top level domain really exists.\n"
 "Use .invalid as top level domain for munged addresses.\n"
 msgstr ""
 
-#: src/lang.c:181
+#: src/lang.c:160
 msgid ""
 "Illegal domain. Send bug report if your top level domain really exists.\n"
 "Use .invalid as top level domain for munged addresses.\n"
 msgstr ""
 
-#: src/lang.c:182
+#: src/lang.c:161
 msgid ""
 "Unknown domain. Send bug report if your top level domain really exists.\n"
 "Use .invalid as top level domain for munged addresses.\n"
 msgstr ""
 
-#: src/lang.c:183
+#: src/lang.c:162
 msgid "Illegal character in FQDN.\n"
 msgstr ""
 
-#: src/lang.c:184
+#: src/lang.c:163
 msgid "Zero length FQDN component not allowed.\n"
 msgstr ""
 
-#: src/lang.c:185
+#: src/lang.c:164
 msgid "FQDN component exceeds maximum allowed length (63 chars).\n"
 msgstr ""
 
-#: src/lang.c:186
+#: src/lang.c:165
 msgid "FQDN component may not start or end with hyphen.\n"
 msgstr ""
 
-#: src/lang.c:187
+#: src/lang.c:166
 msgid "FQDN component may not start with digit.\n"
 msgstr ""
 
-#: src/lang.c:188
+#: src/lang.c:167
 msgid "Domain literal has impossible numeric value.\n"
 msgstr ""
 
-#: src/lang.c:189
+#: src/lang.c:168
 msgid ""
 "Domain literal is for private use only and not allowed for global use.\n"
 msgstr ""
 
-#: src/lang.c:190
+#: src/lang.c:169
 msgid "Right bracket missing in domain literal.\n"
 msgstr ""
 
-#: src/lang.c:191
+#: src/lang.c:170
 msgid "Missing localpart of mail address.\n"
 msgstr ""
 
-#: src/lang.c:192
+#: src/lang.c:171
 msgid "Illegal character in localpart of mail address.\n"
 msgstr ""
 
-#: src/lang.c:193
+#: src/lang.c:172
 msgid "Zero length localpart component not allowed.\n"
 msgstr ""
 
-#: src/lang.c:194
+#: src/lang.c:173
 msgid ""
 "Illegal character in realname.\n"
 "Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n"
 msgstr ""
 
-#: src/lang.c:195
+#: src/lang.c:174
 msgid ""
 "Illegal character in realname.\n"
 "Quoted words may not contain '()<>\\'.\n"
 msgstr ""
 
-#: src/lang.c:196
+#: src/lang.c:175
 msgid ""
 "Illegal character in realname.\n"
 "Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n"
 msgstr ""
 
-#: src/lang.c:197
+#: src/lang.c:176
 msgid "Bad syntax in encoded word used in realname.\n"
 msgstr ""
 
-#: src/lang.c:198
+#: src/lang.c:177
 msgid ""
 "Illegal character in realname.\n"
 "Unquoted words may not contain '()<>\\' in old-style addresses.\n"
 msgstr ""
 
-#: src/lang.c:199
+#: src/lang.c:178
 msgid ""
 "Illegal character in realname.\n"
 "Control characters and unencoded 8bit characters > 127 are not allowed.\n"
 msgstr ""
 
-#: src/lang.c:200
+#: src/lang.c:179
 msgid ""
 "\n"
 "Error: No blank line found after header.\n"
 msgstr ""
 
 #. TODO: fixme, US-ASCII is not the only 7bit charset we know about
-#: src/lang.c:202
+#: src/lang.c:181
 msgid ""
 "\n"
 "Error: Posting contains non-ASCII characters but MM_CHARSET is set to\n"
@@ -845,7 +814,7 @@ msgid ""
 "       editing tinrc.\n"
 msgstr ""
 
-#: src/lang.c:207
+#: src/lang.c:186
 msgid ""
 "\n"
 "Error: Posting contains  non-ASCII characters  but the  MIME encoding\n"
@@ -855,13 +824,13 @@ msgid ""
 "       using the M)enu of configurable options or by editing tinrc.\n"
 msgstr ""
 
-#: src/lang.c:213
+#: src/lang.c:192
 msgid ""
 "\n"
 "Error: Article starts with blank line instead of header\n"
 msgstr ""
 
-#: src/lang.c:214
+#: src/lang.c:193
 #, c-format
 msgid ""
 "\n"
@@ -869,40 +838,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/lang.c:215
+#: src/lang.c:194
 #, c-format
 msgid ""
 "\n"
 "Error: The \"%s:\" line is empty.\n"
 msgstr ""
 
-#: src/lang.c:217
-#, c-format
-msgid ""
-"\n"
-"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
-"       The only allowable  space is the one  separating the colon (:)\n"
-"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
-"       newsgroup names.\n"
-msgstr ""
-
-#: src/lang.c:222
-#, c-format
-msgid ""
-"\n"
-"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
-"       the line  may not  contain  whitespace,  this is  not allowed.\n"
-"       Please write all newsgroups into a single line.\n"
-msgstr ""
-
-#: src/lang.c:227
+#: src/lang.c:195
 #, c-format
 msgid ""
 "\n"
 "Error: The \"%s:\" line is missing from the article header.\n"
 msgstr ""
 
-#: src/lang.c:228
+#: src/lang.c:196
 #, c-format
 msgid ""
 "\n"
@@ -910,851 +860,901 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/lang.c:229
+#: src/lang.c:197
 #, c-format
 msgid ""
 "\n"
 "Error: There are multiple (%d) \"%s:\" lines in the header.\n"
 msgstr ""
 
-#: src/lang.c:230
+#: src/lang.c:198
 #, c-format
 msgid "Insecure permissions of %s (%o)"
 msgstr ""
 
-#: src/lang.c:231 src/open.c:1080
+#: src/lang.c:199 src/open.c:1017
 #, c-format
 msgid "Invalid response to GROUP command, %s"
 msgstr ""
 
-#: src/lang.c:233
+#: src/lang.c:201
 #, c-format
 msgid "MIME parse error: Unexpected end of %s/%s article"
 msgstr ""
 
-#: src/lang.c:234
+#: src/lang.c:202
 msgid "MIME parse error: Start boundary whilst reading headers"
 msgstr ""
 
-#: src/lang.c:235
+#: src/lang.c:203
 msgid "Can't get a (fully-qualified) domain-name!\n"
 msgstr ""
 
-#: src/lang.c:236
+#: src/lang.c:204
 #, c-format
 msgid "No permissions to go into %s\n"
 msgstr ""
 
-#: src/lang.c:237
+#: src/lang.c:205
 msgid ""
 "\n"
 "Error: From: line missing.\n"
 msgstr ""
 
-#: src/lang.c:238
+#: src/lang.c:206
 #, c-format
 msgid "No read permissions for %s\n"
 msgstr ""
 
-#: src/lang.c:239
+#: src/lang.c:207
 #, c-format
 msgid "File %s does not exist\n"
 msgstr ""
 
-#: src/lang.c:240
+#: src/lang.c:208
 #, c-format
 msgid "No write permissions for %s\n"
 msgstr ""
 
-#: src/lang.c:241
+#: src/lang.c:209
 msgid "Can't get user information (/etc/passwd missing?)"
 msgstr ""
 
-#: src/lang.c:242
+#: src/lang.c:210
 msgid "errors"
 msgstr ""
 
-#: src/lang.c:243
+#: src/lang.c:211
 #, c-format
 msgid ""
 "\n"
 "Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n"
 msgstr ""
 
-#: src/lang.c:244
+#: src/lang.c:212
 #, c-format
 msgid "Server has non of the groups listed in %s"
 msgstr ""
 
-#: src/lang.c:245
+#: src/lang.c:213
 msgid "error"
 msgstr ""
 
-#: src/lang.c:247
-msgid ""
-"\n"
-"socket or connect problem\n"
-msgstr ""
-
-#: src/lang.c:250
-msgid "Server unavailable\n"
-msgstr ""
-
-#: src/lang.c:253
+#: src/lang.c:214
 msgid "Unknown display level"
 msgstr ""
 
-#: src/lang.c:254
-#, c-format
-msgid "%s/tcp: Unknown service.\n"
-msgstr ""
-
-#: src/lang.c:255
-#, c-format
-msgid "Wrong newsgroup name in response of GROUP command, %s for %s"
-msgstr ""
-
-#: src/lang.c:256
+#: src/lang.c:215
 msgid "<ESC>"
 msgstr ""
 
-#: src/lang.c:257
+#: src/lang.c:216
 msgid "Exiting..."
 msgstr ""
 
-#: src/lang.c:258
+#: src/lang.c:217
 msgid "leaving external mail-reader"
 msgstr ""
 
-#: src/lang.c:259
+#: src/lang.c:218
 #, c-format
 msgid "Extracting %s..."
 msgstr ""
 
-#: src/lang.c:260
-#, c-format
-msgid "Failed to connect to NNTP server %s. Exiting..."
-msgstr ""
-
-#: src/lang.c:261
+#: src/lang.c:220
 #, c-format
 msgid "Error writing %s file. Filesystem full? File reset to previous state."
 msgstr ""
 
-#: src/lang.c:262
+#: src/lang.c:221
 #, c-format
 msgid "Error making backup of %s file. Filesystem full?"
 msgstr ""
 
-#: src/lang.c:263
+#: src/lang.c:222
 #, c-format
 msgid "Filtering global rules (%d/%d)..."
 msgstr ""
 
-#: src/lang.c:264
+#: src/lang.c:223
 msgid "Rule created by: "
 msgstr ""
 
-#: src/lang.c:265
+#: src/lang.c:224
 #, c-format
 msgid "Enter pattern [%s]> "
 msgstr ""
 
-#: src/lang.c:266
+#: src/lang.c:225
 #, c-format
 msgid ""
 "\n"
 "You requested followups to your article to go to the following %s:\n"
 msgstr ""
 
-#: src/lang.c:267
+#: src/lang.c:226
 #, c-format
 msgid "  %s\t Answers will be directed to you by mail.\n"
 msgstr ""
 
-#: src/lang.c:268
+#: src/lang.c:227
+msgid ""
+"# Format:\n"
+"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
+"placed\n"
+"#                     at the beginning of a rule, or they will be moved to "
+"the\n"
+"#                     next rule. '#' is not a valid keyword for a comment!\n"
+"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
+"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
+"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
+"#     score=NUM         A number (e.g. 70). Or:\n"
+"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
+"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
+"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
+"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) "
+"with\n"
+"#                     full references.\n"
+"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
+"#   msgid_only=STRING Optional. Like above, but without references.\n"
+"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
+"without\n"
+"#                     Message-ID:\n"
+"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
+"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
+"opt.\n"
+"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
+"#   time=NUM          Optional. time_t value when rule expires\n"
+"#\n"
+msgstr ""
+
+#: src/lang.c:248
 #, c-format
-msgid "%s%s: Unknown host.\n"
+msgid "Enter score for rule (default=%d): "
 msgstr ""
 
-#: src/lang.c:269
-msgid "Giving up...\n"
+#: src/lang.c:249
+#, c-format
+msgid "Enter the score weight (range 0 < score <= %d)"
 msgstr ""
 
-#: src/lang.c:270
-msgid "global "
+#. SCORE_MAX
+#: src/lang.c:250
+msgid "Full"
 msgstr ""
 
-#: src/lang.c:273
-#, c-format
-msgid "Group %.*s ('q' to quit)..."
+#: src/lang.c:251
+msgid "Comment (optional)  : "
 msgstr ""
 
-#: src/lang.c:275
+#: src/lang.c:252
+msgid "Apply pattern to    : "
+msgstr ""
+
+#: src/lang.c:253
+msgid "From: line (ignore case)      "
+msgstr ""
+
+#: src/lang.c:254
+msgid "From: line (case sensitive)   "
+msgstr ""
+
+#: src/lang.c:256
 #, c-format
-msgid "Group %.*s..."
+msgid "%s%s: Unknown host.\n"
 msgstr ""
 
-#: src/lang.c:278
+#: src/lang.c:257
+msgid "global "
+msgstr ""
+
+#: src/lang.c:258
 #, c-format
 msgid "Please use %.100s instead"
 msgstr ""
 
-#: src/lang.c:279
+#: src/lang.c:259
 #, c-format
 msgid "Group %s is moderated. Continue?"
 msgstr ""
 
-#: src/lang.c:280
+#: src/lang.c:260
 msgid "groups"
 msgstr ""
 
-#: src/lang.c:281
+#: src/lang.c:261
 msgid "Top Level Commands"
 msgstr ""
 
-#: src/lang.c:282
+#: src/lang.c:262
 msgid "Group Selection"
 msgstr ""
 
-#: src/lang.c:283
+#: src/lang.c:263
 msgid "group"
 msgstr ""
 
-#: src/lang.c:285
+#: src/lang.c:265
+msgid ""
+"One or more lines of comment. <CR> to add a line or proceed if line is empty."
+msgstr ""
+
+#: src/lang.c:266
+msgid "From: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr ""
+
+#: src/lang.c:267
+msgid ""
+"Linecount of articles to be filtered. < for less, > for more, = for equal."
+msgstr ""
+
+#: src/lang.c:268
+msgid "Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr ""
+
+#: src/lang.c:269
+msgid "Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
+msgstr ""
+
+#: src/lang.c:270
+msgid ""
+"Enter text pattern to filter if Subject: & From: lines are not what you want."
+msgstr ""
+
+#: src/lang.c:271
+msgid ""
+"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
+msgstr ""
+
+#: src/lang.c:272
+msgid ""
+"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
+msgstr ""
+
+#: src/lang.c:273
+msgid ""
+"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr ""
+
+#: src/lang.c:274
+msgid ""
+"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
+msgstr ""
+
+#: src/lang.c:275
 msgid "kill an article via a menu"
 msgstr ""
 
-#: src/lang.c:286
+#: src/lang.c:276
 msgid "auto-select (hot) an article via a menu"
 msgstr ""
 
-#: src/lang.c:287
+#: src/lang.c:277
 msgid "Browse URLs in article"
 msgstr ""
 
-#: src/lang.c:288
+#: src/lang.c:278
 msgid "0 - 9\t  display article by number in current thread"
 msgstr ""
 
-#: src/lang.c:289
+#: src/lang.c:279
 msgid "cancel (delete) current article; must have been posted by you"
 msgstr ""
 
-#: src/lang.c:290
+#: src/lang.c:280
 msgid "edit article (mail-groups only)"
 msgstr ""
 
-#: src/lang.c:291
+#: src/lang.c:281
 msgid "display first article in current thread"
 msgstr ""
 
-#: src/lang.c:292
+#: src/lang.c:282
 msgid "display first page of article"
 msgstr ""
 
-#: src/lang.c:293
+#: src/lang.c:283
 msgid "post followup to current article"
 msgstr ""
 
-#: src/lang.c:294
+#: src/lang.c:284
 msgid "post followup (don't copy text) to current article"
 msgstr ""
 
-#: src/lang.c:295
+#: src/lang.c:285
 msgid "post followup to current article quoting complete headers"
 msgstr ""
 
-#: src/lang.c:296
+#: src/lang.c:286
 msgid "display last article in current thread"
 msgstr ""
 
-#: src/lang.c:297
+#: src/lang.c:287
 msgid "display last page of article"
 msgstr ""
 
-#: src/lang.c:298
+#: src/lang.c:288
 msgid "mark rest of thread as read and advance to next unread"
 msgstr ""
 
-#: src/lang.c:299
+#: src/lang.c:289
 msgid "display next article"
 msgstr ""
 
-#: src/lang.c:300
+#: src/lang.c:290
 msgid "display first article in next thread"
 msgstr ""
 
-#: src/lang.c:301 src/lang.c:311 src/lang.c:382 src/lang.c:383
+#: src/lang.c:291 src/lang.c:298 src/lang.c:357 src/lang.c:358
 msgid "display next unread article"
 msgstr ""
 
-#: src/lang.c:302
+#: src/lang.c:292
 msgid "go to the article that this one followed up"
 msgstr ""
 
-#: src/lang.c:304
-msgid "perform PGP operations on article"
-msgstr ""
-
-#: src/lang.c:306
+#: src/lang.c:293
 msgid "display previous article"
 msgstr ""
 
-#: src/lang.c:307 src/lang.c:385
+#: src/lang.c:294 src/lang.c:360
 msgid "display previous unread article"
 msgstr ""
 
-#: src/lang.c:308
+#: src/lang.c:295
 msgid "quickly kill an article using defaults"
 msgstr ""
 
-#: src/lang.c:309
+#: src/lang.c:296
 msgid "quickly auto-select (hot) an article using defaults"
 msgstr ""
 
-#: src/lang.c:310
+#: src/lang.c:297
 msgid "return to group selection level"
 msgstr ""
 
-#: src/lang.c:312
+#: src/lang.c:299
 msgid "reply through mail to author"
 msgstr ""
 
-#: src/lang.c:313
+#: src/lang.c:300
 msgid "reply through mail (don't copy text) to author"
 msgstr ""
 
-#: src/lang.c:314
+#: src/lang.c:301
 msgid "reply through mail to author quoting complete headers"
 msgstr ""
 
-#: src/lang.c:315 src/lang.c:387
+#: src/lang.c:302 src/lang.c:362
 msgid "repost chosen article to another group"
 msgstr ""
 
-#: src/lang.c:316
+#: src/lang.c:303
 msgid "search backwards within this article"
 msgstr ""
 
-#: src/lang.c:317
+#: src/lang.c:304
 msgid "search forwards within this article"
 msgstr ""
 
-#: src/lang.c:318
+#: src/lang.c:305
 msgid "show article in raw-mode (including all headers)"
 msgstr ""
 
-#: src/lang.c:319
+#: src/lang.c:306
 msgid "skip next block of included text"
 msgstr ""
 
-#: src/lang.c:320
+#: src/lang.c:307
 msgid "toggle display of sections hidden by a form-feed (^L) on/off"
 msgstr ""
 
-#: src/lang.c:321
+#: src/lang.c:308
 msgid "toggle word highlighting on/off"
 msgstr ""
 
-#: src/lang.c:322
+#: src/lang.c:309
 msgid "toggle ROT-13 (basic decode) for current article"
 msgstr ""
 
-#: src/lang.c:323
+#: src/lang.c:310
 msgid "toggle tabwidth 4 <-> 8"
 msgstr ""
 
-#: src/lang.c:324
+#: src/lang.c:311
 msgid "toggle german TeX style decoding for current article"
 msgstr ""
 
-#: src/lang.c:325
+#: src/lang.c:312
 msgid "toggle display of uuencoded sections"
 msgstr ""
 
-#: src/lang.c:326
+#: src/lang.c:313
 msgid "View/save multimedia attachments"
 msgstr ""
 
-#: src/lang.c:327
+#: src/lang.c:314
 #, c-format
 msgid "report bug or comment via mail to %s"
 msgstr ""
 
-#: src/lang.c:328
+#: src/lang.c:315
 msgid "choose range of articles to be affected by next command"
 msgstr ""
 
-#: src/lang.c:329
+#: src/lang.c:316
 msgid "escape from command prompt"
 msgstr ""
 
-#: src/lang.c:330
+#: src/lang.c:317
 msgid "get help"
 msgstr ""
 
-#: src/lang.c:331
+#: src/lang.c:318
 msgid "display last article viewed"
 msgstr ""
 
-#: src/lang.c:332
+#: src/lang.c:319
 msgid "down one line"
 msgstr ""
 
-#: src/lang.c:333
+#: src/lang.c:320
 msgid "up one line"
 msgstr ""
 
-#: src/lang.c:334
+#: src/lang.c:321
 msgid "go to article chosen by Message-ID"
 msgstr ""
 
-#: src/lang.c:335
+#: src/lang.c:322
 msgid "mail article/thread/hot/pattern/tagged articles to someone"
 msgstr ""
 
-#: src/lang.c:336
+#: src/lang.c:323
 msgid "menu of configurable options"
 msgstr ""
 
-#: src/lang.c:337
+#: src/lang.c:324
 msgid "down one page"
 msgstr ""
 
-#: src/lang.c:338
+#: src/lang.c:325
 msgid "up one page"
 msgstr ""
 
-#: src/lang.c:340
-msgid "pipe article/thread/hot/pattern/tagged articles into command"
-msgstr ""
-
-#: src/lang.c:342
+#: src/lang.c:326
 msgid "post (write) article to current group"
 msgstr ""
 
-#: src/lang.c:343
+#: src/lang.c:327
 msgid "post postponed articles"
 msgstr ""
 
-#: src/lang.c:344
+#: src/lang.c:328
 msgid "list articles posted by you (from posted file)"
 msgstr ""
 
-#: src/lang.c:345
+#: src/lang.c:329
 msgid "return to previous menu"
 msgstr ""
 
-#: src/lang.c:347
-msgid "output article/thread/hot/pattern/tagged articles to printer"
-msgstr ""
-
-#: src/lang.c:349
+#: src/lang.c:330
 msgid "quit tin immediately"
 msgstr ""
 
-#: src/lang.c:350
+#: src/lang.c:331
 msgid "redraw page"
 msgstr ""
 
-#: src/lang.c:351
+#: src/lang.c:332
 msgid "save article/thread/hot/pattern/tagged articles to file"
 msgstr ""
 
-#: src/lang.c:352
+#: src/lang.c:333
 msgid "save marked articles automatically without user prompts"
 msgstr ""
 
-#: src/lang.c:353
+#: src/lang.c:334
 msgid "search for articles by author backwards"
 msgstr ""
 
-#: src/lang.c:354
+#: src/lang.c:335
 msgid "search for articles by author forwards"
 msgstr ""
 
-#: src/lang.c:355
+#: src/lang.c:336
 msgid "search all articles for a given string (this may take some time)"
 msgstr ""
 
-#: src/lang.c:356
+#: src/lang.c:337
 msgid " \t  (searches are case-insensitive and wrap around to all articles)"
 msgstr ""
 
-#: src/lang.c:357
+#: src/lang.c:338
 msgid "search for articles by Subject line backwards"
 msgstr ""
 
-#: src/lang.c:358
+#: src/lang.c:339
 msgid "search for articles by Subject line forwards"
 msgstr ""
 
-#: src/lang.c:359
+#: src/lang.c:340
 msgid "repeat last search"
 msgstr ""
 
-#: src/lang.c:361
-msgid "shell escape"
-msgstr ""
-
-#: src/lang.c:363
+#: src/lang.c:341
 msgid "tag current article for reposting/mailing/piping/printing/saving"
 msgstr ""
 
-#: src/lang.c:365
-msgid "toggle color"
-msgstr ""
-
-#: src/lang.c:367
+#: src/lang.c:342
 msgid "toggle info message in last line (subject/description)"
 msgstr ""
 
-#: src/lang.c:368
+#: src/lang.c:343
 msgid "toggle inverse video"
 msgstr ""
 
-#: src/lang.c:369
+#: src/lang.c:344
 msgid "toggle mini help menu display"
 msgstr ""
 
-#: src/lang.c:370
+#: src/lang.c:345
 msgid "show version information"
 msgstr ""
 
-#: src/lang.c:371
+#: src/lang.c:346
 msgid "mark all articles as read and return to group selection menu"
 msgstr ""
 
-#: src/lang.c:372
+#: src/lang.c:347
 msgid "mark all articles as read and enter next group with unread articles"
 msgstr ""
 
-#: src/lang.c:373
+#: src/lang.c:348
 msgid "choose first thread in list"
 msgstr ""
 
-#: src/lang.c:374 src/lang.c:405
+#: src/lang.c:349 src/lang.c:380
 msgid "choose group by name"
 msgstr ""
 
-#: src/lang.c:375
+#: src/lang.c:350
 msgid "choose last thread in list"
 msgstr ""
 
-#: src/lang.c:376
+#: src/lang.c:351
 msgid "list articles within current thread (bring up Thread sub-menu)"
 msgstr ""
 
-#: src/lang.c:377
+#: src/lang.c:352
 msgid "mark article as unread"
 msgstr ""
 
-#: src/lang.c:378
+#: src/lang.c:353
 msgid "mark current thread as read"
 msgstr ""
 
-#: src/lang.c:379
+#: src/lang.c:354
 msgid "mark thread as unread"
 msgstr ""
 
-#: src/lang.c:380
+#: src/lang.c:355
 msgid "toggle display of all/selected articles"
 msgstr ""
 
-#: src/lang.c:381
+#: src/lang.c:356
 msgid "display next group"
 msgstr ""
 
-#: src/lang.c:384
+#: src/lang.c:359
 msgid "display previous group"
 msgstr ""
 
-#: src/lang.c:386 src/lang.c:434
+#: src/lang.c:361 src/lang.c:409
 msgid "read chosen article"
 msgstr ""
 
-#: src/lang.c:388
+#: src/lang.c:363
 msgid "toggle all selections (all articles)"
 msgstr ""
 
-#: src/lang.c:389
+#: src/lang.c:364
 msgid "select group (make \"hot\")"
 msgstr ""
 
-#: src/lang.c:390
+#: src/lang.c:365
 msgid "select thread"
 msgstr ""
 
-#: src/lang.c:391
+#: src/lang.c:366
 msgid "select threads if at least one unread article is selected"
 msgstr ""
 
-#: src/lang.c:392
+#: src/lang.c:367
 msgid "select threads that match user specified pattern"
 msgstr ""
 
-#: src/lang.c:393
+#: src/lang.c:368
 msgid "tag all parts of current multipart-message in order"
 msgstr ""
 
-#: src/lang.c:394
+#: src/lang.c:369
 msgid "0 - 9\t  choose thread by number"
 msgstr ""
 
-#: src/lang.c:395
+#: src/lang.c:370
 msgid "toggle limit number of articles to get, and reload"
 msgstr ""
 
-#: src/lang.c:396
+#: src/lang.c:371
 msgid "toggle display of all/unread articles"
 msgstr ""
 
-#: src/lang.c:397 src/lang.c:435
+#: src/lang.c:372 src/lang.c:410
 msgid "cycle the display of authors email address, real name, both or neither"
 msgstr ""
 
-#: src/lang.c:398
+#: src/lang.c:373
 msgid "toggle selection of thread"
 msgstr ""
 
-#: src/lang.c:399
+#: src/lang.c:374
 msgid "cycle through threading options available"
 msgstr ""
 
-#: src/lang.c:400
+#: src/lang.c:375
 msgid "undo all selections (all articles)"
 msgstr ""
 
-#: src/lang.c:401
+#: src/lang.c:376
 msgid "untag all tagged threads"
 msgstr ""
 
-#: src/lang.c:402
+#: src/lang.c:377
 msgid "mark all articles in group as read"
 msgstr ""
 
-#: src/lang.c:403
+#: src/lang.c:378
 msgid "mark all articles in group as read and move to next unread group"
 msgstr ""
 
-#: src/lang.c:404
+#: src/lang.c:379
 msgid "choose first group in list"
 msgstr ""
 
-#: src/lang.c:406
+#: src/lang.c:381
 msgid "0 - 9\t  choose group by number"
 msgstr ""
 
-#: src/lang.c:407
+#: src/lang.c:382
 msgid "choose range of groups to be affected by next command"
 msgstr ""
 
-#: src/lang.c:408
+#: src/lang.c:383
 msgid "choose last group in list"
 msgstr ""
 
-#: src/lang.c:409
+#: src/lang.c:384
 msgid "mark all articles in chosen group unread"
 msgstr ""
 
-#: src/lang.c:410
+#: src/lang.c:385
 msgid "move chosen group within list"
 msgstr ""
 
-#: src/lang.c:411
+#: src/lang.c:386
 msgid "choose next group with unread news"
 msgstr ""
 
-#: src/lang.c:412 src/lang.c:913
+#: src/lang.c:387 src/lang.c:1176
 msgid "quit"
 msgstr ""
 
-#: src/lang.c:413
+#: src/lang.c:388
 msgid "quit without saving configuration changes"
 msgstr ""
 
-#: src/lang.c:414
+#: src/lang.c:389
 msgid "read chosen group"
 msgstr ""
 
-#: src/lang.c:415
+#: src/lang.c:390
 msgid "reset .newsrc (all available articles in groups marked unread)"
 msgstr ""
 
-#: src/lang.c:416
+#: src/lang.c:391
 msgid "search backwards for a group name"
 msgstr ""
 
-#: src/lang.c:417
+#: src/lang.c:392
 msgid " \t  (all searches are case-insensitive and wrap around)"
 msgstr ""
 
-#: src/lang.c:418
+#: src/lang.c:393
 msgid "search forwards for a group name"
 msgstr ""
 
-#: src/lang.c:419
+#: src/lang.c:394
 msgid "subscribe to chosen group"
 msgstr ""
 
-#: src/lang.c:420
+#: src/lang.c:395
 msgid "subscribe to groups that match pattern"
 msgstr ""
 
-#: src/lang.c:421
+#: src/lang.c:396
 msgid "reread active file to check for any new news"
 msgstr ""
 
-#: src/lang.c:422
+#: src/lang.c:397
 msgid "toggle display of group name only or group name plus description"
 msgstr ""
 
-#: src/lang.c:423
+#: src/lang.c:398
 msgid "toggle display to show all/unread subscribed groups"
 msgstr ""
 
-#: src/lang.c:424
+#: src/lang.c:399
 msgid "unsubscribe from chosen group"
 msgstr ""
 
-#: src/lang.c:425
+#: src/lang.c:400
 msgid "unsubscribe from groups that match pattern"
 msgstr ""
 
-#: src/lang.c:426
+#: src/lang.c:401
 msgid "sort the list of groups"
 msgstr ""
 
-#: src/lang.c:427
+#: src/lang.c:402
 msgid "toggle display to show all/subscribed groups"
 msgstr ""
 
-#: src/lang.c:428
+#: src/lang.c:403
 msgid "0 - 9\t  choose article by number"
 msgstr ""
 
-#: src/lang.c:429
+#: src/lang.c:404
 msgid "mark thread as read and return to group index page"
 msgstr ""
 
-#: src/lang.c:430
+#: src/lang.c:405
 msgid "mark thread as read and enter next unread thread or group"
 msgstr ""
 
-#: src/lang.c:431
+#: src/lang.c:406
 msgid "choose first article in list"
 msgstr ""
 
-#: src/lang.c:432
+#: src/lang.c:407
 msgid "choose last article in list"
 msgstr ""
 
-#: src/lang.c:433
+#: src/lang.c:408
 msgid "mark article as read and move cursor to next unread article"
 msgstr ""
 
-#: src/lang.c:436
+#: src/lang.c:411
 msgid ""
 "Display properties\n"
 "------------------"
 msgstr ""
 
-#: src/lang.c:437
+#: src/lang.c:412
 msgid ""
 "Miscellaneous\n"
 "-------------"
 msgstr ""
 
-#: src/lang.c:438
+#: src/lang.c:413
 msgid ""
 "Moving around\n"
 "-------------"
 msgstr ""
 
-#: src/lang.c:439
+#: src/lang.c:414
 msgid ""
 "Group/thread/article operations\n"
 "-------------------------------"
 msgstr ""
 
-#: src/lang.c:440
+#: src/lang.c:416
 msgid "Group Level Commands"
 msgstr ""
 
-#: src/lang.c:441
+#: src/lang.c:417
 msgid "Kill filter added"
 msgstr ""
 
-#: src/lang.c:442
+#: src/lang.c:418
 msgid "Auto-selection filter added"
 msgstr ""
 
-#: src/lang.c:443
+#: src/lang.c:419
 msgid "All parts tagged"
 msgstr ""
 
-#: src/lang.c:444
+#: src/lang.c:420
 msgid "Storing article for later posting"
 msgstr ""
 
-#: src/lang.c:445
+#: src/lang.c:421
 msgid "Please enter a valid character"
 msgstr ""
 
-#: src/lang.c:446
+#: src/lang.c:422
 #, c-format
 msgid "Missing part #%d"
 msgstr ""
 
-#: src/lang.c:447
+#: src/lang.c:423
 msgid "*** No postponed articles ***"
 msgstr ""
 
-#: src/lang.c:448
+#: src/lang.c:424
 msgid "Not a multi-part message"
 msgstr ""
 
-#: src/lang.c:449
+#: src/lang.c:425
 msgid "You are not subscribed to this group"
 msgstr ""
 
-#: src/lang.c:450
+#: src/lang.c:426
 msgid "No previous expression"
 msgstr ""
 
-#: src/lang.c:451
+#: src/lang.c:427
 msgid "Operation disabled in no-overwrite mode"
 msgstr ""
 
 #. TODO: replace hardcoded key-name in txt_info_postponed
-#: src/lang.c:453
+#: src/lang.c:429
 #, c-format
 msgid "%d postponed %s, reuse with ^O...\n"
 msgstr ""
 
-#: src/lang.c:454
+#: src/lang.c:430
 msgid ""
 "X-Conversion-Note: multipart/alternative contents have been removed.\n"
 "  To get the whole article, turn alternative handling OFF in the Option "
 "Menu\n"
 msgstr ""
 
-#: src/lang.c:456
+#: src/lang.c:432
 #, c-format
 msgid "Save filename for %s/%s is a mailbox. Attachment not saved"
 msgstr ""
 
-#: src/lang.c:457
+#: src/lang.c:433
 msgid "TeX2Iso encoded article"
 msgstr ""
 
-#: src/lang.c:458
+#: src/lang.c:434
 msgid "incomplete "
 msgstr ""
 
 #. TODO: replace hardcoded key-names
-#: src/lang.c:460
+#: src/lang.c:436
 #, c-format
 msgid ""
 "\n"
@@ -1792,130 +1792,129 @@ msgid ""
 "Please send bug-reports/comments to %s with the 'R' command.\n"
 msgstr ""
 
-#: src/lang.c:476
+#: src/lang.c:452
 #, c-format
 msgid "Invalid  From: %s  line. Read the INSTALL file again."
 msgstr ""
 
-#: src/lang.c:477
+#: src/lang.c:453
 #, c-format
 msgid "Invalid  Sender:-header %s"
 msgstr ""
 
-#: src/lang.c:478
+#: src/lang.c:454
 msgid "Inverse video disabled"
 msgstr ""
 
-#: src/lang.c:479
+#: src/lang.c:455
 msgid "Inverse video enabled"
 msgstr ""
 
-#: src/lang.c:480
+#: src/lang.c:457
 #, c-format
 msgid "Missing definition for %s\n"
 msgstr ""
 
-#: src/lang.c:481
+#: src/lang.c:458
 #, c-format
 msgid "Invalid key definition '%s'\n"
 msgstr ""
 
-#: src/lang.c:482
+#: src/lang.c:459
 #, c-format
 msgid "Invalid keyname '%s'\n"
 msgstr ""
 
-#: src/lang.c:484
+#: src/lang.c:460
 #, c-format
-msgid "Redefined key %s '%s' -> '%s'\n"
+msgid "Key '%s' is defined for both %s%s and %s%s\n"
 msgstr ""
 
-#: src/lang.c:485
-msgid "  -D       debug mode 1=NNTP 2=ALL"
+#: src/lang.c:461
+#, c-format
+msgid "Kill From:     [%-*.*s] (y/n): "
 msgstr ""
 
-#: src/lang.c:487
-#, c-format
-msgid "Key '%s' is defined for both %s%s and %s%s\n"
+#: src/lang.c:462
+msgid "Kill Lines: (</>num): "
 msgstr ""
 
-#: src/lang.c:488
-msgid "-- Last response --"
+#: src/lang.c:463
+msgid "Kill Article Menu"
 msgstr ""
 
-#: src/lang.c:491
+#: src/lang.c:464
 #, c-format
-msgid "%d files successfully written from %d articles. %d %s occurred."
+msgid "Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
 msgstr ""
 
-#: src/lang.c:492
-msgid "Missing parts."
+#: src/lang.c:465
+msgid "Kill pattern scope  : "
 msgstr ""
 
-#: src/lang.c:493
-msgid "No beginning."
+#: src/lang.c:466
+#, c-format
+msgid "Kill Subject:  [%-*.*s] (y/n): "
 msgstr ""
 
-#: src/lang.c:494
-msgid "No data."
+#: src/lang.c:467
+msgid "Kill text pattern   : "
 msgstr ""
 
-#: src/lang.c:495
-msgid "Unknown error."
+#: src/lang.c:468
+msgid "Kill time in days   : "
 msgstr ""
 
-#: src/lang.c:497
-#, c-format
-msgid "Error decoding %s : %s"
+#: src/lang.c:470
+msgid "Last"
 msgstr ""
 
-#: src/lang.c:498
-msgid "No end."
+#: src/lang.c:471
+msgid "-- Last response --"
 msgstr ""
 
-#: src/lang.c:499
+#: src/lang.c:472
 #, c-format
-msgid "%s successfully decoded."
+msgid "Lines %s  "
 msgstr ""
 
-#: src/lang.c:501
-#, c-format
-msgid "Lines %s  "
+#: src/lang.c:474
+msgid "Message-ID: line              "
 msgstr ""
 
-#: src/lang.c:503
+#: src/lang.c:476
 msgid "mailbox "
 msgstr ""
 
-#: src/lang.c:504
+#: src/lang.c:477
 #, c-format
 msgid "Mail article(s) to [%.*s]> "
 msgstr ""
 
-#: src/lang.c:505
+#: src/lang.c:478
 #, c-format
 msgid "Mailing log to %s\n"
 msgstr ""
 
-#: src/lang.c:506
+#: src/lang.c:479
 msgid "Mail bug report..."
 msgstr ""
 
-#: src/lang.c:507
+#: src/lang.c:480
 #, c-format
 msgid "Mail BUG REPORT to %s?"
 msgstr ""
 
-#: src/lang.c:508
+#: src/lang.c:481
 msgid "Mailed"
 msgstr ""
 
-#: src/lang.c:509
+#: src/lang.c:482
 #, c-format
 msgid "Mailing to %s..."
 msgstr ""
 
-#: src/lang.c:510
+#: src/lang.c:483
 msgid ""
 "# [Mail/Save] active file. Format is like news active file:\n"
 "#   groupname  max.artnum  min.artnum  /dir\n"
@@ -1923,391 +1922,290 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: src/lang.c:513
+#: src/lang.c:486
 #, c-format
 msgid "%s marked as unread"
 msgstr ""
 
-#: src/lang.c:514
+#: src/lang.c:487
 #, c-format
 msgid "Marked %d of %d tagged %s as read"
 msgstr ""
 
-#: src/lang.c:515
+#: src/lang.c:488
 #, c-format
 msgid "Mark all articles as read%s?"
 msgstr ""
 
-#: src/lang.c:516
+#: src/lang.c:489
 #, c-format
 msgid "Mark %s=tagged articles, %s=current article, %s=quit: "
 msgstr ""
 
-#: src/lang.c:517
+#: src/lang.c:490
 #, c-format
 msgid "Mark group %.*s as read?"
 msgstr ""
 
-#: src/lang.c:518
+#: src/lang.c:491
 #, c-format
 msgid "Mark thread as read%s?"
 msgstr ""
 
-#: src/lang.c:519
+#: src/lang.c:492
 #, c-format
 msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: "
 msgstr ""
 
-#: src/lang.c:520
+#: src/lang.c:493
 #, c-format
 msgid "Matching %s groups..."
 msgstr ""
 
-#: src/lang.c:521 src/lang.c:525
+#: src/lang.c:494 src/lang.c:498
 #, c-format
 msgid "<n>=set current to n; %s=next unread; %s=search pattern; %s=kill/select"
 msgstr ""
 
-#: src/lang.c:522
+#: src/lang.c:495
 #, c-format
 msgid ""
 "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; "
 "%s=list thread"
 msgstr ""
 
-#: src/lang.c:523
+#: src/lang.c:496
 #, c-format
 msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom"
 msgstr ""
 
-#: src/lang.c:524
+#: src/lang.c:497
 #, c-format
 msgid "%s=search forwards; %s=search backwards; %s=quit"
 msgstr ""
 
-#: src/lang.c:526
+#: src/lang.c:499
 #, c-format
 msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read"
 msgstr ""
 
-#: src/lang.c:530
-#, c-format
-msgid ""
-"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
-"%s=post"
-msgstr ""
-
-#: src/lang.c:531
-#, c-format
-msgid ""
-"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr ""
-
-#: src/lang.c:533
-#, c-format
-msgid ""
-"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr ""
-
-#: src/lang.c:534
-#, c-format
-msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr ""
-
-#: src/lang.c:538
-#, c-format
-msgid ""
-"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr ""
-
-#: src/lang.c:539
-#, c-format
-msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr ""
-
-#: src/lang.c:541
-#, c-format
-msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
-msgstr ""
-
-#: src/lang.c:542
-#, c-format
-msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
-msgstr ""
-
-#: src/lang.c:546
+#: src/lang.c:500
 #, c-format
 msgid "<n>=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup"
 msgstr ""
 
-#: src/lang.c:547
+#: src/lang.c:501
 #, c-format
 msgid ""
 "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread"
 msgstr ""
 
-#: src/lang.c:548
+#: src/lang.c:502
 #, c-format
 msgid ""
 "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank "
 "in/out"
 msgstr ""
 
-#: src/lang.c:549
+#: src/lang.c:503
 #, c-format
 msgid "<n>=set current to n; %s=next unread; %s=catchup; %s=display toggle"
 msgstr ""
 
-#: src/lang.c:550
+#: src/lang.c:504
 #, c-format
 msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread"
 msgstr ""
 
-#: src/lang.c:551
+#: src/lang.c:505
 msgid "--More--"
 msgstr ""
 
-#: src/lang.c:552
+#: src/lang.c:506
 #, c-format
 msgid "Moving %s..."
 msgstr ""
 
-#: src/lang.c:553
+#: src/lang.c:508
 msgid ", name: "
 msgstr ""
 
-#: src/lang.c:554
+#: src/lang.c:509
 #, c-format
 msgid "Goto newsgroup [%s]> "
 msgstr ""
 
-#: src/lang.c:555
+#: src/lang.c:510
 msgid "newsgroups"
 msgstr ""
 
-#: src/lang.c:556
+#: src/lang.c:511
 #, c-format
 msgid "Position %s in group list (1,2,..,$) [%d]> "
 msgstr ""
 
-#: src/lang.c:557
+#: src/lang.c:512
 msgid "newsgroup"
 msgstr ""
 
-#: src/lang.c:558
+#: src/lang.c:513
 msgid "Try and save newsrc file again?"
 msgstr ""
 
-#: src/lang.c:559
+#: src/lang.c:514
 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted."
 msgstr ""
 
-#: src/lang.c:560
+#: src/lang.c:515
 msgid "newsrc file saved successfully.\n"
 msgstr ""
 
-#: src/lang.c:561
+#: src/lang.c:516
 msgid "-- Next response --"
 msgstr ""
 
-#: src/lang.c:562
+#: src/lang.c:517
 #, c-format
 msgid "NNTP authorization password not found for %s"
 msgstr ""
 
-#: src/lang.c:565 src/nntplib.c:966
-msgid "205  Closing connection"
-msgstr ""
-
-#: src/lang.c:566
-msgid "  -A       force authentication on connect"
-msgstr ""
-
-#: src/lang.c:567
-#, c-format
-msgid "  -g serv  read news from NNTP server serv [default=%s]"
-msgstr ""
-
-#: src/lang.c:568
-#, c-format
-msgid "  -p port  use port as NNTP port [default=%d]"
-msgstr ""
-
-#: src/lang.c:569
-msgid "  -Q       quick start. Same as -nqd"
-msgstr ""
-
-#: src/lang.c:570
-msgid "  -l       use only LIST instead of GROUP (-n) command"
-msgstr ""
-
-#: src/lang.c:571
-msgid "  -n       only read subscribed .newsrc groups from NNTP server"
-msgstr ""
-
-#: src/lang.c:573
-msgid "  -Q       quick start. Same as -qd"
-msgstr ""
-
-#: src/lang.c:574
-msgid "  -l       read only active file instead of scanning spool (-n) command"
-msgstr ""
-
-#: src/lang.c:575
-msgid "  -n       only read subscribed .newsrc groups from spool"
-msgstr ""
-
-#: src/lang.c:578
+#: src/lang.c:518
 msgid "No  "
 msgstr ""
 
-#: src/lang.c:579
+#: src/lang.c:519
 msgid "*** No articles ***"
 msgstr ""
 
-#: src/lang.c:580
+#: src/lang.c:520
 msgid "No articles have been posted"
 msgstr ""
 
-#: src/lang.c:583
-msgid "No command"
-msgstr ""
-
-#: src/lang.c:588
-msgid "Terminal does not support color"
-msgstr ""
-
-#: src/lang.c:592
+#: src/lang.c:521
 msgid "*** No description ***"
 msgstr ""
 
-#: src/lang.c:593
+#: src/lang.c:522
 msgid "No filename"
 msgstr ""
 
-#: src/lang.c:594
+#: src/lang.c:523
 msgid "No group"
 msgstr ""
 
-#: src/lang.c:595
+#: src/lang.c:524
 msgid "*** No groups ***"
 msgstr ""
 
-#: src/lang.c:596
+#: src/lang.c:525
 msgid "No more groups to read"
 msgstr ""
 
-#: src/lang.c:597
+#: src/lang.c:526
 msgid "No last message"
 msgstr ""
 
-#: src/lang.c:598
+#: src/lang.c:527
 msgid "No mail address"
 msgstr ""
 
-#: src/lang.c:599
+#: src/lang.c:528
 msgid "No articles marked for saving"
 msgstr ""
 
-#: src/lang.c:600
+#: src/lang.c:529
 msgid "No match"
 msgstr ""
 
-#: src/lang.c:601
+#: src/lang.c:530
 msgid "No more groups"
 msgstr ""
 
-#: src/lang.c:602
+#: src/lang.c:531
 msgid "No newsgroups"
 msgstr ""
 
-#: src/lang.c:603
+#: src/lang.c:532
 msgid "No next unread article"
 msgstr ""
 
-#: src/lang.c:604
+#: src/lang.c:533
 msgid "No previous group"
 msgstr ""
 
-#: src/lang.c:605
+#: src/lang.c:534
 msgid "No previous unread article"
 msgstr ""
 
-#: src/lang.c:606
+#: src/lang.c:535
 #, c-format
 msgid "No responses%s"
 msgstr ""
 
-#: src/lang.c:607
+#: src/lang.c:536
 msgid "No responses"
 msgstr ""
 
-#: src/lang.c:608
+#: src/lang.c:537
 msgid "No responses to list in current thread"
 msgstr ""
 
-#: src/lang.c:609
+#: src/lang.c:538
 msgid "No search string"
 msgstr ""
 
-#: src/lang.c:610
+#: src/lang.c:539
 msgid "No subject"
 msgstr ""
 
-#: src/lang.c:611
+#: src/lang.c:540
 #, c-format
 msgid "%s: Terminal must have clear to end-of-line (ce)\n"
 msgstr ""
 
-#: src/lang.c:612
+#: src/lang.c:541
 #, c-format
 msgid "%s: Terminal must have clear to end-of-screen (cd)\n"
 msgstr ""
 
-#: src/lang.c:613
+#: src/lang.c:542
 #, c-format
 msgid "%s: Terminal must have clearscreen (cl) capability\n"
 msgstr ""
 
-#: src/lang.c:614
+#: src/lang.c:543
 #, c-format
 msgid "%s: Terminal must have cursor motion (cm)\n"
 msgstr ""
 
-#: src/lang.c:615
+#: src/lang.c:544
 #, c-format
 msgid "%s: TERM variable must be set to use screen capabilities\n"
 msgstr ""
 
-#: src/lang.c:616
+#: src/lang.c:545
 #, c-format
 msgid "No viewer found for %s/%s\n"
 msgstr ""
 
-#: src/lang.c:617
-msgid ""
-"Your server does not support the NNTP XOVER or OVER command.\n"
-"Tin will use local index files instead.\n"
-msgstr ""
-
-#: src/lang.c:618
+#: src/lang.c:546
 msgid "Newsgroup does not exist on this server"
 msgstr ""
 
-#: src/lang.c:619
+#: src/lang.c:547
 #, c-format
 msgid "Group %s not found in active file"
 msgstr ""
 
-#: src/lang.c:620
+#: src/lang.c:548
 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr ""
 
-#: src/lang.c:621
+#: src/lang.c:549
 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: "
 msgstr ""
 
-#: src/lang.c:623
+#: src/lang.c:550
 #, c-format
 msgid ""
 "# NNTP-server -> newsrc translation table and NNTP-server\n"
@@ -2324,552 +2222,540 @@ msgid ""
 "#\n"
 msgstr ""
 
-#: src/lang.c:630
+#: src/lang.c:557
+msgid "Only"
+msgstr ""
+
+#: src/lang.c:558
 #, c-format
 msgid "Option not enabled. Recompile with %s."
 msgstr ""
 
-#: src/lang.c:631
+#: src/lang.c:559
 msgid "Options Menu"
 msgstr ""
 
-#: src/lang.c:634
+#: src/lang.c:562
 #, c-format
 msgid "Error in regex: %s at pos. %d '%s'"
 msgstr ""
 
-#: src/lang.c:635
+#: src/lang.c:563
 #, c-format
 msgid "Error in regex: pcre internal error %d"
 msgstr ""
 
-#: src/lang.c:636
+#: src/lang.c:564
 #, c-format
 msgid "Error in regex: study - pcre internal error %s"
 msgstr ""
 
-#: src/lang.c:639
-msgid "Add key(s) to public keyring?"
+#: src/lang.c:565
+msgid "Post a followup..."
 msgstr ""
 
-#: src/lang.c:640
-#, c-format
-msgid "%s=encrypt, %s=sign, %s=both, %s=quit: "
+#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone
+#: src/lang.c:567
+msgid ""
+"An error has occurred while posting the article. If you think that this\n"
+"error is temporary or otherwise correctable, you can postpone the article\n"
+"and pick it up again with ^O later.\n"
 msgstr ""
 
-#: src/lang.c:641
-#, c-format
-msgid "%s=sign, %s=sign & include public key, %s=quit: "
+#: src/lang.c:570
+msgid "Posted articles history"
 msgstr ""
 
-#: src/lang.c:642
+#: src/lang.c:571
 #, c-format
-msgid "PGP has not been set up (can't open %s)"
+msgid "Post to newsgroup(s) [%s]> "
 msgstr ""
 
-#: src/lang.c:643
-msgid "Article not signed and no public keys found"
+#: src/lang.c:572
+msgid "-- post processing started --"
 msgstr ""
 
-#: src/lang.c:647
-msgid "Pipe"
+#: src/lang.c:573
+msgid "-- post processing completed --"
 msgstr ""
 
-#: src/lang.c:648
+#: src/lang.c:574
 #, c-format
-msgid "Pipe to command [%.*s]> "
+msgid "Post subject [%s]> "
 msgstr ""
 
-#: src/lang.c:649
-msgid "Piping..."
+#: src/lang.c:575
+msgid ""
+"# Summary of mailed/posted messages viewable by 'W' command from within "
+"tin.\n"
 msgstr ""
 
-#: src/lang.c:651
-msgid "Piping not enabled."
-msgstr ""
-
-#: src/lang.c:654
-msgid "Post a followup..."
-msgstr ""
-
-#. TODO: replace hardcoded key-name in txt_post_error_ask_postpone
-#: src/lang.c:656
-msgid ""
-"An error has occurred while posting the article. If you think that this\n"
-"error is temporary or otherwise correctable, you can postpone the article\n"
-"and pick it up again with ^O later.\n"
-msgstr ""
-
-#: src/lang.c:659
-msgid "Posted articles history"
-msgstr ""
-
-#: src/lang.c:660
-#, c-format
-msgid "Post to newsgroup(s) [%s]> "
-msgstr ""
-
-#: src/lang.c:661
-msgid "-- post processing started --"
-msgstr ""
-
-#: src/lang.c:662
-msgid "-- post processing completed --"
-msgstr ""
-
-#: src/lang.c:663
-#, c-format
-msgid "Post subject [%s]> "
-msgstr ""
-
-#: src/lang.c:665
-msgid "Posting using external inews failed. Use built in inews instead?"
-msgstr ""
-
-#: src/lang.c:666
-msgid "It worked! Should I always use my built in inews from now on?"
-msgstr ""
-
-#: src/lang.c:668
-msgid ""
-"# Summary of mailed/posted messages viewable by 'W' command from within "
-"tin.\n"
-msgstr ""
-
-#: src/lang.c:669
+#: src/lang.c:576
 msgid "Posting article..."
 msgstr ""
 
-#: src/lang.c:670
+#: src/lang.c:577
 msgid "Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): "
 msgstr ""
 
-#: src/lang.c:671
+#: src/lang.c:578
 #, c-format
 msgid "Hot %s"
 msgstr ""
 
-#: src/lang.c:672
+#: src/lang.c:579
 #, c-format
 msgid "Tagged %s"
 msgstr ""
 
-#: src/lang.c:673
+#: src/lang.c:580
+msgid "Processing mail messages marked for deletion."
+msgstr ""
+
+#: src/lang.c:581
+msgid "Processing saved articles marked for deletion."
+msgstr ""
+
+#: src/lang.c:582
 #, c-format
 msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: "
 msgstr ""
 
-#: src/lang.c:674
+#: src/lang.c:583
 msgid "Article unchanged, abort mailing?"
 msgstr ""
 
-#: src/lang.c:675
+#: src/lang.c:584
 #, c-format
 msgid "Do you want to see postponed articles (%d)?"
 msgstr ""
 
-#: src/lang.c:676
+#: src/lang.c:586
 msgid "Add quick kill filter?"
 msgstr ""
 
-#: src/lang.c:677
+#: src/lang.c:587
 msgid "Add quick selection filter?"
 msgstr ""
 
-#: src/lang.c:678
+#: src/lang.c:588
 msgid "Do you really want to quit?"
 msgstr ""
 
-#: src/lang.c:679
+#: src/lang.c:589
 msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%.*s]: "
 msgstr ""
 
-#: src/lang.c:680
+#: src/lang.c:590
 msgid "You have tagged articles in this group - quit anyway?"
 msgstr ""
 
-#: src/lang.c:681
+#: src/lang.c:591
 #, c-format
 msgid "%s=quit, %s=edit, %s=postpone: "
 msgstr ""
 
-#: src/lang.c:682
+#: src/lang.c:592
 #, c-format
 msgid "%s=quit %s=edit %s=save kill description: "
 msgstr ""
 
-#: src/lang.c:683
+#: src/lang.c:593
 #, c-format
 msgid "%s=quit %s=edit %s=save select description: "
 msgstr ""
 
-#: src/lang.c:684
+#: src/lang.c:594
 msgid "Do you really want to quit without saving your configuration?"
 msgstr ""
 
-#: src/lang.c:686
+#: src/lang.c:597
 msgid "Invalid range - valid are '0-9.$' eg. 1-$"
 msgstr ""
 
-#: src/lang.c:687
+#: src/lang.c:598
 msgid "Do you want to abort this operation?"
 msgstr ""
 
-#: src/lang.c:688
+#: src/lang.c:599
 msgid "Do you want to exit tin immediately?"
 msgstr ""
 
-#: src/lang.c:689
+#: src/lang.c:600
 msgid "Read response> "
 msgstr ""
 
-#: src/lang.c:690
+#: src/lang.c:601
 msgid "Reading ('q' to quit)..."
 msgstr ""
 
-#: src/lang.c:691
+#: src/lang.c:602
 #, c-format
 msgid "Reading %sarticles..."
 msgstr ""
 
-#: src/lang.c:692
+#: src/lang.c:603
 #, c-format
 msgid "Reading %sattributes file...\n"
 msgstr ""
 
-#: src/lang.c:693
+#: src/lang.c:604
 #, c-format
 msgid "Reading %sconfig file...\n"
 msgstr ""
 
-#: src/lang.c:694
+#: src/lang.c:605
 msgid "Reading filter file...\n"
 msgstr ""
 
-#: src/lang.c:695
+#: src/lang.c:606
 #, c-format
 msgid "Reading %s groups..."
 msgstr ""
 
-#: src/lang.c:696
+#: src/lang.c:607
 msgid "Reading input history file...\n"
 msgstr ""
 
-#: src/lang.c:697
+#: src/lang.c:608
 msgid "Reading keymap file...\n"
 msgstr ""
 
-#: src/lang.c:699
-msgid "Reading mail active file... "
-msgstr ""
-
-#: src/lang.c:700
-msgid "Reading mailgroups file... "
-msgstr ""
-
-#: src/lang.c:702
+#: src/lang.c:609
 msgid "Reading groups from active file... "
 msgstr ""
 
-#: src/lang.c:703
+#: src/lang.c:610
 msgid "Reading groups from newsrc file... "
 msgstr ""
 
-#: src/lang.c:704
+#: src/lang.c:611
 msgid "Reading newsgroups file... "
 msgstr ""
 
-#: src/lang.c:705
+#: src/lang.c:612
 msgid "Reading newsrc file..."
 msgstr ""
 
-#: src/lang.c:706
-msgid "Connection to news server has timed out. Reconnect?"
-msgstr ""
-
-#: src/lang.c:707
+#: src/lang.c:613
 #, c-format
 msgid "Bogus group %s removed."
 msgstr ""
 
-#: src/lang.c:708
+#: src/lang.c:614
 #, c-format
 msgid "Error: rename %s to %s"
 msgstr ""
 
-#: src/lang.c:709
+#: src/lang.c:615
 msgid "Reply to author..."
 msgstr ""
 
-#: src/lang.c:710
+#: src/lang.c:616
 msgid "Repost"
 msgstr ""
 
-#: src/lang.c:711
+#: src/lang.c:617
 msgid "Reposting article..."
 msgstr ""
 
-#: src/lang.c:712
+#: src/lang.c:618
 #, c-format
 msgid "Repost article(s) to group(s) [%s]> "
 msgstr ""
 
-#: src/lang.c:713
+#: src/lang.c:619
 msgid "Reset newsrc?"
 msgstr ""
 
-#: src/lang.c:714
+#: src/lang.c:620
 msgid "Responses have been directed to the following newsgroups"
 msgstr ""
 
-#: src/lang.c:715
+#: src/lang.c:621
 #, c-format
 msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr ""
 
-#: src/lang.c:716
+#: src/lang.c:622
 #, c-format
-msgid "RespNo %3d of %3d%s"
+msgid "RespNo %4d of %4d%s"
 msgstr ""
 
-#: src/lang.c:717
+#: src/lang.c:623
 msgid "Press <RETURN> to continue..."
 msgstr ""
 
-#: src/lang.c:718
+#: src/lang.c:625
+#, c-format
+msgid "Select From    [%-*.*s] (y/n): "
+msgstr ""
+
+#: src/lang.c:626
+msgid "Select Lines: (</>num): "
+msgstr ""
+
+#: src/lang.c:627
+msgid "Auto-select Article Menu"
+msgstr ""
+
+#: src/lang.c:628
+#, c-format
+msgid "Select Msg-Id  [%-*.*s] (f/l/o/n): "
+msgstr ""
+
+#: src/lang.c:629
+msgid "Select pattern scope: "
+msgstr ""
+
+#: src/lang.c:630
+#, c-format
+msgid "Select Subject [%-*.*s] (y/n): "
+msgstr ""
+
+#: src/lang.c:631
+msgid "Select text pattern : "
+msgstr ""
+
+#: src/lang.c:632
+msgid "Select time in days   : "
+msgstr ""
+
+#: src/lang.c:633
+#, c-format
+msgid ""
+"# %s server configuration file\n"
+"# This file was automatically saved by %s %s %s (\"%s\")\n"
+"#\n"
+"# Do not edit while %s is running, since all your changes to this file\n"
+"# will be overwritten when you leave %s.\n"
+"# Do not edit at all if you don't know what you do.\n"
+"############################################################################"
+"\n"
+"\n"
+msgstr ""
+
+#: src/lang.c:639
+msgid "Showing unread groups only"
+msgstr ""
+
+#: src/lang.c:640
+msgid "Subject: line (ignore case)   "
+msgstr ""
+
+#: src/lang.c:641
+msgid "Subject: line (case sensitive)"
+msgstr ""
+
+#: src/lang.c:642
 msgid "Save"
 msgstr ""
 
-#: src/lang.c:719
+#: src/lang.c:643
 #, c-format
 msgid "Save '%s' (%s/%s)?"
 msgstr ""
 
-#: src/lang.c:720
+#: src/lang.c:644
 msgid "Save configuration before continuing?"
 msgstr ""
 
-#: src/lang.c:721
+#: src/lang.c:645
 msgid "Save filename> "
 msgstr ""
 
-#: src/lang.c:722
+#: src/lang.c:646
 msgid "Saved"
 msgstr ""
 
-#: src/lang.c:723
+#: src/lang.c:647
 #, c-format
 msgid "%4d unread (%4d hot) %s in %s\n"
 msgstr ""
 
-#: src/lang.c:724
+#: src/lang.c:648
 #, c-format
 msgid "Saved %s...\n"
 msgstr ""
 
-#: src/lang.c:725
+#: src/lang.c:649
 msgid "Nothing was saved"
 msgstr ""
 
-#: src/lang.c:726
+#: src/lang.c:650
 #, c-format
 msgid ""
 "\n"
 "%s %d %s from %d %s\n"
 msgstr ""
 
-#: src/lang.c:727
+#: src/lang.c:651
 #, c-format
 msgid "-- %s saved to %s%s --"
 msgstr ""
 
-#: src/lang.c:728
+#: src/lang.c:652
 #, c-format
 msgid "-- %s saved to %s - %s --"
 msgstr ""
 
-#: src/lang.c:729
+#: src/lang.c:653
 msgid "Saving..."
 msgstr ""
 
-#: src/lang.c:730
+#: src/lang.c:654
 #, c-format
 msgid "%s: Screen initialization failed"
 msgstr ""
 
-#: src/lang.c:731
+#: src/lang.c:655
 #, c-format
 msgid "%s: screen is too small\n"
 msgstr ""
 
-#: src/lang.c:732
+#: src/lang.c:656
 #, c-format
 msgid "screen is too small, %s is exiting\n"
 msgstr ""
 
-#: src/lang.c:733
+#: src/lang.c:657
 #, c-format
 msgid "Search backwards [%s]> "
 msgstr ""
 
-#: src/lang.c:734
+#: src/lang.c:658
 #, c-format
 msgid "Search body [%s]> "
 msgstr ""
 
-#: src/lang.c:735
+#: src/lang.c:659
 #, c-format
 msgid "Search forwards [%s]> "
 msgstr ""
 
-#: src/lang.c:736
+#: src/lang.c:660
 msgid "Searching..."
 msgstr ""
 
-#: src/lang.c:737
+#: src/lang.c:661
 #, c-format
 msgid "Searching article %d of %d ('q' to abort)..."
 msgstr ""
 
-#: src/lang.c:738
+#: src/lang.c:662
 msgid "Select article> "
 msgstr ""
 
-#: src/lang.c:739
+#: src/lang.c:663
 msgid ""
 "Select option number before text or use arrow keys and <CR>. 'q' to quit."
 msgstr ""
 
-#: src/lang.c:740
+#: src/lang.c:664
 msgid "Select group> "
 msgstr ""
 
-#: src/lang.c:741
+#: src/lang.c:665
 #, c-format
 msgid "Enter selection pattern [%s]> "
 msgstr ""
 
-#: src/lang.c:742
+#: src/lang.c:666
 msgid "Select thread > "
 msgstr ""
 
-#: src/lang.c:743
+#: src/lang.c:667
 #, c-format
 msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n"
 msgstr ""
 
-#: src/lang.c:744
-#, c-format
-msgid ""
-"Put the server name in the file %s,\n"
-"or set the environment variable NNTPSERVER"
-msgstr ""
-
-#: src/lang.c:745
+#: src/lang.c:668
 msgid "servers active-file"
 msgstr ""
 
-#: src/lang.c:747
-#, c-format
-msgid "Shell Command (%s)"
-msgstr ""
-
-#: src/lang.c:748
-#, c-format
-msgid "Enter shell command [%s]> "
-msgstr ""
-
-#: src/lang.c:750
+#: src/lang.c:669
 msgid "Cannot move into new newsgroups. Subscribe first..."
 msgstr ""
 
-#: src/lang.c:751
+#: src/lang.c:670
 msgid "<SPACE>"
 msgstr ""
 
-#: src/lang.c:752
+#: src/lang.c:671
 #, c-format
 msgid "Starting: (%s)"
 msgstr ""
 
-#: src/lang.c:753
+#: src/lang.c:672
 #, c-format
 msgid "List Thread (%d of %d)"
 msgstr ""
 
-#: src/lang.c:754
+#: src/lang.c:673
 #, c-format
 msgid "Thread (%.*s)"
 msgstr ""
 
-#: src/lang.c:755
+#: src/lang.c:674
 msgid "Enter wildcard subscribe pattern> "
 msgstr ""
 
-#: src/lang.c:756
+#: src/lang.c:675
 #, c-format
 msgid "subscribed to %d groups"
 msgstr ""
 
-#: src/lang.c:757
+#: src/lang.c:676
 #, c-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: src/lang.c:758
+#: src/lang.c:677
 msgid "Subscribing... "
 msgstr ""
 
-#: src/lang.c:759
+#: src/lang.c:678
 msgid "Repost or supersede article(s) [%%.*s]? (%s/%s/%s): "
 msgstr ""
 
-#: src/lang.c:760
+#: src/lang.c:679
 #, c-format
 msgid "Supersede article(s) to group(s) [%s]> "
 msgstr ""
 
-#: src/lang.c:761
+#: src/lang.c:680
 msgid "Superseding article ..."
 msgstr ""
 
-#: src/lang.c:762
+#: src/lang.c:681
 #, c-format
 msgid ""
 "\n"
 "Stopped. Type 'fg' to restart %s\n"
 msgstr ""
 
-#: src/lang.c:763
+#: src/lang.c:683
+#, c-format
+msgid "%d days"
+msgstr ""
+
+#: src/lang.c:684
 msgid "<TAB>"
 msgstr ""
 
-#: src/lang.c:764
+#: src/lang.c:685
 msgid "Tagged article"
 msgstr ""
 
-#: src/lang.c:765
+#: src/lang.c:686
 msgid "Tagged thread"
 msgstr ""
 
-#: src/lang.c:768
-msgid ""
-"# For color-adjust use the following numbers\n"
-"#  0-black       1-red         2-green        3-brown\n"
-"#  4-blue        5-pink        6-cyan         7-white\n"
-"# These are *only* for foreground:\n"
-"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
-"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
-"# A '-1' is interpreted as default (foreground normally is white, and\n"
-"# background black)\n"
-"\n"
-msgstr ""
-
-#: src/lang.c:778
+#: src/lang.c:687
 msgid "# Default action/prompt strings\n"
 msgstr ""
 
-#: src/lang.c:779
+#: src/lang.c:688
 msgid ""
 "# Defaults for quick (1 key) kill & auto-selection filters\n"
 "# header=NUM  0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n"
@@ -2880,811 +2766,891 @@ msgid ""
 "# expire=ON/OFF  ON=limit to default_filter_days OFF=don't ever expire\n"
 msgstr ""
 
-#: src/lang.c:794
+#: src/lang.c:701
 msgid ""
 "# If ON use print current subject or newsgroup description in the last line\n"
 msgstr ""
 
-#: src/lang.c:795
+#: src/lang.c:702
 msgid "# Host & time info used for detecting new groups (don't touch)\n"
 msgstr ""
 
-#: src/lang.c:796
-msgid "Enter wildcard unsubscribe pattern> "
+#: src/lang.c:703
+msgid "There is no news\n"
 msgstr ""
 
-#: src/lang.c:797
-#, c-format
-msgid "View '%s' (%s/%s)?"
+#: src/lang.c:704
+msgid "Thread"
 msgstr ""
 
-#.
-#. * Special value used to override option-list behavior
-#.
-#: src/lang.c:802 src/lang.c:866
-msgid "Default"
+#: src/lang.c:705
+msgid "Thread Level Commands"
 msgstr ""
 
-#: src/lang.c:814 src/lang.c:839 src/lang.c:855 src/refs.c:266
-msgid "None"
+#: src/lang.c:706
+msgid "Thread deselected"
 msgstr ""
 
-#: src/lang.c:815
-msgid "Subject"
+#: src/lang.c:707
+msgid "Thread selected"
 msgstr ""
 
-#: src/lang.c:816
-msgid "References"
+#: src/lang.c:708
+msgid "Thread range"
 msgstr ""
 
-#: src/lang.c:817
-msgid "Both Subject and References"
+#: src/lang.c:709
+#, c-format
+msgid "%sThread %4s of %4s"
 msgstr ""
 
-#: src/lang.c:818
-msgid "Multipart Subject"
+#: src/lang.c:710
+msgid "Threading articles..."
 msgstr ""
 
-#: src/lang.c:830 src/lang.c:941
-msgid "No"
+#: src/lang.c:711
+#, c-format
+msgid "Toggled word highlighting %s"
 msgstr ""
 
-#: src/lang.c:831 src/lang.c:943
-msgid "Yes"
+#: src/lang.c:712
+msgid "Toggled rot13 encoding"
 msgstr ""
 
-#: src/lang.c:832
-msgid "Hide All"
+#: src/lang.c:713
+#, c-format
+msgid "Toggled german TeX encoding %s"
 msgstr ""
 
-#: src/lang.c:840
-msgid "Address"
+#: src/lang.c:714
+#, c-format
+msgid "Toggled tab-width to %d"
 msgstr ""
 
-#: src/lang.c:841
-msgid "Full Name"
+#: src/lang.c:715
+#, c-format
+msgid "%d Trying to dotlock %s"
 msgstr ""
 
-#: src/lang.c:842
-msgid "Address and Name"
+#: src/lang.c:716
+#, c-format
+msgid "%d Trying to lock %s"
 msgstr ""
 
-#: src/lang.c:849
-msgid "Max"
+#: src/lang.c:717
+msgid "           h=help\n"
 msgstr ""
 
-#: src/lang.c:850
-msgid "Sum"
+#: src/lang.c:719
+msgid "Unlimited"
 msgstr ""
 
-#: src/lang.c:851
-msgid "Average"
+#: src/lang.c:720
+msgid "Enter wildcard unsubscribe pattern> "
 msgstr ""
 
-#: src/lang.c:856
-msgid "Lines"
+#: src/lang.c:721
+#, c-format
+msgid "Error decoding %s : %s"
 msgstr ""
 
-#: src/lang.c:857
-msgid "Score"
+#: src/lang.c:722
+msgid "No end."
 msgstr ""
 
-#: src/lang.c:858
-msgid "Lines & Score"
+#: src/lang.c:723
+#, c-format
+msgid "%s successfully decoded."
 msgstr ""
 
-#: src/lang.c:867
-msgid "Black"
+#: src/lang.c:724
+#, c-format
+msgid ""
+"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n"
+"\n"
 msgstr ""
 
-#: src/lang.c:868
-msgid "Red"
+#: src/lang.c:725
+msgid "unread "
 msgstr ""
 
-#: src/lang.c:869
-msgid "Green"
+#: src/lang.c:726
+#, c-format
+msgid "unsubscribed from %d groups"
 msgstr ""
 
-#: src/lang.c:870
-msgid "Brown"
+#: src/lang.c:727
+#, c-format
+msgid "Unsubscribed from %s"
 msgstr ""
 
-#: src/lang.c:871
-msgid "Blue"
+#: src/lang.c:728
+msgid "Unsubscribing... "
 msgstr ""
 
-#: src/lang.c:872
-msgid "Pink"
+#: src/lang.c:729
+msgid "Untagged article"
 msgstr ""
 
-#: src/lang.c:873
-msgid "Cyan"
+#: src/lang.c:730
+msgid "Untagged thread"
 msgstr ""
 
-#: src/lang.c:874
-msgid "White"
+#: src/lang.c:731
+msgid "Unthreading articles..."
 msgstr ""
 
-#: src/lang.c:875
-msgid "Gray"
+#: src/lang.c:732
+msgid "Updated"
 msgstr ""
 
-#: src/lang.c:876
-msgid "Light Red"
+#: src/lang.c:733
+msgid "Updating"
 msgstr ""
 
-#: src/lang.c:877
-msgid "Light Green"
+#: src/lang.c:734
+#, c-format
+msgid "Opening %s\n"
 msgstr ""
 
-#: src/lang.c:878
-msgid "Yellow"
+#: src/lang.c:735
+msgid "No more URL's in this article"
 msgstr ""
 
-#: src/lang.c:879
-msgid "Light Blue"
+#: src/lang.c:736
+msgid "Use MIME display program for this message?"
 msgstr ""
 
-#: src/lang.c:880
-msgid "Light Pink"
+#: src/lang.c:737
+msgid "  -c       mark all news as read in subscribed newsgroups (batch mode)"
 msgstr ""
 
-#: src/lang.c:881
-msgid "Light Cyan"
+#: src/lang.c:738
+msgid "  -Z       return status indicating if any unread news (batch mode)"
 msgstr ""
 
-#: src/lang.c:882
-msgid "Light White"
+#: src/lang.c:739
+msgid "  -q       don't check for new newsgroups"
 msgstr ""
 
-#: src/lang.c:890 src/lang.c:947 src/lang.c:961
-msgid "Nothing"
+#: src/lang.c:740
+msgid "  -X       don't save any files on quit"
 msgstr ""
 
-#: src/lang.c:891
-msgid "Mark"
+#: src/lang.c:741
+msgid "  -d       don't show newsgroup descriptions"
 msgstr ""
 
-#: src/lang.c:892
-msgid "Space"
+#: src/lang.c:742
+msgid "  -G limit get only limit articles/group"
 msgstr ""
 
-#: src/lang.c:899
-msgid "Normal"
+#: src/lang.c:743
+#, c-format
+msgid "  -H       help information about %s"
 msgstr ""
 
-#: src/lang.c:900
-msgid "Best highlighting"
+#: src/lang.c:744
+msgid "  -h       this help message"
 msgstr ""
 
-#: src/lang.c:901
-msgid "Underline"
+#: src/lang.c:745
+#, c-format
+msgid "  -I dir   news index file directory [default=%s]"
 msgstr ""
 
-#: src/lang.c:902
-msgid "Reverse video"
+#: src/lang.c:746
+msgid "  -u       update index files (batch mode)"
 msgstr ""
 
-#: src/lang.c:903
-msgid "Blinking"
+#: src/lang.c:747
+#, c-format
+msgid "  -m dir   mailbox directory [default=%s]"
 msgstr ""
 
-#: src/lang.c:904
-msgid "Half bright"
+#: src/lang.c:748
+#, c-format
+msgid ""
+"\n"
+"Mail bug reports/comments to %s"
 msgstr ""
 
-#: src/lang.c:905
-msgid "Bold"
+#: src/lang.c:749
+msgid "  -N       mail new news to your posts (batch mode)"
 msgstr ""
 
-#: src/lang.c:910
-msgid "none"
+#: src/lang.c:750
+msgid "  -M user  mail new news to specified user (batch mode)"
 msgstr ""
 
-#: src/lang.c:911
-msgid "commands"
+#: src/lang.c:751
+#, c-format
+msgid "  -f file  subscribed to newsgroups file [default=%s]"
 msgstr ""
 
-#: src/lang.c:912
-msgid "select"
+#: src/lang.c:752
+msgid "  -w       post an article and exit"
 msgstr ""
 
-#: src/lang.c:914
-msgid "commands & quit"
+#: src/lang.c:753
+msgid "  -o       post all postponed articles and exit"
 msgstr ""
 
-#: src/lang.c:915
-msgid "commands & select"
+#: src/lang.c:754
+msgid "  -r       read news remotely from default NNTP server"
 msgstr ""
 
-#: src/lang.c:916
-msgid "quit & select"
+#: src/lang.c:755
+msgid "  -R       read news saved by -S option"
 msgstr ""
 
-#: src/lang.c:917
-msgid "commands & quit & select"
+#: src/lang.c:756
+#, c-format
+msgid "  -s dir   save news directory [default=%s]"
 msgstr ""
 
-#: src/lang.c:942
-msgid "Shell archive"
+#: src/lang.c:757
+msgid "  -S       save new news for later reading (batch mode)"
 msgstr ""
 
-#: src/lang.c:948
-msgid "Subject: (descending)"
+#: src/lang.c:758
+msgid "  -z       start if any unread news"
 msgstr ""
 
-#: src/lang.c:949
-msgid "Subject: (ascending)"
+#: src/lang.c:759
+#, c-format
+msgid ""
+"A Usenet reader.\n"
+"\n"
+"Usage: %s [options] [newsgroup[,...]]"
 msgstr ""
 
-#: src/lang.c:950
-msgid "From: (descending)"
-msgstr ""
-
-#: src/lang.c:951
-msgid "From: (ascending)"
+#: src/lang.c:760
+msgid "  -v       verbose output for batch mode options"
 msgstr ""
 
-#: src/lang.c:952
-msgid "Date: (descending)"
+#: src/lang.c:761
+msgid "  -V       print version & date information"
 msgstr ""
 
-#: src/lang.c:953
-msgid "Date: (ascending)"
+#: src/lang.c:762
+#, c-format
+msgid "%s only useful without batch mode operations\n"
 msgstr ""
 
-#: src/lang.c:954 src/lang.c:962
-msgid "Score (descending)"
+#: src/lang.c:763
+#, c-format
+msgid "%s only useful for batch mode operations\n"
 msgstr ""
 
-#: src/lang.c:955 src/lang.c:963
-msgid "Score (ascending)"
+#: src/lang.c:765
+#, c-format
+msgid ""
+"\n"
+"%s%d out of range (0 - %d). Reset to 0"
 msgstr ""
 
-#: src/lang.c:956
-msgid "Lines: (descending)"
+#: src/lang.c:766
+#, c-format
+msgid "View '%s' (%s/%s)?"
 msgstr ""
 
-#: src/lang.c:957
-msgid "Lines: (ascending)"
+#: src/lang.c:768
+#, c-format
+msgid ""
+"\n"
+"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
+"%-100s\n"
 msgstr ""
 
-#: src/lang.c:968
-msgid "Always Keep"
+#: src/lang.c:769
+msgid ""
+"\n"
+"Warning: article unchanged after editing\n"
 msgstr ""
 
-#: src/lang.c:969
-msgid "Always Remove"
+#: src/lang.c:770
+msgid ""
+"\n"
+"Warning: \"Subject:\" contains only whitespaces.\n"
 msgstr ""
 
-#: src/lang.c:970
-msgid "Mark with D on selection screen"
+#: src/lang.c:771
+msgid ""
+"\n"
+"Warning: \"Subject:\" begins with \"Re: \" but there are no "
+"\"References:\".\n"
 msgstr ""
 
-#: src/lang.c:975
-msgid "Kill only unread arts"
+#: src/lang.c:773
+msgid ""
+"\n"
+"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
+"         with \"Re: \" and does not contain \"(was:\".\n"
 msgstr ""
 
-#: src/lang.c:976
-msgid "Kill all arts & show with K"
+#: src/lang.c:776
+msgid ""
+"Read carefully!\n"
+"\n"
+"  You are about to cancel an article seemingly written by you. This will "
+"wipe\n"
+"  the article from most  news servers  throughout the world,  but there is "
+"no\n"
+"  guarantee that it will work.\n"
+"\n"
+"This is the article you are about to cancel:\n"
+"\n"
 msgstr ""
 
-#: src/lang.c:977
-msgid "Kill all arts and never show"
+#: src/lang.c:780
+msgid ""
+"\n"
+"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
+"         quoted-printable) and an external inews program to submit your\n"
+"         article. If a signature is appended by that inews program it will\n"
+"         not be encoded properly.\n"
 msgstr ""
 
-#: src/lang.c:982
-msgid "Nothing special"
+#: src/lang.c:785
+#, c-format
+msgid ""
+"\n"
+"\n"
+"You are upgrading to tin %s from an earlier version.\n"
+"Some values in your %s file have changed!\n"
+"Read WHATSNEW, etc...\n"
 msgstr ""
 
-#: src/lang.c:983
-msgid "Compress quotes"
+#: src/lang.c:787
+#, c-format
+msgid ""
+"\n"
+"\n"
+"You are downgrading to tin %s from a more recent version!\n"
+"Some values in your %s file may be ignored, others might have changed!\n"
 msgstr ""
 
-#: src/lang.c:984
-msgid "Quote signatures"
+#: src/lang.c:790
+#, c-format
+msgid ""
+"Warning: tin wrote fewer groups to your\n"
+"\t%s\n"
+"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
+"this session this indicates an error and you should backup your %s\n"
+"before you start tin once again!\n"
 msgstr ""
 
-#: src/lang.c:985
-msgid "Compress quotes, quote sigs"
+#: src/lang.c:794
+#, c-format
+msgid ""
+"\n"
+"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
 msgstr ""
 
-#: src/lang.c:986
-msgid "Quote empty lines"
+#: src/lang.c:795
+#, c-format
+msgid "Warning: Only %d out of %d articles were saved"
 msgstr ""
 
-#: src/lang.c:987
-msgid "Compress quotes, quote empty lines"
+#: src/lang.c:796
+#, c-format
+msgid ""
+"\n"
+"Warning: Your signature  is longer than %d lines.  Since signatures usually "
+"do\n"
+"         not  transport any  useful information,  they should be as  short "
+"as\n"
+"         possible.\n"
 msgstr ""
 
-#: src/lang.c:988
-msgid "Quote sigs & empty lines"
+#: src/lang.c:800
+#, c-format
+msgid ""
+"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
 msgstr ""
 
-#: src/lang.c:989
-msgid "Comp. q., quote sigs & empty lines"
+#: src/lang.c:801
+msgid ""
+"\n"
+"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
 msgstr ""
 
-#: src/lang.c:1026
-msgid "Print"
+#: src/lang.c:802
+msgid "Writing attributes file..."
 msgstr ""
 
-#: src/lang.c:1027
-msgid "Printing..."
+#: src/lang.c:804
+#, c-format
+msgid "%d Responses%s"
 msgstr ""
 
-#: src/lang.c:1032
+#: src/lang.c:806
 #, c-format
-msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
+msgid "Added %d %s"
 msgstr ""
 
-#: src/lang.c:1033
-msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
+#: src/lang.c:807
+msgid "No unsubscribed groups to show"
 msgstr ""
 
-#: src/lang.c:1034
-msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=post, %s=postpone [%%.*s]: "
+#: src/lang.c:808
+msgid "Showing subscribed to groups only"
 msgstr ""
 
-#: src/lang.c:1036
-#, c-format
-msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
+#: src/lang.c:809
+msgid "Yes "
 msgstr ""
 
-#: src/lang.c:1037
-msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
+#: src/lang.c:810
+msgid "    You have mail\n"
 msgstr ""
 
-#: src/lang.c:1038
-msgid "%s=quit, %s=edit, %s=pgp, %s=post, %s=postpone [%%.*s]: "
+#: src/lang.c:815
+#, c-format
+msgid ""
+"\n"
+"Warning: Posting is in %s and contains characters which are not\n"
+"         in your selected MM_NETWORK_CHARSET: %s.\n"
+"         These characters will be replaced by '?' if you post this\n"
+"         article unchanged. To avoid garbling your article please either\n"
+"         edit it and remove those characters or change the setting of\n"
+"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
+"         M)enu option.\n"
 msgstr ""
 
-#: src/lang.c:1042
+#: src/lang.c:826
 #, c-format
-msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
+msgid "Redefined key %s '%s' -> '%s'\n"
 msgstr ""
 
-#: src/lang.c:1043
-msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
+#: src/lang.c:827
+msgid "  -D       debug mode 1=NNTP 2=ALL"
 msgstr ""
 
-#: src/lang.c:1044
-msgid "%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: "
+#: src/lang.c:831
+msgid ""
+"Read carefully!\n"
+"\n"
+"  You are about to cancel an article seemingly not written by you.  This "
+"will\n"
+"  wipe the article from lots of news servers throughout the world;\n"
+"  Usenet's majority  considers this  rather inappropriate,  to say the "
+"least.\n"
+"  Only press 'd'  if you are  absolutely positive  that you are ready to "
+"take\n"
+"  the rap.\n"
+"\n"
+"This is the article you are about to cancel:\n"
+"\n"
 msgstr ""
 
-#: src/lang.c:1046
-#, c-format
-msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
+#: src/lang.c:840
+msgid "toggle color"
 msgstr ""
 
-#: src/lang.c:1047
-msgid "%s=quit, %s=edit, %s=send [%%.*s]: "
+#: src/lang.c:841
+msgid ""
+"# For color-adjust use the following numbers\n"
+"#  0-black       1-red         2-green        3-brown\n"
+"#  4-blue        5-pink        6-cyan         7-white\n"
+"# These are *only* for foreground:\n"
+"#  8-gray        9-lightred   10-lightgreen  11-yellow\n"
+"# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n"
+"# A '-1' is interpreted as default (foreground normally is white, and\n"
+"# background black)\n"
+"\n"
 msgstr ""
 
-#: src/lang.c:1048
-msgid "%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: "
+#: src/lang.c:849
+msgid "  -a       toggle color flag"
 msgstr ""
 
-#: src/lang.c:1052
-#, c-format
-msgid " at %s"
+#: src/lang.c:853
+msgid ""
+"\n"
+"Error: Followup-To set to more than one newsgroup!\n"
 msgstr ""
 
-#: src/lang.c:1053
-msgid "There is no news\n"
+#: src/lang.c:854
+#, c-format
+msgid ""
+"\n"
+"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
 msgstr ""
 
-#: src/lang.c:1054
-msgid "Thread"
+#: src/lang.c:855
+#, c-format
+msgid ""
+"\n"
+"Error: \"%s\" is not a valid newsgroup!\n"
 msgstr ""
 
-#: src/lang.c:1055
-msgid "Thread Level Commands"
+#: src/lang.c:857
+msgid ""
+"\n"
+"Warning: Followup-To set to more than one newsgroup!\n"
 msgstr ""
 
-#: src/lang.c:1056
-msgid "Thread deselected"
+#: src/lang.c:858
+#, c-format
+msgid ""
+"\n"
+"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
 msgstr ""
 
-#: src/lang.c:1057
-msgid "Thread selected"
+#: src/lang.c:859
+#, c-format
+msgid ""
+"\n"
+"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
 msgstr ""
 
-#: src/lang.c:1058
-msgid "Thread range"
+#: src/lang.c:860
+#, c-format
+msgid ""
+"\n"
+"Warning: \"%s\" is not a valid newsgroup at this site!\n"
 msgstr ""
 
-#: src/lang.c:1059
+#: src/lang.c:864
 #, c-format
-msgid "%sThread %4s of %4s"
+msgid "%d files successfully written from %d articles. %d %s occurred."
 msgstr ""
 
-#: src/lang.c:1060
-msgid "Threading articles..."
+#: src/lang.c:865
+msgid "Missing parts."
 msgstr ""
 
-#: src/lang.c:1061
-#, c-format
-msgid "Toggled word highlighting %s"
+#: src/lang.c:866
+msgid "No beginning."
 msgstr ""
 
-#: src/lang.c:1062
-msgid "Toggled rot13 encoding"
+#: src/lang.c:867
+msgid "No data."
 msgstr ""
 
-#: src/lang.c:1063
-#, c-format
-msgid "Toggled german TeX encoding %s"
+#: src/lang.c:868
+msgid "Unknown error."
 msgstr ""
 
-#: src/lang.c:1064
+#: src/lang.c:870
 #, c-format
-msgid "Toggled tab-width to %d"
+msgid "\tChecksum of %s (%ld %s)"
 msgstr ""
 
-#: src/lang.c:1065
-#, c-format
-msgid "Trying %s"
+#: src/lang.c:874
+msgid "Reading mail active file... "
 msgstr ""
 
-#: src/lang.c:1066
-#, c-format
-msgid "%d Trying to dotlock %s"
+#: src/lang.c:875
+msgid "Reading mailgroups file... "
 msgstr ""
 
-#: src/lang.c:1067
-#, c-format
-msgid "%d Trying to lock %s"
+#: src/lang.c:879
+msgid "perform PGP operations on article"
 msgstr ""
 
-#: src/lang.c:1068
-msgid "           h=help\n"
+#: src/lang.c:880
+msgid "Add key(s) to public keyring?"
 msgstr ""
 
-#: src/lang.c:1069
-msgid "unread "
+#: src/lang.c:881
+#, c-format
+msgid "%s=encrypt, %s=sign, %s=both, %s=quit: "
 msgstr ""
 
-#: src/lang.c:1070
+#: src/lang.c:882
 #, c-format
-msgid "unsubscribed from %d groups"
+msgid "%s=sign, %s=sign & include public key, %s=quit: "
 msgstr ""
 
-#: src/lang.c:1071
+#: src/lang.c:883
 #, c-format
-msgid "Unsubscribed from %s"
+msgid "PGP has not been set up (can't open %s)"
 msgstr ""
 
-#: src/lang.c:1072
-msgid "Unsubscribing... "
+#: src/lang.c:884
+msgid "Article not signed and no public keys found"
 msgstr ""
 
-#: src/lang.c:1073
-msgid "Untagged article"
+#: src/lang.c:886
+#, c-format
+msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: "
 msgstr ""
 
-#: src/lang.c:1074
-msgid "Untagged thread"
+#: src/lang.c:887
+msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: "
 msgstr ""
 
-#: src/lang.c:1075
-msgid "Unthreading articles..."
+#: src/lang.c:888
+msgid ""
+"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
 msgstr ""
 
-#: src/lang.c:1076
-msgid "Updated"
+#: src/lang.c:890
+#, c-format
+msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: "
 msgstr ""
 
-#: src/lang.c:1077
-msgid "Updating"
+#: src/lang.c:891
+msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: "
 msgstr ""
 
-#: src/lang.c:1078
+#: src/lang.c:892
+msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: "
+msgstr ""
+
+#: src/lang.c:896
 #, c-format
-msgid "Opening %s\n"
+msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: "
 msgstr ""
 
-#: src/lang.c:1079
-msgid "No more URL's in this article"
+#: src/lang.c:897
+msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: "
 msgstr ""
 
-#: src/lang.c:1080
-msgid "Use MIME display program for this message?"
+#: src/lang.c:898
+msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%.*s]: "
 msgstr ""
 
-#: src/lang.c:1081
-msgid "  -c       mark all news as read in subscribed newsgroups (batch mode)"
+#: src/lang.c:900
+#, c-format
+msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: "
 msgstr ""
 
-#: src/lang.c:1082
-msgid "  -Z       return status indicating if any unread news (batch mode)"
+#: src/lang.c:901
+msgid "%s=quit, %s=edit, %s=send [%%.*s]: "
 msgstr ""
 
-#: src/lang.c:1083
-msgid "  -q       don't check for new newsgroups"
+#: src/lang.c:902
+msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: "
 msgstr ""
 
-#: src/lang.c:1084
-msgid "  -X       don't save any files on quit"
+#: src/lang.c:908
+#, c-format
+msgid "Environment variable %s not found. Set and retry..."
 msgstr ""
 
-#: src/lang.c:1085
-msgid "  -d       don't show newsgroup descriptions"
+#: src/lang.c:909
+msgid "  -B       BBS mode. File operations limited to home directories."
 msgstr ""
 
-#: src/lang.c:1086
-msgid "  -G limit get only limit articles/group"
+#: src/lang.c:917
+msgid "Try cache_overview_files to speed up things.\n"
 msgstr ""
 
-#: src/lang.c:1087
-#, c-format
-msgid "  -H       help information about %s"
+#: src/lang.c:918
+msgid "Tin will use local index files instead.\n"
 msgstr ""
 
-#: src/lang.c:1088
-msgid "  -h       this help message"
+#: src/lang.c:919
+msgid "Cannot find NNTP server name"
 msgstr ""
 
-#: src/lang.c:1089
+#: src/lang.c:920
 #, c-format
-msgid "  -I dir   news index file directory [default=%s]"
+msgid "Connecting to %s:%d..."
 msgstr ""
 
-#: src/lang.c:1090
-msgid "  -u       update index files (batch mode)"
+#: src/lang.c:921
+msgid "Disconnecting from server...\n"
 msgstr ""
 
-#: src/lang.c:1091
+#: src/lang.c:922
 #, c-format
-msgid "  -m dir   mailbox directory [default=%s]"
+msgid "Wrong newsgroup name in response of GROUP command, %s for %s"
 msgstr ""
 
-#: src/lang.c:1092
+#: src/lang.c:923
 #, c-format
-msgid ""
-"\n"
-"Mail bug reports/comments to %s"
+msgid "Failed to connect to NNTP server %s. Exiting..."
 msgstr ""
 
-#: src/lang.c:1093
-msgid "  -N       mail new news to your posts (batch mode)"
+#: src/lang.c:924 src/nntplib.c:975
+msgid "205  Closing connection"
 msgstr ""
 
-#: src/lang.c:1094
-msgid "  -M user  mail new news to specified user (batch mode)"
+#: src/lang.c:925
+msgid "Your server does not support the NNTP XOVER or OVER command.\n"
 msgstr ""
 
-#: src/lang.c:1095
+#: src/lang.c:926
+msgid "Connection to news server has timed out. Reconnect?"
+msgstr ""
+
+#: src/lang.c:927
 #, c-format
-msgid "  -f file  subscribed to newsgroups file [default=%s]"
+msgid ""
+"Put the server name in the file %s,\n"
+"or set the environment variable NNTPSERVER"
 msgstr ""
 
-#: src/lang.c:1096
-msgid "  -w       post an article and exit"
+#: src/lang.c:928
+msgid "  -A       force authentication on connect"
 msgstr ""
 
-#: src/lang.c:1097
-msgid "  -o       post all postponed articles and exit"
+#: src/lang.c:929
+#, c-format
+msgid "  -g serv  read news from NNTP server serv [default=%s]"
 msgstr ""
 
-#: src/lang.c:1098
-msgid "  -r       read news remotely from default NNTP server"
+#: src/lang.c:930
+#, c-format
+msgid "  -p port  use port as NNTP port [default=%d]"
 msgstr ""
 
-#: src/lang.c:1099
-msgid "  -R       read news saved by -S option"
+#: src/lang.c:931
+msgid "  -Q       quick start. Same as -nqd"
 msgstr ""
 
-#: src/lang.c:1100
-#, c-format
-msgid "  -s dir   save news directory [default=%s]"
+#: src/lang.c:932
+msgid "  -l       use only LIST instead of GROUP (-n) command"
 msgstr ""
 
-#: src/lang.c:1101
-msgid "  -S       save new news for later reading (batch mode)"
+#: src/lang.c:933
+msgid "  -n       only read subscribed .newsrc groups from NNTP server"
 msgstr ""
 
-#: src/lang.c:1102
-msgid "  -z       start if any unread news"
+#: src/lang.c:935
+#, c-format
+msgid "%s/tcp: Unknown service.\n"
 msgstr ""
 
-#: src/lang.c:1103
+#: src/lang.c:938
+msgid ""
+"\n"
+"socket or connect problem\n"
+msgstr ""
+
+#: src/lang.c:940
 #, c-format
 msgid ""
-"A Usenet reader.\n"
 "\n"
-"Usage: %s [options] [newsgroup[,...]]"
+"Connection to %s: "
 msgstr ""
 
-#: src/lang.c:1105
-msgid "  -a       toggle color flag"
+#: src/lang.c:941
+msgid "Giving up...\n"
 msgstr ""
 
-#: src/lang.c:1107
-msgid "  -v       verbose output for batch mode options"
+#: src/lang.c:944
+msgid ""
+"Your server does not have Xref: in its XOVER information.\n"
+"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
 msgstr ""
 
-#: src/lang.c:1108
-msgid "  -V       print version & date information"
+#: src/lang.c:947
+msgid "Your server does not have Xref: in its XOVER information.\n"
 msgstr ""
 
-#: src/lang.c:1109
+#: src/lang.c:950
 #, c-format
-msgid "%s only useful without batch mode operations\n"
+msgid "Can't open %s. Try %s -r to read news via NNTP.\n"
 msgstr ""
 
-#: src/lang.c:1110
-#, c-format
-msgid "%s only useful for batch mode operations\n"
+#: src/lang.c:953
+msgid "  -Q       quick start. Same as -qd"
 msgstr ""
 
-#: src/lang.c:1111
-#, c-format
-msgid ""
-"\n"
-"%s%d out of range (0 - %d). Reset to 0"
+#: src/lang.c:954
+msgid "  -l       read only active file instead of scanning spool (-n) command"
 msgstr ""
 
-#: src/lang.c:1112
-#, c-format
-msgid ""
-"\n"
-"Warning: posting exceeds %d columns. Line %d is the first long one:\n"
-"%-100s\n"
+#: src/lang.c:955
+msgid "  -n       only read subscribed .newsrc groups from spool"
 msgstr ""
 
-#: src/lang.c:1113
-msgid ""
-"\n"
-"Warning: article unchanged after editing\n"
+#: src/lang.c:956
+msgid "Your server does not have Xref: in its NOV-files.\n"
 msgstr ""
 
-#: src/lang.c:1114
-msgid ""
-"\n"
-"Warning: \"Subject:\" contains only whitespaces.\n"
+#: src/lang.c:960
+msgid "Posting using external inews failed. Use built in inews instead?"
 msgstr ""
 
-#: src/lang.c:1116
-#, c-format
-msgid ""
-"\n"
-"Warning: Posting is in %s and contains characters which are not\n"
-"         in your selected MM_NETWORK_CHARSET: %s.\n"
-"         These characters will be replaced by '?' if you post this\n"
-"         article unchanged. To avoid garbling your article please either\n"
-"         edit it and remove those characters or change the setting of\n"
-"         MM_NETWORK_CHARSET to a suitable value for your posting via the\n"
-"         M)enu option.\n"
+#: src/lang.c:961
+msgid "It worked! Should I always use my built in inews from now on?"
 msgstr ""
 
-#: src/lang.c:1125
-msgid ""
-"\n"
-"Warning: \"Subject:\" begins with \"Re: \" but there are no "
-"\"References:\".\n"
+#: src/lang.c:969
+#, c-format
+msgid "%d %s printed"
 msgstr ""
 
-#: src/lang.c:1127
-msgid ""
-"\n"
-"Warning: Article has \"References:\" but \"Subject:\" does not begin\n"
-"         with \"Re: \" and does not contain \"(was:\".\n"
+#: src/lang.c:970
+msgid "output article/thread/hot/pattern/tagged articles to printer"
 msgstr ""
 
-#: src/lang.c:1130
-msgid ""
-"Read carefully!\n"
-"\n"
-"  You are about to cancel an article seemingly written by you. This will "
-"wipe\n"
-"  the article from most  news servers  throughout the world,  but there is "
-"no\n"
-"  guarantee that it will work.\n"
-"\n"
-"This is the article you are about to cancel:\n"
-"\n"
+#: src/lang.c:971
+msgid "Print"
 msgstr ""
 
-#: src/lang.c:1134
-msgid ""
-"\n"
-"Warning: You are using a non-plain transfer encoding (such as base64 or\n"
-"         quoted-printable) and an external inews program to submit your\n"
-"         article. If a signature is appended by that inews program it will\n"
-"         not be encoded properly.\n"
+#: src/lang.c:972
+msgid "Printing..."
 msgstr ""
 
-#: src/lang.c:1141
-#, c-format
-msgid ""
-"\n"
-"Warning: The \"%s:\" line is continued in the next line.\n"
-"         This is a very new feature and may not be accepted by all servers.\n"
-"         To avoid trouble please write all newsgroups into a single line.\n"
+#: src/lang.c:976
+msgid "pipe article/thread/hot/pattern/tagged articles into command"
 msgstr ""
 
-#: src/lang.c:1145
-#, c-format
-msgid ""
-"\n"
-"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
+#: src/lang.c:977
+msgid "No command"
 msgstr ""
 
-#: src/lang.c:1149
-#, c-format
-msgid ""
-"\n"
-"\n"
-"You are upgrading to tin %s from an earlier version.\n"
-"Some values in your %s file have changed!\n"
-"Read WHATSNEW, etc...\n"
+#: src/lang.c:978
+msgid "Pipe"
 msgstr ""
 
-#: src/lang.c:1152
+#: src/lang.c:979
 #, c-format
-msgid ""
-"\n"
-"\n"
-"You are downgrading to tin %s from a more recent version!\n"
-"Some values in your %s file may be ignored, others might have changed!\n"
+msgid "Pipe to command [%.*s]> "
 msgstr ""
 
-#: src/lang.c:1157
-#, c-format
-msgid ""
-"Warning: tin wrote fewer groups to your\n"
-"\t%s\n"
-"than it read at startup. If you didn't unsubscribe from %ld %s during\n"
-"this session this indicates an error and you should backup your %s\n"
-"before you start tin once again!\n"
+#: src/lang.c:980
+msgid "Piping..."
 msgstr ""
 
-#: src/lang.c:1163
-msgid ""
-"Read carefully!\n"
-"\n"
-"  You are about to cancel an article seemingly not written by you.  This "
-"will\n"
-"  wipe the article from lots of news servers throughout the world;\n"
-"  Usenet's majority  considers this  rather inappropriate,  to say the "
-"least.\n"
-"  Only press 'd'  if you are  absolutely positive  that you are ready to "
-"take\n"
-"  the rap.\n"
-"\n"
-"This is the article you are about to cancel:\n"
-"\n"
+#: src/lang.c:982
+msgid "Piping not enabled."
 msgstr ""
 
-#: src/lang.c:1172
+#: src/lang.c:986
+#, c-format
 msgid ""
 "\n"
-"Warning: Followup-To set to more than one newsgroup!\n"
+"Error: The \"%s:\" line has spaces  in it that MUST be removed.\n"
+"       The only allowable  space is the one  separating the colon (:)\n"
+"       from  the  contents.  Use a  comma  (,)  to separate  multiple\n"
+"       newsgroup names.\n"
 msgstr ""
 
-#: src/lang.c:1173
+#: src/lang.c:991
 #, c-format
 msgid ""
 "\n"
-"Warning: cross-posting to %d newsgroups and no Followup-To line!\n"
+"Error: The \"%s:\" line is  continued in  the next line.  Since\n"
+"       the line  may not  contain  whitespace,  this is  not allowed.\n"
+"       Please write all newsgroups into a single line.\n"
 msgstr ""
 
-#: src/lang.c:1174
+#: src/lang.c:996
 #, c-format
 msgid ""
 "\n"
-"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n"
+"Warning: The \"%s:\" line is continued in the next line.\n"
+"         This is a very new feature and may not be accepted by all servers.\n"
+"         To avoid trouble please write all newsgroups into a single line.\n"
 msgstr ""
 
-#: src/lang.c:1175
+#: src/lang.c:1000
 #, c-format
 msgid ""
 "\n"
-"Warning: \"%s\" is not a valid newsgroup at this site!\n"
+"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n"
 msgstr ""
 
-#: src/lang.c:1179
+#: src/lang.c:1005
 msgid ""
 "\n"
 "  If your article contains quoted text  please take some time to pare it "
@@ -3706,750 +3672,802 @@ msgid ""
 "  likely to ignore it completely.  It's a crowded net out there.\n"
 msgstr ""
 
-#: src/lang.c:1191
-#, c-format
-msgid ""
-"\n"
-"Warning: Found %d '-- \\n' lines, this may confuse some people.\n"
+#: src/lang.c:1018
+msgid "shell escape"
+msgstr ""
+
+#: src/lang.c:1019
+#, c-format
+msgid "Shell Command (%s)"
+msgstr ""
+
+#: src/lang.c:1020
+#, c-format
+msgid "Enter shell command [%s]> "
+msgstr ""
+
+#: src/lang.c:1024
+#, c-format
+msgid "%s: Can't get entry for TERM\n"
+msgstr ""
+
+#: src/lang.c:1028
+#, c-format
+msgid "Group %.*s ('q' to quit)..."
+msgstr ""
+
+#: src/lang.c:1030
+#, c-format
+msgid "Group %.*s..."
+msgstr ""
+
+#: src/lang.c:1034
+msgid "Server unavailable\n"
+msgstr ""
+
+#: src/lang.c:1040
+#, c-format
+msgid ""
+"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; "
+"%s=post"
+msgstr ""
+
+#: src/lang.c:1041
+#, c-format
+msgid ""
+"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr ""
+
+#: src/lang.c:1043
+#, c-format
+msgid ""
+"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr ""
+
+#: src/lang.c:1044
+#, c-format
+msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr ""
+
+#: src/lang.c:1048
+#, c-format
+msgid ""
+"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr ""
+
+#: src/lang.c:1049
+#, c-format
+msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr ""
+
+#: src/lang.c:1051
+#, c-format
+msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"
+msgstr ""
+
+#: src/lang.c:1052
+#, c-format
+msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"
+msgstr ""
+
+#: src/lang.c:1058
+msgid "Terminal does not support color"
+msgstr ""
+
+#: src/lang.c:1063
+#, c-format
+msgid "Trying %s"
+msgstr ""
+
+#: src/lang.c:1077 src/lang.c:1102 src/lang.c:1118 src/refs.c:266
+msgid "None"
+msgstr ""
+
+#: src/lang.c:1078
+msgid "Subject"
+msgstr ""
+
+#: src/lang.c:1079
+msgid "References"
+msgstr ""
+
+#: src/lang.c:1080
+msgid "Both Subject and References"
+msgstr ""
+
+#: src/lang.c:1081
+msgid "Multipart Subject"
+msgstr ""
+
+#: src/lang.c:1093 src/lang.c:1204
+msgid "No"
+msgstr ""
+
+#: src/lang.c:1094 src/lang.c:1206
+msgid "Yes"
+msgstr ""
+
+#: src/lang.c:1095
+msgid "Hide All"
+msgstr ""
+
+#: src/lang.c:1103
+msgid "Address"
+msgstr ""
+
+#: src/lang.c:1104
+msgid "Full Name"
 msgstr ""
 
-#: src/lang.c:1192
-#, c-format
-msgid "Warning: Only %d out of %d articles were saved"
+#: src/lang.c:1105
+msgid "Address and Name"
 msgstr ""
 
-#: src/lang.c:1193
-#, c-format
-msgid ""
-"\n"
-"Warning: Your signature  is longer than %d lines.  Since signatures usually "
-"do\n"
-"         not  transport any  useful information,  they should be as  short "
-"as\n"
-"         possible.\n"
+#: src/lang.c:1112
+msgid "Max"
 msgstr ""
 
-#: src/lang.c:1197
-#, c-format
-msgid ""
-"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? "
+#: src/lang.c:1113
+msgid "Sum"
 msgstr ""
 
-#: src/lang.c:1198
-msgid ""
-"\n"
-"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n"
+#: src/lang.c:1114
+msgid "Average"
 msgstr ""
 
-#: src/lang.c:1199
-msgid "Writing attributes file..."
+#: src/lang.c:1119
+msgid "Lines"
 msgstr ""
 
-#: src/lang.c:1200
-#, c-format
-msgid "%d Responses%s"
+#: src/lang.c:1120
+msgid "Score"
 msgstr ""
 
-#: src/lang.c:1201
-#, c-format
-msgid "Added %d %s"
+#: src/lang.c:1121
+msgid "Lines & Score"
 msgstr ""
 
-#: src/lang.c:1202
-msgid "No unsubscribed groups to show"
+#: src/lang.c:1130
+msgid "Black"
 msgstr ""
 
-#: src/lang.c:1203
-msgid "Showing subscribed to groups only"
+#: src/lang.c:1131
+msgid "Red"
 msgstr ""
 
-#: src/lang.c:1204
-msgid "Showing unread groups only"
+#: src/lang.c:1132
+msgid "Green"
 msgstr ""
 
-#: src/lang.c:1205
-msgid "Yes "
+#: src/lang.c:1133
+msgid "Brown"
 msgstr ""
 
-#: src/lang.c:1206
-msgid "    You have mail\n"
+#: src/lang.c:1134
+msgid "Blue"
 msgstr ""
 
-#: src/lang.c:1207
-msgid "All groups"
+#: src/lang.c:1135
+msgid "Pink"
 msgstr ""
 
-#: src/lang.c:1208
-msgid "Comment (optional)  : "
+#: src/lang.c:1136
+msgid "Cyan"
 msgstr ""
 
-#: src/lang.c:1209
-msgid "Apply pattern to    : "
+#: src/lang.c:1137
+msgid "White"
 msgstr ""
 
-#: src/lang.c:1210
-msgid "From: line (ignore case)      "
+#: src/lang.c:1138
+msgid "Gray"
 msgstr ""
 
-#: src/lang.c:1211
-msgid "From: line (case sensitive)   "
+#: src/lang.c:1139
+msgid "Light Red"
 msgstr ""
 
-#: src/lang.c:1212
-msgid ""
-"One or more lines of comment. <CR> to add a line or proceed if line is empty."
+#: src/lang.c:1140
+msgid "Light Green"
 msgstr ""
 
-#: src/lang.c:1213
-msgid "From: line to add to filter file. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1141
+msgid "Yellow"
 msgstr ""
 
-#: src/lang.c:1214
-msgid ""
-"Linecount of articles to be filtered. < for less, > for more, = for equal."
+#: src/lang.c:1142
+msgid "Light Blue"
 msgstr ""
 
-#: src/lang.c:1215
-msgid "Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1143
+msgid "Light Pink"
 msgstr ""
 
-#: src/lang.c:1216
-msgid "Subject: line to add to filter file. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1144
+msgid "Light Cyan"
 msgstr ""
 
-#: src/lang.c:1217
-msgid ""
-"Enter text pattern to filter if Subject: & From: lines are not what you want."
+#: src/lang.c:1145
+msgid "Light White"
 msgstr ""
 
-#: src/lang.c:1218
-msgid ""
-"Select where text pattern should be applied. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1153 src/lang.c:1210 src/lang.c:1224
+msgid "Nothing"
 msgstr ""
 
-#: src/lang.c:1219
-msgid ""
-"Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1154
+msgid "Mark"
 msgstr ""
 
-#: src/lang.c:1220
-msgid ""
-"Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1155
+msgid "Space"
 msgstr ""
 
-#: src/lang.c:1221
-msgid ""
-"Apply select to current group or all groups. <SPACE> toggles & <CR> sets."
+#: src/lang.c:1162
+msgid "Normal"
 msgstr ""
 
-#: src/lang.c:1222
-#, c-format
-msgid "Kill From:     [%-*.*s] (y/n): "
+#: src/lang.c:1163
+msgid "Best highlighting"
 msgstr ""
 
-#: src/lang.c:1223
-msgid "Kill Lines: (</>num): "
+#: src/lang.c:1164
+msgid "Underline"
 msgstr ""
 
-#: src/lang.c:1224
-msgid "Kill Article Menu"
+#: src/lang.c:1165
+msgid "Reverse video"
 msgstr ""
 
-#: src/lang.c:1225
-#, c-format
-msgid "Kill Msg-Id:   [%-*.*s] (f/l/o/n): "
+#: src/lang.c:1166
+msgid "Blinking"
 msgstr ""
 
-#: src/lang.c:1226
-msgid "Kill pattern scope  : "
+#: src/lang.c:1167
+msgid "Half bright"
 msgstr ""
 
-#: src/lang.c:1227
-#, c-format
-msgid "Kill Subject:  [%-*.*s] (y/n): "
+#: src/lang.c:1168
+msgid "Bold"
 msgstr ""
 
-#: src/lang.c:1228
-msgid "Kill text pattern   : "
+#: src/lang.c:1173
+msgid "none"
 msgstr ""
 
-#: src/lang.c:1229
-msgid "Kill time in days   : "
+#: src/lang.c:1174
+msgid "commands"
 msgstr ""
 
-#: src/lang.c:1230
-msgid "Message-ID: line              "
+#: src/lang.c:1175
+msgid "select"
 msgstr ""
 
-#: src/lang.c:1231
-#, c-format
-msgid "Select From    [%-*.*s] (y/n): "
+#: src/lang.c:1177
+msgid "commands & quit"
 msgstr ""
 
-#: src/lang.c:1232
-msgid "Select Lines: (</>num): "
+#: src/lang.c:1178
+msgid "commands & select"
 msgstr ""
 
-#: src/lang.c:1233
-msgid "Auto-select Article Menu"
+#: src/lang.c:1179
+msgid "quit & select"
 msgstr ""
 
-#: src/lang.c:1234
-#, c-format
-msgid "Select Msg-Id  [%-*.*s] (f/l/o/n): "
+#: src/lang.c:1180
+msgid "commands & quit & select"
 msgstr ""
 
-#: src/lang.c:1235
-msgid "Select pattern scope: "
+#: src/lang.c:1205
+msgid "Shell archive"
 msgstr ""
 
-#: src/lang.c:1236
-#, c-format
-msgid "Select Subject [%-*.*s] (y/n): "
+#: src/lang.c:1211
+msgid "Subject: (descending)"
 msgstr ""
 
-#: src/lang.c:1237
-msgid "Select text pattern : "
+#: src/lang.c:1212
+msgid "Subject: (ascending)"
 msgstr ""
 
-#: src/lang.c:1238
-msgid "Select time in days   : "
+#: src/lang.c:1213
+msgid "From: (descending)"
 msgstr ""
 
-#: src/lang.c:1239
-msgid "Subject: line (ignore case)   "
+#: src/lang.c:1214
+msgid "From: (ascending)"
 msgstr ""
 
-#: src/lang.c:1240
-msgid "Subject: line (case sensitive)"
+#: src/lang.c:1215
+msgid "Date: (descending)"
 msgstr ""
 
-#: src/lang.c:1241
-#, c-format
-msgid "%d days"
+#: src/lang.c:1216
+msgid "Date: (ascending)"
 msgstr ""
 
-#: src/lang.c:1242
-msgid "Unlimited"
+#: src/lang.c:1217 src/lang.c:1225
+msgid "Score (descending)"
 msgstr ""
 
-#: src/lang.c:1243
-msgid "Full"
+#: src/lang.c:1218 src/lang.c:1226
+msgid "Score (ascending)"
 msgstr ""
 
-#: src/lang.c:1244
-msgid "Last"
+#: src/lang.c:1219
+msgid "Lines: (descending)"
 msgstr ""
 
-#: src/lang.c:1245
-msgid "Only"
+#: src/lang.c:1220
+msgid "Lines: (ascending)"
 msgstr ""
 
-#: src/lang.c:1246
-msgid ""
-"# Format:\n"
-"#   comment=STRING    Optional. Multiple lines allowed. Comments must be "
-"placed\n"
-"#                     at the beginning of a rule, or they will be moved to "
-"the\n"
-"#                     next rule. '#' is not a valid keyword for a comment!\n"
-"#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n"
-"#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n"
-"#   score=NUM|STRING  Mandatory. Score to give. Either:\n"
-"#     score=NUM         A number (e.g. 70). Or:\n"
-"#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n"
-"#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n"
-"#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n"
-"#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) "
-"with\n"
-"#                     full references.\n"
-"#   msgid_last=STRING Optional. Like above, but with last reference only.\n"
-"#   msgid_only=STRING Optional. Like above, but without references.\n"
-"#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) "
-"without\n"
-"#                     Message-ID:\n"
-"#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n"
-"#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' "
-"opt.\n"
-"#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n"
-"#   time=NUM          Optional. time_t value when rule expires\n"
-"#\n"
+#: src/lang.c:1231
+msgid "Always Keep"
 msgstr ""
 
-#: src/lang.c:1267
-#, c-format
-msgid "Enter score for rule (default=%d): "
+#: src/lang.c:1232
+msgid "Always Remove"
 msgstr ""
 
-#: src/lang.c:1268
-#, c-format
-msgid "Enter the score weight (range 0 < score <= %d)"
+#: src/lang.c:1233
+msgid "Mark with D on selection screen"
 msgstr ""
 
-#. SCORE_MAX
-#: src/lang.c:1270
-msgid "Article deleted."
+#: src/lang.c:1238
+msgid "Kill only unread arts"
 msgstr ""
 
-#: src/lang.c:1271
-msgid "Article undeleted."
+#: src/lang.c:1239
+msgid "Kill all arts & show with K"
 msgstr ""
 
-#: src/lang.c:1272
-msgid "Processing mail messages marked for deletion."
+#. TODO: s/K/art_marked_killed/
+#: src/lang.c:1240
+msgid "Kill all arts and never show"
 msgstr ""
 
-#: src/lang.c:1273
-msgid "Processing saved articles marked for deletion."
+#: src/lang.c:1245
+msgid "Nothing special"
 msgstr ""
 
-#: src/lang.c:1276
-#, c-format
-msgid "Environment variable %s not found. Set and retry..."
+#: src/lang.c:1246
+msgid "Compress quotes"
 msgstr ""
 
-#: src/lang.c:1277
-msgid "  -B       BBS mode. File operations limited to home directories."
+#: src/lang.c:1247
+msgid "Quote signatures"
 msgstr ""
 
-#: src/lang.c:1281
-msgid ""
-"\n"
-"Error: Followup-To set to more than one newsgroup!\n"
+#: src/lang.c:1248
+msgid "Compress quotes, quote sigs"
 msgstr ""
 
-#: src/lang.c:1282
-#, c-format
-msgid ""
-"\n"
-"Error: cross-posting to %d newsgroups and no Followup-To line!\n"
+#: src/lang.c:1249
+msgid "Quote empty lines"
 msgstr ""
 
-#: src/lang.c:1283
-#, c-format
-msgid ""
-"\n"
-"Error: \"%s\" is not a valid newsgroup!\n"
+#: src/lang.c:1250
+msgid "Compress quotes, quote empty lines"
 msgstr ""
 
-#: src/lang.c:1287
-msgid ""
-"Your server does not have Xref: in its XOVER information.\n"
-"Tin will try to use XHDR XREF instead (slows down things a bit).\n"
+#: src/lang.c:1251
+msgid "Quote sigs & empty lines"
 msgstr ""
 
-#: src/lang.c:1290
-msgid "Your server does not have Xref: in its XOVER information.\n"
+#: src/lang.c:1252
+msgid "Comp. q., quote sigs & empty lines"
 msgstr ""
 
-#: src/lang.c:1295
+#: src/lang.c:1290
 msgid "Display Options"
 msgstr ""
 
-#: src/lang.c:1301
+#: src/lang.c:1296
 msgid "Color Options"
 msgstr ""
 
-#: src/lang.c:1307
+#: src/lang.c:1302
 msgid "Article-Limiting Options"
 msgstr ""
 
-#: src/lang.c:1313
+#: src/lang.c:1308
 msgid "Posting/Mailing Options"
 msgstr ""
 
-#: src/lang.c:1319
+#: src/lang.c:1314
 msgid "Saving/Printing Options"
 msgstr ""
 
-#: src/lang.c:1325
+#: src/lang.c:1320
 msgid "Expert Options"
 msgstr ""
 
-#: src/lang.c:1331
+#: src/lang.c:1326
 msgid "Filtering Options"
 msgstr ""
 
-#: src/lang.c:1336 src/lang.c:1362 src/lang.c:1368 src/lang.c:1375
-#: src/lang.c:1407 src/lang.c:1413 src/lang.c:1421 src/lang.c:1441
-#: src/lang.c:1516 src/lang.c:1678 src/lang.c:1684 src/lang.c:1690
-#: src/lang.c:1702 src/lang.c:1709 src/lang.c:1760 src/lang.c:1769
-#: src/lang.c:1775 src/lang.c:1781 src/lang.c:1787 src/lang.c:1793
-#: src/lang.c:1799 src/lang.c:1805 src/lang.c:1811 src/lang.c:1817
-#: src/lang.c:1823 src/lang.c:1829 src/lang.c:1835 src/lang.c:1841
-#: src/lang.c:1847 src/lang.c:1853 src/lang.c:1859 src/lang.c:1865
-#: src/lang.c:1871 src/lang.c:1877 src/lang.c:1883 src/lang.c:1890
-#: src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1920
-#: src/lang.c:1926 src/lang.c:1932 src/lang.c:1938 src/lang.c:1944
-#: src/lang.c:1958 src/lang.c:1970 src/lang.c:2004 src/lang.c:2056
-#: src/lang.c:2063 src/lang.c:2069 src/lang.c:2094 src/lang.c:2111
-#: src/lang.c:2164 src/lang.c:2197 src/lang.c:2217 src/lang.c:2252
-#: src/lang.c:2260 src/lang.c:2285 src/lang.c:2297
+#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370
+#: src/lang.c:1402 src/lang.c:1408 src/lang.c:1416 src/lang.c:1436
+#: src/lang.c:1511 src/lang.c:1673 src/lang.c:1679 src/lang.c:1685
+#: src/lang.c:1697 src/lang.c:1704 src/lang.c:1755 src/lang.c:1764
+#: src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788
+#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812
+#: src/lang.c:1818 src/lang.c:1824 src/lang.c:1830 src/lang.c:1836
+#: src/lang.c:1842 src/lang.c:1848 src/lang.c:1854 src/lang.c:1860
+#: src/lang.c:1866 src/lang.c:1872 src/lang.c:1878 src/lang.c:1885
+#: src/lang.c:1891 src/lang.c:1897 src/lang.c:1904 src/lang.c:1915
+#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939
+#: src/lang.c:1953 src/lang.c:1965 src/lang.c:1999 src/lang.c:2051
+#: src/lang.c:2058 src/lang.c:2064 src/lang.c:2089 src/lang.c:2106
+#: src/lang.c:2159 src/lang.c:2192 src/lang.c:2212 src/lang.c:2247
+#: src/lang.c:2255 src/lang.c:2280 src/lang.c:2292
 msgid "<SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1337
+#: src/lang.c:1332
 msgid "Show mini menu & posting etiquette :"
 msgstr ""
 
-#: src/lang.c:1338
+#: src/lang.c:1333
 msgid ""
 "# If ON show a mini menu of useful commands at each level\n"
 "# and posting etiquette after composing an article\n"
 msgstr ""
 
-#: src/lang.c:1343
+#: src/lang.c:1338
 msgid "Show short description for each newsgroup. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1344
+#: src/lang.c:1339
 msgid "Show description of each newsgroup :"
 msgstr ""
 
-#: src/lang.c:1345
+#: src/lang.c:1340
 msgid ""
 "# If ON show group description text after newsgroup name at\n"
 "# group selection level\n"
 msgstr ""
 
-#: src/lang.c:1350
+#: src/lang.c:1345
 msgid ""
 "Show Subject & From (author) fields in group menu. <SPACE> toggles & <CR> "
 "sets."
 msgstr ""
 
-#: src/lang.c:1351
+#: src/lang.c:1346
 msgid "In group menu, show author by      :"
 msgstr ""
 
-#: src/lang.c:1352
+#: src/lang.c:1347
 msgid ""
 "# Part of from field to display 0) none 1) address 2) full name 3) both\n"
 msgstr ""
 
-#: src/lang.c:1356
+#: src/lang.c:1351
 msgid "Draw -> or highlighted bar for selection. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1357
+#: src/lang.c:1352
 msgid "Draw -> instead of highlighted bar :"
 msgstr ""
 
-#: src/lang.c:1358
+#: src/lang.c:1353
 msgid "# If ON use -> otherwise highlighted bar for selection\n"
 msgstr ""
 
-#: src/lang.c:1363
+#: src/lang.c:1358
 msgid "Use inverse video for page headers :"
 msgstr ""
 
-#: src/lang.c:1364
+#: src/lang.c:1359
 msgid "# If ON use inverse video for page headers at different levels\n"
 msgstr ""
 
-#: src/lang.c:1369
+#: src/lang.c:1364
 msgid "Thread articles by                 :"
 msgstr ""
 
-#: src/lang.c:1370
+#: src/lang.c:1365
 msgid ""
 "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n"
 "# 4=(Multipart Subject).\n"
 msgstr ""
 
-#: src/lang.c:1376
+#: src/lang.c:1371
 msgid "Score of a thread                  :"
 msgstr ""
 
-#: src/lang.c:1377
+#: src/lang.c:1372
 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n"
 msgstr ""
 
-#: src/lang.c:1381
+#: src/lang.c:1376
 msgid ""
 "Sort articles by Subject, From, Date or Score. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1382
+#: src/lang.c:1377
 msgid "Sort articles by                   :"
 msgstr ""
 
-#: src/lang.c:1383
+#: src/lang.c:1378
 msgid ""
 "# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n"
 "# 3=(From descend) 4=(From ascend) 5=(Date descend) 6=(Date ascend)\n"
 "# 7=(Score descend) 8=(Score ascend) 9=(Lines descend) 10=(Lines ascend).\n"
 msgstr ""
 
-#: src/lang.c:1389
+#: src/lang.c:1384
 msgid "Sort threads by Nothing or Score. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1390
+#: src/lang.c:1385
 msgid "Sort threads by                    :"
 msgstr ""
 
-#: src/lang.c:1391
+#: src/lang.c:1386
 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n"
 msgstr ""
 
-#: src/lang.c:1395
+#: src/lang.c:1390
 msgid ""
 "Put cursor at first/last unread art in groups. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1396
+#: src/lang.c:1391
 msgid "Goto first unread article in group :"
 msgstr ""
 
-#: src/lang.c:1397
+#: src/lang.c:1392
 msgid "# If ON put cursor at first unread art in group otherwise last art\n"
 msgstr ""
 
-#: src/lang.c:1401
+#: src/lang.c:1396
 msgid "Show all articles or only unread articles. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1402
+#: src/lang.c:1397
 msgid "Show only unread articles          :"
 msgstr ""
 
-#: src/lang.c:1403
+#: src/lang.c:1398
 msgid "# If ON show only new/unread articles otherwise show all.\n"
 msgstr ""
 
-#: src/lang.c:1408
+#: src/lang.c:1403
 msgid "Show only groups with unread arts  :"
 msgstr ""
 
-#: src/lang.c:1409
+#: src/lang.c:1404
 msgid "# If ON show only subscribed to groups that contain unread articles.\n"
 msgstr ""
 
-#: src/lang.c:1414
+#: src/lang.c:1409
 msgid "Filter which articles              :"
 msgstr ""
 
-#: src/lang.c:1415
+#: src/lang.c:1410
 msgid ""
 "# 0=(Only kill unread articles)\n"
 "# 1=(Kill all articles and show in threads marked with K)\n"
 "# 2=(Kill all articles and never show them).\n"
 msgstr ""
 
-#: src/lang.c:1422
+#: src/lang.c:1417
 msgid "Tab goes to next unread article    :"
 msgstr ""
 
-#: src/lang.c:1423
+#: src/lang.c:1418
 msgid ""
 "# If ON the TAB command will go to next unread article at article viewer "
 "level\n"
 msgstr ""
 
-#: src/lang.c:1427
+#: src/lang.c:1422
 msgid ""
 "Scrolling with <SPACE> past the end of an art. jumps to the next unread one."
 msgstr ""
 
-#: src/lang.c:1428
+#: src/lang.c:1423
 msgid "Space goes to next unread article  :"
 msgstr ""
 
-#: src/lang.c:1429
+#: src/lang.c:1424
 msgid ""
 "# If ON the SPACE command will go to next unread article at article viewer\n"
 "# level when the end of the article is reached (rn-style pager)\n"
 msgstr ""
 
-#: src/lang.c:1434
+#: src/lang.c:1429
 msgid ""
 "Scrolling with <PGDN>/<DOWN> past the end of an art. jumps to the unread one."
 msgstr ""
 
-#: src/lang.c:1435
+#: src/lang.c:1430
 msgid "PgDn goes to next unread article   :"
 msgstr ""
 
-#: src/lang.c:1436
+#: src/lang.c:1431
 msgid ""
 "# If ON the PGDN or DOWN command will go to next unread article when\n"
 "# pressed at end of message\n"
 msgstr ""
 
-#: src/lang.c:1442
+#: src/lang.c:1437
 msgid "List thread using right arrow key  :"
 msgstr ""
 
-#: src/lang.c:1443
+#: src/lang.c:1438
 msgid ""
 "# If ON automatically list thread when entering it using right arrow key.\n"
 msgstr ""
 
-#: src/lang.c:1447
+#: src/lang.c:1442
 msgid "Enter character to indicate deleted articles. <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1448
+#: src/lang.c:1443
 msgid "Character to show deleted articles :"
 msgstr ""
 
-#: src/lang.c:1449
+#: src/lang.c:1444
 msgid ""
 "# Character used to show that an art was deleted (default 'D')\n"
 "# _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1454
+#: src/lang.c:1449
 msgid ""
 "Enter character to indicate articles in a range. <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1455
+#: src/lang.c:1450
 msgid "Character to show inrange articles :"
 msgstr ""
 
-#: src/lang.c:1456
+#: src/lang.c:1451
 msgid ""
 "# Character used to show that an art is in a range (default '#')\n"
 "# _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1461
+#: src/lang.c:1456
 msgid ""
 "Enter character to indicate that article will return. <CR> sets, <ESC> "
 "cancels."
 msgstr ""
 
-#: src/lang.c:1462
+#: src/lang.c:1457
 msgid "Character to show returning arts   :"
 msgstr ""
 
-#: src/lang.c:1463
+#: src/lang.c:1458
 msgid ""
 "# Character used to show that an art will return (default '-')\n"
 "# _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1468
+#: src/lang.c:1463
 msgid ""
 "Enter character to indicate selected articles. <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1469
+#: src/lang.c:1464
 msgid "Character to show selected articles:"
 msgstr ""
 
-#: src/lang.c:1470
+#: src/lang.c:1465
 msgid ""
 "# Character used to show that an art was auto-selected (default '*')\n"
 "# _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1475
+#: src/lang.c:1470
 msgid "Enter character to indicate recent articles. <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1476
+#: src/lang.c:1471
 msgid "Character to show recent articles  :"
 msgstr ""
 
-#: src/lang.c:1477
+#: src/lang.c:1472
 msgid ""
 "# Character used to show that an art is recent (default 'o')\n"
 "# _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1482
+#: src/lang.c:1477
 msgid "Enter character to indicate unread articles. <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1483
+#: src/lang.c:1478
 msgid "Character to show unread articles  :"
 msgstr ""
 
-#: src/lang.c:1484
+#: src/lang.c:1479
 msgid ""
 "# Character used to show that an art is unread (default '+')\n"
 "# _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1489
+#: src/lang.c:1484
 msgid "Enter character to indicate read articles. <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1490
+#: src/lang.c:1485
 msgid "Character to show read articles    :"
 msgstr ""
 
-#: src/lang.c:1491
+#: src/lang.c:1486
 msgid ""
 "# Character used to show that an art was read (default ' ')\n"
 "# _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1496
+#: src/lang.c:1491
 msgid "Enter character to indicate killed articles. <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1497
+#: src/lang.c:1492
 msgid "Character to show killed articles  :"
 msgstr ""
 
-#: src/lang.c:1498
+#: src/lang.c:1493
 msgid ""
 "# Character used to show that an art was killed (default 'K')\n"
 "# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1503
+#: src/lang.c:1498
 msgid ""
 "Enter character to indicate read selected articles. <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1504
+#: src/lang.c:1499
 msgid "Character to show readselected arts:"
 msgstr ""
 
-#: src/lang.c:1505
+#: src/lang.c:1500
 msgid ""
 "# Character used to show that an art was selected before read (default ':')\n"
 "# kill_level must be set accordingly, _ is turned into ' '\n"
 msgstr ""
 
-#: src/lang.c:1510
+#: src/lang.c:1505
 msgid "Enter maximum length of newsgroup names displayed. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1511
+#: src/lang.c:1506
 msgid "Max. length of group names shown   :"
 msgstr ""
 
-#: src/lang.c:1512
+#: src/lang.c:1507
 msgid "# Maximum length of the names of newsgroups displayed\n"
 msgstr ""
 
-#: src/lang.c:1517
+#: src/lang.c:1512
 msgid "Show lines/score in listings       :"
 msgstr ""
 
-#: src/lang.c:1518
+#: src/lang.c:1513
 msgid ""
 "# What informations should be displayed in article/thread listing\n"
 "# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n"
 msgstr ""
 
-#: src/lang.c:1523
+#: src/lang.c:1518
 msgid ""
 "0 = full page scrolling, -1 = show previous last line as first on next page, "
 "-2 = half page"
 msgstr ""
 
-#: src/lang.c:1524
+#: src/lang.c:1519
 msgid "Number of lines to scroll in pager :"
 msgstr ""
 
-#: src/lang.c:1525
+#: src/lang.c:1520
 msgid ""
 "# Number of lines that cursor-up/down will scroll in article pager\n"
 "# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n"
@@ -4457,28 +4475,28 @@ msgid ""
 "# -2 = half-page scrolling\n"
 msgstr ""
 
-#: src/lang.c:1532
+#: src/lang.c:1527
 msgid "Display signatures. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1533
+#: src/lang.c:1528
 msgid "Display signatures                 :"
 msgstr ""
 
-#: src/lang.c:1534
+#: src/lang.c:1529
 msgid "# If OFF don't show signatures when displaying articles\n"
 msgstr ""
 
-#: src/lang.c:1538
+#: src/lang.c:1533
 msgid ""
 "Display uuencoded data as tagged attachments. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1539
+#: src/lang.c:1534
 msgid "Display uue data as an attachment  :"
 msgstr ""
 
-#: src/lang.c:1540
+#: src/lang.c:1535
 msgid ""
 "# Handling of uuencoded data in the pager\n"
 "# 0 = display raw uuencoded data\n"
@@ -4488,30 +4506,30 @@ msgid ""
 "#     into a tag line.\n"
 msgstr ""
 
-#: src/lang.c:1549
+#: src/lang.c:1544
 msgid ""
 "Decode German style TeX umlaut codes to ISO. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1550
+#: src/lang.c:1545
 msgid "Display \"a as Umlaut-a             :"
 msgstr ""
 
-#: src/lang.c:1551
+#: src/lang.c:1546
 msgid ""
 "# If ON decode German style TeX umlaut codes to ISO and\n"
 "# show \"a as Umlaut-a, etc.\n"
 msgstr ""
 
-#: src/lang.c:1556 src/lang.c:1566
+#: src/lang.c:1551 src/lang.c:1561
 msgid "Space separated list of header fields"
 msgstr ""
 
-#: src/lang.c:1557
+#: src/lang.c:1552
 msgid "Display these header fields (or *) :"
 msgstr ""
 
-#: src/lang.c:1558
+#: src/lang.c:1553
 msgid ""
 "# Which news headers you wish to see. If you want to see _all_ the headers,\n"
 "# place an '*' as this value. This is the only way a wildcard can be used.\n"
@@ -4521,11 +4539,11 @@ msgid ""
 "# spaces. Not defining anything turns off this option.\n"
 msgstr ""
 
-#: src/lang.c:1567
+#: src/lang.c:1562
 msgid "Do not display these header fields :"
 msgstr ""
 
-#: src/lang.c:1568
+#: src/lang.c:1563
 msgid ""
 "# Same as 'news_headers_to_display' except it denotes the opposite.\n"
 "# An example of using both options might be if you thought X- headers were\n"
@@ -4537,163 +4555,163 @@ msgid ""
 "# Not defining anything turns off this option.\n"
 msgstr ""
 
-#: src/lang.c:1578
+#: src/lang.c:1573
 msgid ""
 "Do you want to enable automatic handling of multipart/alternative articles?"
 msgstr ""
 
-#: src/lang.c:1579
+#: src/lang.c:1574
 msgid "Skip multipart/alternative parts   :"
 msgstr ""
 
-#: src/lang.c:1580
+#: src/lang.c:1575
 msgid "# If ON strip multipart/alternative messages automatically\n"
 msgstr ""
 
-#: src/lang.c:1585
+#: src/lang.c:1580
 msgid "A regex used to decide which lines to show in col_quote."
 msgstr ""
 
-#: src/lang.c:1586
+#: src/lang.c:1581
 msgid "Regex used to show quoted lines    :"
 msgstr ""
 
-#: src/lang.c:1587
+#: src/lang.c:1582
 msgid ""
 "# A regular expression that tin will use to decide which lines are\n"
 "# quoted when viewing articles. Quoted lines are shown in col_quote.\n"
 "# If you leave this blank, tin will use a built in default.\n"
 msgstr ""
 
-#: src/lang.c:1593
+#: src/lang.c:1588
 msgid "A regex used to decide which lines to show in col_quote2."
 msgstr ""
 
-#: src/lang.c:1594
+#: src/lang.c:1589
 msgid "Regex used to show twice quoted l. :"
 msgstr ""
 
-#: src/lang.c:1595
+#: src/lang.c:1590
 msgid ""
 "# A regular expression that tin will use to decide which lines are\n"
 "# quoted twice. Twice quoted lines are shown in col_quote2.\n"
 "# If you leave this blank, tin will use a built in default.\n"
 msgstr ""
 
-#: src/lang.c:1601
+#: src/lang.c:1596
 msgid "A regex used to decide which lines to show in col_quote3."
 msgstr ""
 
-#: src/lang.c:1602
+#: src/lang.c:1597
 msgid "Regex used to show >= 3 times q.l. :"
 msgstr ""
 
-#: src/lang.c:1603
+#: src/lang.c:1598
 msgid ""
 "# A regular expression that tin will use to decide which lines are\n"
 "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n"
 "# If you leave this blank, tin will use a built in default.\n"
 msgstr ""
 
-#: src/lang.c:1610
+#: src/lang.c:1605
 msgid "A regex used to decide which words to show in col_markslashes."
 msgstr ""
 
-#: src/lang.c:1611
+#: src/lang.c:1606
 msgid "Regex used to highlight /slashes/  :"
 msgstr ""
 
-#: src/lang.c:1612
+#: src/lang.c:1607
 msgid ""
 "# A regular expression that tin will use to decide which words\n"
 "# bounded by '/' are to be shown in col_markslashes.\n"
 "# If you leave this blank, tin will use a built in default.\n"
 msgstr ""
 
-#: src/lang.c:1618
+#: src/lang.c:1613
 msgid "A regex used to decide which words to show in col_markstars."
 msgstr ""
 
-#: src/lang.c:1619
+#: src/lang.c:1614
 msgid "Regex used to highlight *stars*    :"
 msgstr ""
 
-#: src/lang.c:1620
+#: src/lang.c:1615
 msgid ""
 "# A regular expression that tin will use to decide which words\n"
 "# bounded by '*' are to be shown in col_markstars.\n"
 "# If you leave this blank, tin will use a built in default.\n"
 msgstr ""
 
-#: src/lang.c:1626
+#: src/lang.c:1621
 msgid "A regex used to decide which words to show in col_markstroke."
 msgstr ""
 
-#: src/lang.c:1627
+#: src/lang.c:1622
 msgid "Regex used to highlight -strokes-  :"
 msgstr ""
 
-#: src/lang.c:1628
+#: src/lang.c:1623
 msgid ""
 "# A regular expression that tin will use to decide which words\n"
 "# bounded by '-' are to be shown in col_markstroke.\n"
 "# If you leave this blank, tin will use a built in default.\n"
 msgstr ""
 
-#: src/lang.c:1634
+#: src/lang.c:1629
 msgid "A regex used to decide which words to show in col_markdash."
 msgstr ""
 
-#: src/lang.c:1635
+#: src/lang.c:1630
 msgid "Regex used to highlight _underline_:"
 msgstr ""
 
-#: src/lang.c:1636
+#: src/lang.c:1631
 msgid ""
 "# A regular expression that tin will use to decide which words\n"
 "# bounded by '_' are to be shown in col_markdash.\n"
 "# If you leave this blank, tin will use a built in default.\n"
 msgstr ""
 
-#: src/lang.c:1642
+#: src/lang.c:1637
 msgid "A regex used to find Subject prefixes to remove.  Use '|' as separator."
 msgstr ""
 
-#: src/lang.c:1643
+#: src/lang.c:1638
 msgid "Regex with Subject prefixes        :"
 msgstr ""
 
-#: src/lang.c:1644
+#: src/lang.c:1639
 msgid ""
 "# A regular expression that tin will use to find Subject prefixes\n"
 "# which will be removed before showing the header.\n"
 msgstr ""
 
-#: src/lang.c:1649
+#: src/lang.c:1644
 msgid "A regex used to find Subject suffixes to remove.  Use '|' as separator."
 msgstr ""
 
-#: src/lang.c:1650
+#: src/lang.c:1645
 msgid "Regex with Subject suffixes        :"
 msgstr ""
 
-#: src/lang.c:1651
+#: src/lang.c:1646
 msgid ""
 "# A regular expression that tin will use to find Subject suffixes\n"
 "# which will be removed when replying or posting followup.\n"
 msgstr ""
 
-#: src/lang.c:1656
+#: src/lang.c:1651
 msgid ""
 "Enter name and options for external MIME viewer, --internal for built-in "
 "viewer"
 msgstr ""
 
-#: src/lang.c:1657
+#: src/lang.c:1652
 msgid "MIME binary content viewer         :"
 msgstr ""
 
-#: src/lang.c:1658
+#: src/lang.c:1653
 msgid ""
 "# If --internal automatically use the built in MIME viewer for non-text\n"
 "# parts of articles.\n"
@@ -4702,356 +4720,356 @@ msgid ""
 "# for no automatic viewing\n"
 msgstr ""
 
-#: src/lang.c:1665
+#: src/lang.c:1660
 msgid "Confirm before starting non-text viewing program"
 msgstr ""
 
-#: src/lang.c:1666
+#: src/lang.c:1661
 msgid "Ask before using MIME viewer       :"
 msgstr ""
 
-#: src/lang.c:1667
+#: src/lang.c:1662
 msgid ""
 "# If ON tin will ask before using metamail to display MIME messages\n"
 "# this only happens if metamail_prog is set to something\n"
 msgstr ""
 
-#: src/lang.c:1672
+#: src/lang.c:1667
 msgid "Ask to mark groups read when quitting. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1673
+#: src/lang.c:1668
 msgid "Catchup read groups when quitting  :"
 msgstr ""
 
-#: src/lang.c:1674
+#: src/lang.c:1669
 msgid "# If ON ask user if read groups should all be marked read\n"
 msgstr ""
 
-#: src/lang.c:1679
+#: src/lang.c:1674
 msgid "Catchup group using left key       :"
 msgstr ""
 
-#: src/lang.c:1680
+#: src/lang.c:1675
 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n"
 msgstr ""
 
-#: src/lang.c:1685
+#: src/lang.c:1680
 msgid "Catchup thread by using left key   :"
 msgstr ""
 
-#: src/lang.c:1691
+#: src/lang.c:1686
 msgid "Which actions require confirmation :"
 msgstr ""
 
-#: src/lang.c:1692
+#: src/lang.c:1687
 msgid "# What should we ask confirmation for.\n"
 msgstr ""
 
-#: src/lang.c:1696
+#: src/lang.c:1691
 msgid "Program to run to open URL's, <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:1697
+#: src/lang.c:1692
 msgid "Program that opens URL's           :"
 msgstr ""
 
-#: src/lang.c:1698
+#: src/lang.c:1693
 msgid "# The program used to open URL's. The actual URL will be appended\n"
 msgstr ""
 
-#: src/lang.c:1703
+#: src/lang.c:1698
 msgid "Use mouse in xterm                 :"
 msgstr ""
 
-#: src/lang.c:1704
+#: src/lang.c:1699
 msgid "# If ON enable mouse key support on xterm terminals\n"
 msgstr ""
 
-#: src/lang.c:1710
+#: src/lang.c:1705
 msgid "Use scroll keys on keypad          :"
 msgstr ""
 
-#: src/lang.c:1711
+#: src/lang.c:1706
 msgid "# If ON enable scroll keys on terminals that support it\n"
 msgstr ""
 
-#: src/lang.c:1716
+#: src/lang.c:1711
 msgid "Enter maximum number of article to get. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1717
+#: src/lang.c:1712
 msgid "Number of articles to get          :"
 msgstr ""
 
-#: src/lang.c:1718
+#: src/lang.c:1713
 msgid ""
 "# Number of articles to get (0=no limit), if negative sets maximum number\n"
 "# of already read articles to be read before first unread one\n"
 msgstr ""
 
-#: src/lang.c:1723
+#: src/lang.c:1718
 msgid "Enter number of days article is considered recent. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1724
+#: src/lang.c:1719
 msgid "Article recentness time limit      :"
 msgstr ""
 
-#: src/lang.c:1725
+#: src/lang.c:1720
 msgid "# Number of days in which article is considered recent, (0=OFF)\n"
 msgstr ""
 
-#: src/lang.c:1729
+#: src/lang.c:1724
 msgid ""
 "WILDMAT for normal wildcards, REGEX for full regular expression matching."
 msgstr ""
 
-#: src/lang.c:1730
+#: src/lang.c:1725
 msgid "Wildcard matching                  :"
 msgstr ""
 
-#: src/lang.c:1731
+#: src/lang.c:1726
 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n"
 msgstr ""
 
-#: src/lang.c:1735
+#: src/lang.c:1730
 msgid "Enter minimal score before an article is marked killed. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1736
+#: src/lang.c:1731
 msgid "Score limit (kill)                 :"
 msgstr ""
 
-#: src/lang.c:1737
+#: src/lang.c:1732
 msgid "# Score limit before an article is marked killed\n"
 msgstr ""
 
-#: src/lang.c:1741
+#: src/lang.c:1736
 msgid "Enter default score to kill articles. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1742
+#: src/lang.c:1737
 msgid "Default score to kill articles     :"
 msgstr ""
 
-#: src/lang.c:1743
+#: src/lang.c:1738
 msgid "# Default score to kill articles\n"
 msgstr ""
 
-#: src/lang.c:1747
+#: src/lang.c:1742
 msgid "Enter minimal score before an article is marked hot. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1748
+#: src/lang.c:1743
 msgid "Score limit (select)               :"
 msgstr ""
 
-#: src/lang.c:1749
+#: src/lang.c:1744
 msgid "# Score limit before an article is marked hot\n"
 msgstr ""
 
-#: src/lang.c:1753
+#: src/lang.c:1748
 msgid "Enter default score to select articles. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1754
+#: src/lang.c:1749
 msgid "Default score to select articles   :"
 msgstr ""
 
-#: src/lang.c:1755
+#: src/lang.c:1750
 msgid "# Default score to select articles\n"
 msgstr ""
 
-#: src/lang.c:1761
+#: src/lang.c:1756
 msgid "Use slrnface to show ''X-Face:''s  :"
 msgstr ""
 
-#: src/lang.c:1762
+#: src/lang.c:1757
 msgid ""
 "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n"
 "# Only useful when running in an xterm.\n"
 msgstr ""
 
-#: src/lang.c:1770
+#: src/lang.c:1765
 msgid "Use ANSI color                     :"
 msgstr ""
 
-#: src/lang.c:1771
+#: src/lang.c:1766
 msgid "# If ON using ANSI-color\n"
 msgstr ""
 
-#: src/lang.c:1776
+#: src/lang.c:1771
 msgid "Standard foreground color          :"
 msgstr ""
 
-#: src/lang.c:1777
+#: src/lang.c:1772
 msgid "# Standard foreground color\n"
 msgstr ""
 
-#: src/lang.c:1782
+#: src/lang.c:1777
 msgid "Standard background color          :"
 msgstr ""
 
-#: src/lang.c:1783
+#: src/lang.c:1778
 msgid "# Standard-Background-Color\n"
 msgstr ""
 
-#: src/lang.c:1788
+#: src/lang.c:1783
 msgid "Color for inverse text (background):"
 msgstr ""
 
-#: src/lang.c:1789
+#: src/lang.c:1784
 msgid "# Color of background for inverse text\n"
 msgstr ""
 
-#: src/lang.c:1794
+#: src/lang.c:1789
 msgid "Color for inverse text (foreground):"
 msgstr ""
 
-#: src/lang.c:1795
+#: src/lang.c:1790
 msgid "# Color of foreground for inverse text\n"
 msgstr ""
 
-#: src/lang.c:1800
+#: src/lang.c:1795
 msgid "Color of text lines                :"
 msgstr ""
 
-#: src/lang.c:1801
+#: src/lang.c:1796
 msgid "# Color of text-lines\n"
 msgstr ""
 
-#: src/lang.c:1806
+#: src/lang.c:1801
 msgid "Color of mini help menu            :"
 msgstr ""
 
-#: src/lang.c:1807
+#: src/lang.c:1802
 msgid "# Color of mini help menu\n"
 msgstr ""
 
-#: src/lang.c:1812
+#: src/lang.c:1807
 msgid "Color of help text                 :"
 msgstr ""
 
-#: src/lang.c:1813
+#: src/lang.c:1808
 msgid "# Color of help pages\n"
 msgstr ""
 
-#: src/lang.c:1818
+#: src/lang.c:1813
 msgid "Color of status messages           :"
 msgstr ""
 
-#: src/lang.c:1819
+#: src/lang.c:1814
 msgid "# Color of messages in last line\n"
 msgstr ""
 
-#: src/lang.c:1824
+#: src/lang.c:1819
 msgid "Color of quoted lines              :"
 msgstr ""
 
-#: src/lang.c:1825
+#: src/lang.c:1820
 msgid "# Color of quote-lines\n"
 msgstr ""
 
-#: src/lang.c:1830
+#: src/lang.c:1825
 msgid "Color of twice quoted line         :"
 msgstr ""
 
-#: src/lang.c:1831
+#: src/lang.c:1826
 msgid "# Color of twice quoted lines\n"
 msgstr ""
 
-#: src/lang.c:1836
+#: src/lang.c:1831
 msgid "Color of =>3 times quoted line     :"
 msgstr ""
 
-#: src/lang.c:1837
+#: src/lang.c:1832
 msgid "# Color of >=3 times quoted lines\n"
 msgstr ""
 
-#: src/lang.c:1842
+#: src/lang.c:1837
 msgid "Color of article header lines      :"
 msgstr ""
 
-#: src/lang.c:1843
+#: src/lang.c:1838
 msgid "# Color of header-lines\n"
 msgstr ""
 
-#: src/lang.c:1848
+#: src/lang.c:1843
 msgid "Color of actual news header fields :"
 msgstr ""
 
-#: src/lang.c:1849
+#: src/lang.c:1844
 msgid "# Color of actual news header fields\n"
 msgstr ""
 
-#: src/lang.c:1854
+#: src/lang.c:1849
 msgid "Color of article subject lines     :"
 msgstr ""
 
-#: src/lang.c:1855
+#: src/lang.c:1850
 msgid "# Color of article subject\n"
 msgstr ""
 
-#: src/lang.c:1860
+#: src/lang.c:1855
 msgid "Color of response counter          :"
 msgstr ""
 
-#: src/lang.c:1861
+#: src/lang.c:1856
 msgid "# Color of response counter\n"
 msgstr ""
 
-#: src/lang.c:1866
+#: src/lang.c:1861
 msgid "Color of sender (From:)            :"
 msgstr ""
 
-#: src/lang.c:1867
+#: src/lang.c:1862
 msgid "# Color of sender (From:)\n"
 msgstr ""
 
-#: src/lang.c:1872
+#: src/lang.c:1867
 msgid "Color of help/mail sign            :"
 msgstr ""
 
-#: src/lang.c:1873
+#: src/lang.c:1868
 msgid "# Color of Help/Mail-Sign\n"
 msgstr ""
 
-#: src/lang.c:1878
+#: src/lang.c:1873
 msgid "Color of signatures                :"
 msgstr ""
 
-#: src/lang.c:1879
+#: src/lang.c:1874
 msgid "# Color of signature\n"
 msgstr ""
 
-#: src/lang.c:1884
+#: src/lang.c:1879
 msgid "Color of highlighting with *stars* :"
 msgstr ""
 
-#: src/lang.c:1885
+#: src/lang.c:1880
 msgid ""
 "# Color of word highlighting. There are four possibilities\n"
 "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n"
 msgstr ""
 
-#: src/lang.c:1891
+#: src/lang.c:1886
 msgid "Color of highlighting with _dash_  :"
 msgstr ""
 
-#: src/lang.c:1897
+#: src/lang.c:1892
 msgid "Color of highlighting with /slash/ :"
 msgstr ""
 
-#: src/lang.c:1903
+#: src/lang.c:1898
 msgid "Color of highlighting with -stroke-:"
 msgstr ""
 
-#: src/lang.c:1910
+#: src/lang.c:1905
 msgid "Attr. of highlighting with *stars* :"
 msgstr ""
 
-#: src/lang.c:1911
+#: src/lang.c:1906
 msgid ""
 "# Attribute of word highlighting on mono terminals.\n"
 "# There are four possibilities in articles:\n"
@@ -5061,87 +5079,87 @@ msgid ""
 "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n"
 msgstr ""
 
-#: src/lang.c:1921
+#: src/lang.c:1916
 msgid "Attr. of highlighting with _dash_  :"
 msgstr ""
 
-#: src/lang.c:1927
+#: src/lang.c:1922
 msgid "Attr. of highlighting with /slash/ :"
 msgstr ""
 
-#: src/lang.c:1933
+#: src/lang.c:1928
 msgid "Attr. of highlighting with -stroke-:"
 msgstr ""
 
-#: src/lang.c:1939
+#: src/lang.c:1934
 msgid "Word highlighting in message body  :"
 msgstr ""
 
-#: src/lang.c:1940
+#: src/lang.c:1935
 msgid "# Enable word highlighting?\n"
 msgstr ""
 
-#: src/lang.c:1945
+#: src/lang.c:1940
 msgid "What to display instead of mark    :"
 msgstr ""
 
-#: src/lang.c:1946
+#: src/lang.c:1941
 msgid ""
 "# Should the leading and ending stars and dashes also be displayed,\n"
 "# even when they are highlighting marks?\n"
 "# 0 - no    1 - yes, display mark    2 - print a space instead\n"
 msgstr ""
 
-#: src/lang.c:1952
+#: src/lang.c:1947
 msgid "Enter column number to wrap article lines to in the pager. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1953
+#: src/lang.c:1948
 msgid "Page line wrap column              :"
 msgstr ""
 
-#: src/lang.c:1954
+#: src/lang.c:1949
 msgid "# Wrap article lines at column\n"
 msgstr ""
 
-#: src/lang.c:1959
+#: src/lang.c:1954
 msgid "Wrap around threads on next unread :"
 msgstr ""
 
-#: src/lang.c:1960
+#: src/lang.c:1955
 msgid "# If ON wrap around threads on searching next unread article\n"
 msgstr ""
 
-#: src/lang.c:1964
+#: src/lang.c:1959
 msgid "Enter default mail address (and fullname). <CR> sets."
 msgstr ""
 
-#: src/lang.c:1965
+#: src/lang.c:1960
 msgid "Mail address (and fullname)        :"
 msgstr ""
 
-#: src/lang.c:1966
+#: src/lang.c:1961
 msgid "# User's mail address (and fullname), if not username@host (fullname)\n"
 msgstr ""
 
-#: src/lang.c:1971
+#: src/lang.c:1966
 msgid "Show empty Followup-To in editor   :"
 msgstr ""
 
-#: src/lang.c:1972
+#: src/lang.c:1967
 msgid "# If ON show empty Followup-To header when editing an article\n"
 msgstr ""
 
-#: src/lang.c:1976
+#: src/lang.c:1971
 msgid ""
 "Enter path/! command/--none to create your default signature. <CR> sets."
 msgstr ""
 
-#: src/lang.c:1977
+#: src/lang.c:1972
 msgid "Create signature from path/command :"
 msgstr ""
 
-#: src/lang.c:1978
+#: src/lang.c:1973
 msgid ""
 "# Signature path (random sigs)/file to be used when posting/replying\n"
 "# default_sigfile=file       appends file as signature\n"
@@ -5150,50 +5168,50 @@ msgid ""
 "# default_sigfile=--none     don't append a signature\n"
 msgstr ""
 
-#: src/lang.c:1985
+#: src/lang.c:1980
 msgid ""
 "Prepend signature with \"-- \" on own line. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1986
+#: src/lang.c:1981
 msgid "Prepend signature with \"-- \"       :"
 msgstr ""
 
-#: src/lang.c:1987
+#: src/lang.c:1982
 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n"
 msgstr ""
 
-#: src/lang.c:1991
+#: src/lang.c:1986
 msgid "Add signature when reposting articles. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:1992
+#: src/lang.c:1987
 msgid "Add signature when reposting       :"
 msgstr ""
 
-#: src/lang.c:1993
+#: src/lang.c:1988
 msgid "# If ON add signature to reposted articles\n"
 msgstr ""
 
-#: src/lang.c:1997
+#: src/lang.c:1992
 msgid "Enter quotation marks, %s or %S for author's initials."
 msgstr ""
 
-#: src/lang.c:1998
+#: src/lang.c:1993
 msgid "Characters used as quote-marks     :"
 msgstr ""
 
-#: src/lang.c:1999
+#: src/lang.c:1994
 msgid ""
 "# Characters used in quoting to followups and replies.\n"
 "# '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n"
 msgstr ""
 
-#: src/lang.c:2005
+#: src/lang.c:2000
 msgid "Quoting behavior                   :"
 msgstr ""
 
-#: src/lang.c:2006
+#: src/lang.c:2001
 msgid ""
 "# How quoting should be handled when following up or replying.\n"
 "# 0 = Nothing special\n"
@@ -5206,52 +5224,52 @@ msgid ""
 "# 7 = Compress quotes, quote signatures, quote empty lines\n"
 msgstr ""
 
-#: src/lang.c:2018 src/lang.c:2026 src/lang.c:2032
+#: src/lang.c:2013 src/lang.c:2021 src/lang.c:2027
 msgid ""
 "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name"
 msgstr ""
 
-#: src/lang.c:2019
+#: src/lang.c:2014
 msgid "Quote line when following up       :"
 msgstr ""
 
-#: src/lang.c:2020
+#: src/lang.c:2015
 msgid ""
 "# Format of quote line when mailing/posting/following-up an article\n"
 "# %%A Address    %%D Date   %%F Addr+Name   %%G Groupname   %%M Message-ID\n"
 "# %%N Full Name  %%C First Name   %%I Initials\n"
 msgstr ""
 
-#: src/lang.c:2027
+#: src/lang.c:2022
 msgid "Quote line when cross-posting      :"
 msgstr ""
 
-#: src/lang.c:2033
+#: src/lang.c:2028
 msgid "Quote line when mailing            :"
 msgstr ""
 
-#: src/lang.c:2038
+#: src/lang.c:2033
 msgid "If ON, include User-Agent: header. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:2039
+#: src/lang.c:2034
 msgid "Insert 'User-Agent:'-header        :"
 msgstr ""
 
-#: src/lang.c:2040
+#: src/lang.c:2035
 msgid "# If ON include advertising User-Agent: header\n"
 msgstr ""
 
-#: src/lang.c:2044
+#: src/lang.c:2039
 msgid ""
 "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), <CR> to set."
 msgstr ""
 
-#: src/lang.c:2045
+#: src/lang.c:2040
 msgid "MM_CHARSET                         :"
 msgstr ""
 
-#: src/lang.c:2046
+#: src/lang.c:2041
 msgid ""
 "# Charset supported locally which is also used for MIME header and\n"
 "# Content-Type header.\n"
@@ -5261,27 +5279,27 @@ msgid ""
 "# mm_charset is considered not displayable and represented as '?'.\n"
 msgstr ""
 
-#: src/lang.c:2057
+#: src/lang.c:2052
 msgid "MM_NETWORK_CHARSET                 :"
 msgstr ""
 
-#: src/lang.c:2058
+#: src/lang.c:2053
 msgid "# Charset used for MIME (Content-Type) header in postings.\n"
 msgstr ""
 
-#: src/lang.c:2064
+#: src/lang.c:2059
 msgid "Mailbox format                     :"
 msgstr ""
 
-#: src/lang.c:2065
+#: src/lang.c:2060
 msgid "# Format of the mailbox.\n"
 msgstr ""
 
-#: src/lang.c:2070
+#: src/lang.c:2065
 msgid "MIME encoding in news messages     :"
 msgstr ""
 
-#: src/lang.c:2071
+#: src/lang.c:2066
 msgid ""
 "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n"
 "# for mails and posts, if necessary. QP is efficient for most European\n"
@@ -5290,15 +5308,15 @@ msgid ""
 "# Russian charsets with a lot of 8bit characters.\n"
 msgstr ""
 
-#: src/lang.c:2079 src/lang.c:2100
+#: src/lang.c:2074 src/lang.c:2095
 msgid "Don't change unless you know what you are doing. <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:2080
+#: src/lang.c:2075
 msgid "Use 8bit characters in news headers:"
 msgstr ""
 
-#: src/lang.c:2081
+#: src/lang.c:2076
 msgid ""
 "# If ON, 8bit characters in news headers are NOT encoded.\n"
 "# default is OFF. Thus 8bit characters are encoded by default.\n"
@@ -5306,28 +5324,28 @@ msgid ""
 "# parameter unless post_mime_encoding is 8bit as well.\n"
 msgstr ""
 
-#: src/lang.c:2088
+#: src/lang.c:2083
 msgid ""
 "Auto-view post-processed files <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:2089
+#: src/lang.c:2084
 msgid "View post-processed files          :"
 msgstr ""
 
-#: src/lang.c:2090
+#: src/lang.c:2085
 msgid "# If set, post processed files will be opened in a viewer\n"
 msgstr ""
 
-#: src/lang.c:2095
+#: src/lang.c:2090
 msgid "MIME encoding in mail messages     :"
 msgstr ""
 
-#: src/lang.c:2101
+#: src/lang.c:2096
 msgid "Use 8bit characters in mail headers:"
 msgstr ""
 
-#: src/lang.c:2102
+#: src/lang.c:2097
 msgid ""
 "# If ON, 8bit characters in mail headers are NOT encoded.\n"
 "# default is OFF. Thus 8bit characters are encoded by default.\n"
@@ -5338,277 +5356,277 @@ msgid ""
 "# turn it ON unless you have some compelling reason.\n"
 msgstr ""
 
-#: src/lang.c:2112
+#: src/lang.c:2107
 msgid "Strip blanks of end of lines       :"
 msgstr ""
 
-#: src/lang.c:2113
+#: src/lang.c:2108
 msgid ""
 "# If ON strip blanks from end of lines to speedup display on slow terminals\n"
 msgstr ""
 
-#: src/lang.c:2118
+#: src/lang.c:2113
 msgid "If ON, use transliteration. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:2119
+#: src/lang.c:2114
 msgid "Transliteration                    :"
 msgstr ""
 
-#: src/lang.c:2120
+#: src/lang.c:2115
 msgid ""
 "# If ON, use //TRANSLIT extension. This means that when a character cannot\n"
 "# be represented in the in the target character set, it can be approximated\n"
 "# through one or several similarly looking characters.\n"
 msgstr ""
 
-#: src/lang.c:2127
+#: src/lang.c:2122
 msgid "Send you a carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:2128
+#: src/lang.c:2123
 msgid "Send you a cc automatically        :"
 msgstr ""
 
-#: src/lang.c:2129
+#: src/lang.c:2124
 msgid ""
 "# If ON automatically put your name in the Cc: field when mailing an "
 "article\n"
 msgstr ""
 
-#: src/lang.c:2133
+#: src/lang.c:2128
 msgid ""
 "Send you a blind carbon copy automatically. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:2134
+#: src/lang.c:2129
 msgid "Send you a blind cc automatically  :"
 msgstr ""
 
-#: src/lang.c:2135
+#: src/lang.c:2130
 msgid ""
 "# If ON automatically put your name in the Bcc: field when mailing an "
 "article\n"
 msgstr ""
 
-#: src/lang.c:2139
+#: src/lang.c:2134
 msgid "Enter address elements about which you want to be warned. <CR> sets."
 msgstr ""
 
-#: src/lang.c:2140
+#: src/lang.c:2135
 msgid "Spamtrap warning address parts     :"
 msgstr ""
 
-#: src/lang.c:2141
+#: src/lang.c:2136
 msgid ""
 "# A comma-delimited list of address-parts you want to be warned\n"
 "# about when trying to reply by email.\n"
 msgstr ""
 
-#: src/lang.c:2146
+#: src/lang.c:2141
 msgid "Enter default number of days a filter entry will be valid. <CR> sets."
 msgstr ""
 
-#: src/lang.c:2147
+#: src/lang.c:2142
 msgid "No. of days a filter entry is valid:"
 msgstr ""
 
-#: src/lang.c:2148
+#: src/lang.c:2143
 msgid "# Number of days a short term filter will be active\n"
 msgstr ""
 
-#: src/lang.c:2152
+#: src/lang.c:2147
 msgid "Add posted articles to filter. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:2153
+#: src/lang.c:2148
 msgid "Add posted articles to filter      :"
 msgstr ""
 
-#: src/lang.c:2154
+#: src/lang.c:2149
 msgid ""
 "# If ON add posted articles which start a new thread to filter for\n"
 "# highlighting follow-ups\n"
 msgstr ""
 
-#: src/lang.c:2158
+#: src/lang.c:2153
 msgid "The directory where articles/threads are to be saved in mailbox format."
 msgstr ""
 
-#: src/lang.c:2159
+#: src/lang.c:2154
 msgid "Mail directory                     :"
 msgstr ""
 
-#: src/lang.c:2160
+#: src/lang.c:2155
 msgid "# (-m) directory where articles/threads are saved in mailbox format\n"
 msgstr ""
 
-#: src/lang.c:2165
+#: src/lang.c:2160
 msgid "Save articles in batch mode (-S)   :"
 msgstr ""
 
-#: src/lang.c:2166
+#: src/lang.c:2161
 msgid ""
 "# If ON articles/threads will be saved in batch mode when save -S\n"
 "# or mail (-M/-N) is specified on the command line\n"
 msgstr ""
 
-#: src/lang.c:2171
+#: src/lang.c:2166
 msgid "The directory where you want articles/threads saved."
 msgstr ""
 
-#: src/lang.c:2172
+#: src/lang.c:2167
 msgid "Directory to save arts/threads in  :"
 msgstr ""
 
-#: src/lang.c:2173
+#: src/lang.c:2168
 msgid "# Directory where articles/threads are saved\n"
 msgstr ""
 
-#: src/lang.c:2177
+#: src/lang.c:2172
 msgid ""
 "Auto save article/thread by Archive-name: header. <SPACE> toggles & <CR> "
 "sets."
 msgstr ""
 
-#: src/lang.c:2178
+#: src/lang.c:2173
 msgid "Use Archive-name: header for save  :"
 msgstr ""
 
-#: src/lang.c:2179
+#: src/lang.c:2174
 msgid ""
 "# If ON articles/threads with Archive-name: in mail header will\n"
 "# be automatically saved with the Archive-name & part/patch no.\n"
 msgstr ""
 
-#: src/lang.c:2184
+#: src/lang.c:2179
 msgid ""
 "Mark saved articles/threads as read. <SPACE> toggles, <CR> sets, <ESC> "
 "cancels."
 msgstr ""
 
-#: src/lang.c:2185
+#: src/lang.c:2180
 msgid "Mark saved articles/threads as read:"
 msgstr ""
 
-#: src/lang.c:2186
+#: src/lang.c:2181
 msgid "# If ON mark articles that are saved as read\n"
 msgstr ""
 
-#: src/lang.c:2190
+#: src/lang.c:2185
 msgid "Do post processing (eg. extract attachments) for saved articles."
 msgstr ""
 
-#: src/lang.c:2191
+#: src/lang.c:2186
 msgid "Post process saved articles        :"
 msgstr ""
 
-#: src/lang.c:2192
+#: src/lang.c:2187
 msgid ""
 "# Perform post processing (saving binary attachments) from saved articles.\n"
 "# 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n"
 msgstr ""
 
-#: src/lang.c:2198
+#: src/lang.c:2193
 msgid "Process only unread articles       :"
 msgstr ""
 
-#: src/lang.c:2199
+#: src/lang.c:2194
 msgid ""
 "# If ON only save/print/pipe/mail unread articles (tagged articles "
 "excepted)\n"
 msgstr ""
 
-#: src/lang.c:2204
+#: src/lang.c:2199
 msgid "Print all or just part of header. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:2205
+#: src/lang.c:2200
 msgid "Print all headers when printing    :"
 msgstr ""
 
-#: src/lang.c:2206
+#: src/lang.c:2201
 msgid ""
 "# If ON print all of article header otherwise just the important lines\n"
 msgstr ""
 
-#: src/lang.c:2210
+#: src/lang.c:2205
 msgid ""
 "The printer program with options that is to be used to print "
 "articles/threads."
 msgstr ""
 
-#: src/lang.c:2211
+#: src/lang.c:2206
 msgid "Printer program with options       :"
 msgstr ""
 
-#: src/lang.c:2212
+#: src/lang.c:2207
 msgid "# Print program with parameters used to print articles/threads\n"
 msgstr ""
 
-#: src/lang.c:2218
+#: src/lang.c:2213
 msgid "Force redraw after certain commands:"
 msgstr ""
 
-#: src/lang.c:2219
+#: src/lang.c:2214
 msgid ""
 "# If ON a screen redraw will always be done after certain external commands\n"
 msgstr ""
 
-#: src/lang.c:2223
+#: src/lang.c:2218
 msgid ""
 "Start editor with line offset. <SPACE> toggles, <CR> sets, <ESC> cancels."
 msgstr ""
 
-#: src/lang.c:2224
+#: src/lang.c:2219
 msgid "Start editor with line offset      :"
 msgstr ""
 
-#: src/lang.c:2225
+#: src/lang.c:2220
 msgid ""
 "# If ON editor will be started with cursor offset into the file\n"
 "# otherwise the cursor will be positioned at the first line\n"
 msgstr ""
 
-#: src/lang.c:2230
+#: src/lang.c:2225
 msgid "Enter %E for editor, %F for filename, %N for line-number, <CR> to set."
 msgstr ""
 
-#: src/lang.c:2231
+#: src/lang.c:2226
 msgid "Invocation of your editor          :"
 msgstr ""
 
-#: src/lang.c:2232
+#: src/lang.c:2227
 msgid ""
 "# Format of editor line including parameters\n"
 "# %%E Editor  %%F Filename  %%N Linenumber\n"
 msgstr ""
 
-#: src/lang.c:2237
+#: src/lang.c:2232
 msgid ""
 "Enter name and options for external-inews, --internal for internal inews"
 msgstr ""
 
-#: src/lang.c:2238
+#: src/lang.c:2233
 msgid "External inews                     :"
 msgstr ""
 
-#: src/lang.c:2239
+#: src/lang.c:2234
 msgid ""
 "# If --internal use the built in mini inews for posting via NNTP\n"
 "# otherwise use an external inews program\n"
 msgstr ""
 
-#: src/lang.c:2243
+#: src/lang.c:2238
 msgid ""
 "Enter %M for mailer, %S for subject, %T for to, %F for filename, <CR> to set."
 msgstr ""
 
-#: src/lang.c:2244
+#: src/lang.c:2239
 msgid "Invocation of your mail command    :"
 msgstr ""
 
-#: src/lang.c:2245
+#: src/lang.c:2240
 msgid ""
 "# Format of mailer line including parameters\n"
 "# %%M Mailer  %%S Subject  %%T To  %%F Filename  %%U User (AmigaDOS)\n"
@@ -5616,357 +5634,357 @@ msgid ""
 "# ie. elm interactive          :    elm -i %%F -s \"%%S\" \"%%T\"\n"
 msgstr ""
 
-#: src/lang.c:2253
+#: src/lang.c:2248
 msgid "Use interactive mail reader        :"
 msgstr ""
 
-#: src/lang.c:2254
+#: src/lang.c:2249
 msgid ""
 "# Interactive mailreader: if ON mailreader will be invoked earlier for\n"
 "# reply so you can use more of its features (eg. MIME, pgp, ...)\n"
 "# this option has to suit default_mailer_format\n"
 msgstr ""
 
-#: src/lang.c:2261
+#: src/lang.c:2256
 msgid "Remove ~/.article after posting    :"
 msgstr ""
 
-#: src/lang.c:2262
+#: src/lang.c:2257
 msgid "# If ON remove ~/.article after posting.\n"
 msgstr ""
 
-#: src/lang.c:2266
+#: src/lang.c:2261
 msgid "Filename for all posted articles, <CR> sets, no filename=do not save."
 msgstr ""
 
-#: src/lang.c:2267
+#: src/lang.c:2262
 msgid "Filename for posted articles       :"
 msgstr ""
 
-#: src/lang.c:2268
+#: src/lang.c:2263
 msgid ""
 "# Filename where to keep all postings (default posted)\n"
 "# If no filename is set then postings will not be saved\n"
 msgstr ""
 
-#: src/lang.c:2273
+#: src/lang.c:2268
 msgid ""
 "Keep all failed articles in ~/dead.articles. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:2274
+#: src/lang.c:2269
 msgid "Keep failed arts in ~/dead.articles:"
 msgstr ""
 
-#: src/lang.c:2275
+#: src/lang.c:2270
 msgid "# If ON keep all failed postings in ~/dead.articles\n"
 msgstr ""
 
-#: src/lang.c:2279
+#: src/lang.c:2274
 msgid "Do you want to strip unsubscribed groups from .newsrc"
 msgstr ""
 
-#: src/lang.c:2280
+#: src/lang.c:2275
 msgid "No unsubscribed groups in newsrc   :"
 msgstr ""
 
-#: src/lang.c:2281
+#: src/lang.c:2276
 msgid "# If ON strip unsubscribed groups from newsrc\n"
 msgstr ""
 
-#: src/lang.c:2286
+#: src/lang.c:2281
 msgid "Remove bogus groups from newsrc    :"
 msgstr ""
 
-#: src/lang.c:2287
+#: src/lang.c:2282
 msgid ""
 "# What to do with bogus groups in newsrc file\n"
 "# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n"
 msgstr ""
 
-#: src/lang.c:2291
+#: src/lang.c:2286
 msgid "Enter number of seconds until active file will be reread. <CR> sets."
 msgstr ""
 
-#: src/lang.c:2292
+#: src/lang.c:2287
 msgid "Interval in secs to reread active  :"
 msgstr ""
 
-#: src/lang.c:2293
+#: src/lang.c:2288
 msgid ""
 "# Time interval in seconds between rereading the active file (0=never)\n"
 msgstr ""
 
-#: src/lang.c:2298
+#: src/lang.c:2293
 msgid "Reconnect to server automatically  :"
 msgstr ""
 
-#: src/lang.c:2299
+#: src/lang.c:2294
 msgid ""
 "# If ON automatically reconnect to NNTP server if the connection is broken\n"
 msgstr ""
 
-#: src/lang.c:2303
+#: src/lang.c:2298
 msgid ""
 "Create local copies of NNTP overview files. <SPACE> toggles & <CR> sets."
 msgstr ""
 
-#: src/lang.c:2304
+#: src/lang.c:2299
 msgid "Cache NNTP overview files locally  :"
 msgstr ""
 
-#: src/lang.c:2305
+#: src/lang.c:2300
 msgid "# If ON, create local copies of NNTP overview files.\n"
 msgstr ""
 
-#: src/main.c:627
+#: src/main.c:619
 #, c-format
 msgid "Version: %s release %s (\"%s\") %s %s"
 msgstr ""
 
-#: src/main.c:630
+#: src/main.c:622
 #, c-format
 msgid "Version: %s release %s (\"%s\")"
 msgstr ""
 
-#: src/nntplib.c:795
+#: src/nntplib.c:804
 #, c-format
 msgid ""
 "\n"
 "Server timed out, trying reconnect # %d\n"
 msgstr ""
 
-#: src/nntplib.c:813
+#: src/nntplib.c:822
 msgid "Rejoin current group\n"
 msgstr ""
 
-#: src/nntplib.c:820
+#: src/nntplib.c:829
 #, c-format
 msgid "Read (%s)\n"
 msgstr ""
 
-#: src/nntplib.c:822
+#: src/nntplib.c:831
 #, c-format
 msgid "Resend last command (%s)\n"
 msgstr ""
 
-#: src/nntplib.c:942
+#: src/nntplib.c:951
 msgid "100  Help text on way"
 msgstr ""
 
-#: src/nntplib.c:946
+#: src/nntplib.c:955
 msgid "180  Authorization capabilities"
 msgstr ""
 
-#: src/nntplib.c:950
+#: src/nntplib.c:959
 msgid "199  Debug output"
 msgstr ""
 
-#: src/nntplib.c:954
+#: src/nntplib.c:963
 msgid "200  Hello; you can post"
 msgstr ""
 
-#: src/nntplib.c:958
+#: src/nntplib.c:967
 msgid "201  Hello; you can't post"
 msgstr ""
 
-#: src/nntplib.c:962
+#: src/nntplib.c:971
 msgid "202  Slave status noted"
 msgstr ""
 
-#: src/nntplib.c:970
+#: src/nntplib.c:979
 msgid "211  Group selected"
 msgstr ""
 
-#: src/nntplib.c:975
+#: src/nntplib.c:984
 msgid "215  Newsgroups follow"
 msgstr ""
 
-#: src/nntplib.c:980
+#: src/nntplib.c:989
 msgid "218  Group index file follows"
 msgstr ""
 
-#: src/nntplib.c:985
+#: src/nntplib.c:994
 msgid "220  Article (head & body) follows"
 msgstr ""
 
-#: src/nntplib.c:989
+#: src/nntplib.c:998
 msgid "221  Head follows"
 msgstr ""
 
-#: src/nntplib.c:993
+#: src/nntplib.c:1002
 msgid "222  Body follows"
 msgstr ""
 
-#: src/nntplib.c:997
+#: src/nntplib.c:1006
 msgid "223  No text sent -- stat, next, last"
 msgstr ""
 
-#: src/nntplib.c:1001
+#: src/nntplib.c:1010
 msgid "230  New articles by message-id follow"
 msgstr ""
 
-#: src/nntplib.c:1005
+#: src/nntplib.c:1014
 msgid "231  New newsgroups follow"
 msgstr ""
 
-#: src/nntplib.c:1009
+#: src/nntplib.c:1018
 msgid "235  Article transferred successfully"
 msgstr ""
 
-#: src/nntplib.c:1013
+#: src/nntplib.c:1022
 msgid "240  Article posted successfully"
 msgstr ""
 
-#: src/nntplib.c:1017
+#: src/nntplib.c:1026
 msgid "280  Authorization system ok"
 msgstr ""
 
-#: src/nntplib.c:1021
+#: src/nntplib.c:1030
 msgid "281  Authorization (user/pass) ok"
 msgstr ""
 
-#: src/nntplib.c:1025
+#: src/nntplib.c:1034
 msgid "282  binary data follows"
 msgstr ""
 
-#: src/nntplib.c:1029
+#: src/nntplib.c:1038
 msgid "283  spooldir list follows"
 msgstr ""
 
-#: src/nntplib.c:1033
+#: src/nntplib.c:1042
 msgid "284  Switching to a different spooldir"
 msgstr ""
 
-#: src/nntplib.c:1037
+#: src/nntplib.c:1046
 msgid "285  Still using same spooldir"
 msgstr ""
 
-#: src/nntplib.c:1041
+#: src/nntplib.c:1050
 msgid "286  Current spooldir"
 msgstr ""
 
-#: src/nntplib.c:1045
+#: src/nntplib.c:1054
 msgid "287  Available spooldir"
 msgstr ""
 
-#: src/nntplib.c:1049
+#: src/nntplib.c:1058
 msgid "288  Unavailable spooldir or invalid entry"
 msgstr ""
 
-#: src/nntplib.c:1053
+#: src/nntplib.c:1062
 msgid "335  Continue to send article"
 msgstr ""
 
-#: src/nntplib.c:1057
+#: src/nntplib.c:1066
 msgid "340  Continue to post article"
 msgstr ""
 
-#: src/nntplib.c:1061
+#: src/nntplib.c:1070
 msgid "380  authorization is required"
 msgstr ""
 
-#: src/nntplib.c:1065
+#: src/nntplib.c:1074
 msgid "381  <type> authorization data required"
 msgstr ""
 
-#: src/nntplib.c:1069
+#: src/nntplib.c:1078
 msgid "400  Have to hang up for some reason"
 msgstr ""
 
-#: src/nntplib.c:1073
+#: src/nntplib.c:1082
 msgid "411  No such newsgroup"
 msgstr ""
 
-#: src/nntplib.c:1077
+#: src/nntplib.c:1086
 msgid "412  Not currently in newsgroup"
 msgstr ""
 
-#: src/nntplib.c:1081
+#: src/nntplib.c:1090
 msgid "418  No index file for this group"
 msgstr ""
 
-#: src/nntplib.c:1085
+#: src/nntplib.c:1094
 msgid "420  No current article selected"
 msgstr ""
 
-#: src/nntplib.c:1089
+#: src/nntplib.c:1098
 msgid "421  No next article in this group"
 msgstr ""
 
-#: src/nntplib.c:1093
+#: src/nntplib.c:1102
 msgid "422  No previous article in this group"
 msgstr ""
 
-#: src/nntplib.c:1097
+#: src/nntplib.c:1106
 msgid "423  No such article in this group"
 msgstr ""
 
-#: src/nntplib.c:1101
+#: src/nntplib.c:1110
 msgid "430  No such article at all"
 msgstr ""
 
-#: src/nntplib.c:1105
+#: src/nntplib.c:1114
 msgid "435  Already got that article, don't send"
 msgstr ""
 
-#: src/nntplib.c:1109
+#: src/nntplib.c:1118
 msgid "436  Transfer failed"
 msgstr ""
 
-#: src/nntplib.c:1113
+#: src/nntplib.c:1122
 msgid "437  Article rejected, don't resend"
 msgstr ""
 
-#: src/nntplib.c:1117
+#: src/nntplib.c:1126
 msgid "440  Posting not allowed"
 msgstr ""
 
-#: src/nntplib.c:1121
+#: src/nntplib.c:1130
 msgid "441  Posting failed"
 msgstr ""
 
-#: src/nntplib.c:1125
+#: src/nntplib.c:1134
 msgid "480  authorization required for command"
 msgstr ""
 
-#: src/nntplib.c:1129
+#: src/nntplib.c:1138
 msgid "481  Authorization system invalid"
 msgstr ""
 
-#: src/nntplib.c:1133
+#: src/nntplib.c:1142
 msgid "482  Authorization data rejected"
 msgstr ""
 
-#: src/nntplib.c:1137
+#: src/nntplib.c:1146
 msgid "483  Invalid alias on spooldir cmd"
 msgstr ""
 
-#: src/nntplib.c:1141
+#: src/nntplib.c:1150
 msgid "484  No spooldir file found"
 msgstr ""
 
-#: src/nntplib.c:1145
+#: src/nntplib.c:1154
 msgid "500  Command not recognized"
 msgstr ""
 
-#: src/nntplib.c:1149
+#: src/nntplib.c:1158
 msgid "501  Command syntax error"
 msgstr ""
 
-#: src/nntplib.c:1153
+#: src/nntplib.c:1162
 msgid "502  Access to server denied"
 msgstr ""
 
-#: src/nntplib.c:1158
+#: src/nntplib.c:1167
 msgid "503  Program fault, command not performed"
 msgstr ""
 
-#: src/nntplib.c:1162
+#: src/nntplib.c:1171
 msgid "580  Authorization Failed"
 msgstr ""
 
-#: src/nntplib.c:1166
+#: src/nntplib.c:1175
 msgid "Unknown NNTP response code"
 msgstr ""
 
@@ -5975,22 +5993,22 @@ msgstr ""
 msgid "couldn't expand %s\n"
 msgstr ""
 
-#: src/open.c:1103
+#: src/open.c:1040
 msgid "Unreachable?\n"
 msgstr ""
 
-#: src/post.c:1712
+#: src/post.c:1749
 #, c-format
 msgid "%s is bogus"
 msgstr ""
 
-#: src/post.c:1903
+#: src/post.c:1940
 #, c-format
 msgid "Posting: %.*s ..."
 msgstr ""
 
 #. TODO: -> lang.c
-#: src/post.c:4012
+#: src/post.c:4037
 #, c-format
 msgid "Rereading %s..."
 msgstr ""
@@ -6063,12 +6081,12 @@ msgstr ""
 msgid "Can't run slrnface: couldn't construct fifo name."
 msgstr ""
 
-#: src/xface.c:151
+#: src/xface.c:162
 #, c-format
 msgid "Slrnface abnormally exited, code %d."
 msgstr ""
 
-#: src/xface.c:195
+#: src/xface.c:206
 #, c-format
 msgid "Slrnface failed: %s."
 msgstr ""
diff -Nurp tin-1.5.18/src/Makefile.in tin-1.6.0/src/Makefile.in
--- tin-1.5.18/src/Makefile.in	Fri May 16 14:23:27 2003
+++ tin-1.6.0/src/Makefile.in	Sat Jul 12 15:49:46 2003
@@ -1,7 +1,7 @@
 # Source Makefile for tin
 # - for configuration options read the ../doc/INSTALL file.
 #
-# Updated: 2003-05-16
+# Updated: 2003-06-04
 #
 # Copyright (c) 1995-2003 Thomas E. Dickey <dickey@invisible-island.net>
 # All rights reserved.
@@ -62,7 +62,7 @@ LDFLAGS	= @LDFLAGS@
 YACC	= @YACC@
 
 CANLIB		= # -L../libcanlock -lcanlock
-INTL_LIBS	= @INTLDIR_MAKE@ @INTLLIBS@
+INTL_LIBS	= @INTLLIBS@
 PCRE_LIBS	= @PCREDIR_LIBS@ @PCREDIR_MAKE@ -L../pcre -lpcre
 LIBS		= $(PCRE_LIBS) $(CANLIB) @LIBS@ @INN_NNTPLIB@ $(INTL_LIBS)
 
@@ -476,6 +476,7 @@ $(OBJDIR)/color.o:		$(SRCDIR)/color.c $(
 $(OBJDIR)/config.o:		$(SRCDIR)/config.c $(TIN_DEP) \
 				tincfg.h \
 				$(INCDIR)/menukeys.h \
+				$(INCDIR)/tnntp.h \
 				$(INCDIR)/version.h
 $(OBJDIR)/curses.o:		$(SRCDIR)/curses.c $(TIN_DEP) \
 				$(INCDIR)/tnntp.h
@@ -525,7 +526,8 @@ $(OBJDIR)/misc.o:		$(SRCDIR)/misc.c $(TI
 				$(INCDIR)/policy.h \
 				$(INCDIR)/rfc2046.h
 $(OBJDIR)/my_tmpfile.o:		$(SRCDIR)/my_tmpfile.c $(TIN_DEP)
-$(OBJDIR)/newsrc.o:		$(SRCDIR)/newsrc.c $(TIN_DEP)
+$(OBJDIR)/newsrc.o:		$(SRCDIR)/newsrc.c $(TIN_DEP) \
+				$(INCDIR)/tnntp.h
 $(OBJDIR)/nntplib.o:		$(SRCDIR)/nntplib.c $(TIN_DEP) \
 				$(INCDIR)/tnntp.h
 $(OBJDIR)/nrctbl.o:		$(SRCDIR)/nrctbl.c $(TIN_DEP) \
diff -Nurp tin-1.5.18/src/active.c tin-1.6.0/src/active.c
--- tin-1.5.18/src/active.c	Thu May  8 23:09:37 2003
+++ tin-1.6.0/src/active.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : active.c
  *  Author    : I. Lea
  *  Created   : 1992-02-16
- *  Updated   : 2003-04-22
+ *  Updated   : 2003-06-29
  *  Notes     :
  *
  * Copyright (c) 1992-2003 Iain Lea <iain@bricbrac.de>
@@ -62,7 +62,6 @@ static time_t active_timestamp;	/* time 
 /*
  * Local prototypes
  */
-static int find_newnews_index(char *cur_newnews_host);
 static void active_add(struct t_group *ptr, long count, long max, long min, const char *moderated);
 static void append_group_line(char *active_file, char *group_path, long art_max, long art_min, char *base_dir);
 static void check_for_any_new_groups(void);
@@ -609,7 +608,6 @@ check_for_any_new_groups(
 	char *autosubscribe, *autounsubscribe;
 	char *ptr, *line, buf[NNTP_STRLEN];
 	char old_newnews_host[PATH_LEN];
-	char new_newnews_host[PATH_LEN];
 	int newnews_index;
 	time_t old_newnews_time;
 	time_t new_newnews_time;
@@ -618,16 +616,15 @@ check_for_any_new_groups(
 		wait_message(0, _(txt_checking_new_groups));
 
 	(void) time(&new_newnews_time);
-	strcpy(new_newnews_host, (read_news_via_nntp ? nntp_server : "local")); /* What if nntp server called local? */
 
 	/*
 	 * find out if we have read news from here before otherwise -1
 	 */
-	if ((newnews_index = find_newnews_index(new_newnews_host)) >= 0) {
-		strcpy(old_newnews_host, newnews[newnews_index].host);
+	if ((newnews_index = find_newnews_index(nntp_server)) >= 0) {
+		STRCPY(old_newnews_host, newnews[newnews_index].host);
 		old_newnews_time = newnews[newnews_index].time;
 	} else {
-		strcpy(old_newnews_host, "UNKNOWN");
+		STRCPY(old_newnews_host, "UNKNOWN");
 		old_newnews_time = (time_t) 0;
 	}
 
@@ -673,7 +670,7 @@ check_for_any_new_groups(
 	if (newnews_index >= 0)
 		newnews[newnews_index].time = new_newnews_time;
 	else {
-		sprintf(buf, "%s %lu", new_newnews_host, (unsigned long int) new_newnews_time);
+		sprintf(buf, "%s %lu", nntp_server, (unsigned long int) new_newnews_time);
 		load_newnews_info(buf);
 	}
 }
@@ -860,9 +857,9 @@ load_newnews_info(
 /*
  * Return the index of cur_newnews_host in newnews[] or -1 if not found
  */
-static int
+int
 find_newnews_index(
-	char *cur_newnews_host)
+	const char *cur_newnews_host)
 {
 	int i;
 
diff -Nurp tin-1.5.18/src/art.c tin-1.6.0/src/art.c
--- tin-1.5.18/src/art.c	Wed May 21 19:14:31 2003
+++ tin-1.6.0/src/art.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : art.c
  *  Author    : I.Lea & R.Skrenta
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-06-29
  *  Notes     :
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>, Rich Skrenta <skrenta@pbm.com>
@@ -48,15 +48,19 @@
 #	endif /* !STPWATCH_H */
 #endif /* PROFILE */
 
+/*
+ * TODO: fixup to remove CURR_GROUP dependency in all sort funcs
+ */
 #define SortBy(func)	qsort(arts, (size_t) top_art, sizeof(struct t_article), func);
 
 static long last_read_article;
-static t_bool overview_index_filename = FALSE;
 int top_art = 0;				/* # of articles in arts[] */
 
 /*
  * Local prototypes
  */
+static FILE *open_xover_fp(struct t_group *group, const char *mode, long min, long max, t_bool local);
+static char *find_nov_file(struct t_group *group, int mode);
 static char *print_date(time_t secs);
 static char *print_from(struct t_article *article);
 static int artnum_comp(t_comptype p1, t_comptype p2);
@@ -65,7 +69,7 @@ static int from_comp(t_comptype p1, t_co
 static int global_get_multiparts(int aindex, MultiPartInfo **malloc_and_setme_info);
 static int global_look_for_multipart_info(int aindex, MultiPartInfo *setme, char start, char stop, int *offset);
 static int lines_comp(t_comptype p1, t_comptype p2);
-static int read_nov_file(struct t_group *group, long min, long max, int *expired);
+static int read_nov_file(struct t_group *group, long min, long max, int *expired, t_bool local);
 static int read_group(struct t_group *group, int *pcount);
 static int score_comp(t_comptype p1, t_comptype p2);
 static int score_comp_base(t_comptype p1, t_comptype p2);
@@ -73,6 +77,7 @@ static int subj_comp(t_comptype p1, t_co
 static int valid_artnum(long art);
 static long find_first_unread(struct t_group *group);
 static t_bool parse_headers(FILE *fp, struct t_article *h);
+static t_compfunc eval_sort_arts_func(unsigned int sort_art_type);
 static void sort_base(unsigned int sort_threads_type);
 static void thread_by_subject(void);
 static void thread_by_multipart(void);
@@ -167,6 +172,7 @@ index_group(
 	int modified;
 	long min;
 	long max;
+	t_bool caching_xover;
 	t_bool filtered;
 
 	if (group == NULL)
@@ -184,10 +190,10 @@ index_group(
 	/*
 	 * Load articles within min..max from xover index file if it exists
 	 * and then create base[] article numbers from loaded articles.
-	 * If nov file does not exist then create base[] with setup_base().
+	 * If nov file does not exist then create base[] with setup_hard_base().
 	 */
 #ifdef PROFILE
-	BegStopWatch("setup_base");
+	BegStopWatch("setup_hard_base");
 #endif /* PROFILE */
 
 	if (setup_hard_base(group) < 0)
@@ -222,17 +228,37 @@ index_group(
 	if (max < 0)
 		return FALSE;
 
+	top_art = 0;
+	last_read_article = 0L;
+
 	/*
-	 * Read in the existing index via XOVER or the index file
+	 * Read in the existing overview
+	 * This read has local=TRUE set if locally caching XOVER records to ensure
+	 * we pull in any private overview caches in preference to using using OVER
+	 *
+	 * When reading local spool, this will pull in the system wide overview
+	 * cache (if found) otherwise the private overview cache will be read
 	 */
-	if (read_nov_file(group, min, max, &expired) == -1)
+	caching_xover = (tinrc.cache_overview_files && xover_cmd && group->type == GROUP_TYPE_NEWS);
+
+	if (read_nov_file(group, min, max, &expired, caching_xover) == -1)
 		return FALSE;	/* user aborted indexing */
 
 	/*
+	 * Fill in the range last_read_article...max using XOVER
+	 * Only do this if the previous read_nov_file() was against private cache
+	 */
+	if ((last_read_article < max) && caching_xover) {
+		if (read_nov_file(group, (last_read_article >= min) ? last_read_article + 1 : min, max, &expired, FALSE) == -1)
+			return FALSE;	/* user aborted indexing */
+	} else
+		caching_xover = FALSE;
+
+	/*
 	 * Add any articles to arts[] that are new or were killed
 	 */
 	if ((modified = read_group(group, &count)) == -1)
-		return FALSE;	/* user aborted indexing */
+		return FALSE;		/* user aborted indexing */
 
 	/*
 	 * Do this before calling art_mark(,, ART_READ) if you want
@@ -261,7 +287,10 @@ index_group(
 		}
 	}
 
-	if (expired || modified || tinrc.cache_overview_files)
+	/*
+	 * Only rewrite the index if it has changed
+	 */
+	if (expired || modified || caching_xover)
 		write_nov_file(group);
 
 	/*
@@ -314,11 +343,18 @@ find_first_unread(
 
 
 /*
- * Index a group. Assumes any existing NOV index has already been loaded.
+ * Called after XOVER/local/private overview databases have been loaded
+ * Read and parse in headers for any arts not already found (usually
+ * new articles that have not been indexed yet)
+ * Already present articles that pass valid_artnum() have their
+ * ->thread set to ART_NORMAL, as do any new articles that are added.
+ *
  * Return values are:
- *    1   loaded index and modified it
- *    0   loaded index but not modified
- *   -1   user aborted indexing operation
+ *    1   Additional articles were read in
+ *    0   No additional (new) articles were found
+ *   -1   user aborted during read
+ * TODO: think of a function name that sucks less
+ * TODO: *pcount isn't used by the caller (index_group)
  */
 static int
 read_group(
@@ -705,7 +741,7 @@ thread_by_multipart(
  *
  * Apart from THREAD_NONE, .thread and .prev are used, the
  * first article in a thread should have .prev set to ART_NORMAL, the
- * rest >= 0. Only do unexprired articles we haven't visited yet
+ * rest >= 0. Only do unexpired articles we haven't visited yet
  * (arts[].thread == -1 ART_NORMAL).
  *
  * The rethread parameter is a misnomer. Its only effect (if set) is
@@ -798,44 +834,49 @@ make_threads(
 	find_base(group);
 }
 
-
-void
-sort_arts(
+static t_compfunc
+eval_sort_arts_func(
 	unsigned int sort_art_type)
 {
 	switch (sort_art_type) {
 		case SORT_ARTICLES_BY_NOTHING:		/* don't sort at all */
-			SortBy(artnum_comp);
-			break;
+			return artnum_comp;
 
 		case SORT_ARTICLES_BY_SUBJ_DESCEND:
 		case SORT_ARTICLES_BY_SUBJ_ASCEND:
-			SortBy(subj_comp);
-			break;
+			return subj_comp;
 
 		case SORT_ARTICLES_BY_FROM_DESCEND:
 		case SORT_ARTICLES_BY_FROM_ASCEND:
-			SortBy(from_comp);
-			break;
+			return from_comp;
 
 		case SORT_ARTICLES_BY_DATE_DESCEND:
 		case SORT_ARTICLES_BY_DATE_ASCEND:
-			SortBy(date_comp);
-			break;
+			return date_comp;
 
 		case SORT_ARTICLES_BY_SCORE_DESCEND:
 		case SORT_ARTICLES_BY_SCORE_ASCEND:
-			SortBy(score_comp);
-			break;
+			return score_comp;
 
 		case SORT_ARTICLES_BY_LINES_DESCEND:
 		case SORT_ARTICLES_BY_LINES_ASCEND:
-			SortBy(lines_comp);
-			break;
+			return lines_comp;
 
 		default:
 			break;
 	}
+	return NULL;
+}
+
+
+void
+sort_arts(
+	unsigned int sort_art_type)
+{
+	t_compfunc comp_func = eval_sort_arts_func(sort_art_type);
+
+	if (comp_func)
+		SortBy(comp_func);
 }
 
 
@@ -853,9 +894,10 @@ sort_base(
 
 
 /*
- * This is only called when no overview files exist. Code reads (max_lineno)
- * lines of article, presumably to catch headers like Archive-name: which are
- * not normally included in XOVER or even the normal block of headers.
+ * This is called to get header info for articles not already found in the
+ * overview files.
+ * Code reads (max_lineno) lines of article to catch headers like Archive-name:
+ * which are not normally included in XOVER or even the normal block of headers.
  * How this is supposed to be useful when 99% of the time we'll have overview
  * data I don't know...
  * TODO: move Archive-name: parsing to article body parsing, remove the
@@ -1028,6 +1070,10 @@ parse_headers(
 /*
  * Read in an Nov/Xover index file. Fields are separated by TAB.
  * return the new value of 'top_art' or -1 if user quit partway.
+ * TODO: rewrite parser using strtok() or some other separator
+ *       based function
+ * If 'local' is set then always open local overview cache in
+ * preference to NNTP XOVER
  *
  * Format:
  * 	1. article number (ie. 183)                [mandatory]
@@ -1045,7 +1091,8 @@ read_nov_file(
 	struct t_group *group,
 	long min,
 	long max,
-	int *expired)
+	int *expired,
+	t_bool local)
 {
 	FILE *fp;
 	char *p, *q;
@@ -1054,33 +1101,12 @@ read_nov_file(
 	char art_from_addr[HEADER_LEN];
 	long artnum;
 
-	top_art = 0;
-	last_read_article = 0L;
 	*expired = 0;
 
 	/*
-	 * Call ourself recursively to read the cached overview file, if we are
-	 * supposed to be doing NNTP caching and we aren't already the recursive
-	 * instance. (Turn off read_news_via_nntp while we're recursing so we
-	 * will know we're recursing while we're doing it.) If there aren't
-	 * any new articles, just return, without going on to read the NNTP
-	 * overview file. If we're going to read from NNTP, adjust min to the
-	 * next article past last_read_article; there's no reason to read them
-	 * from NNTP if they're cached locally.
-	 */
-	if (tinrc.cache_overview_files && read_news_via_nntp && xover_supported && group->type == GROUP_TYPE_NEWS) {
-		read_news_via_nntp = FALSE;
-		read_nov_file(group, min, max, expired);
-		read_news_via_nntp = TRUE;
-		if (last_read_article >= max)
-			return top_art;
-		if (last_read_article >= min)
-			min = last_read_article + 1;
-	}
-	/*
 	 * open the overview file (whether it be local or via nntp)
 	 */
-	if ((fp = open_xover_fp(group, "r", min, max)) == NULL)
+	if ((fp = open_xover_fp(group, "r", min, max, local)) == NULL)
 		return top_art;
 
 	if (group->xmax > max)
@@ -1107,6 +1133,7 @@ read_nov_file(
 		artnum = atol(p);
 
 		/* catches case of 1st line being groupname (i.e. local cached overviews) */
+		/* TODO: so test the group name properly then ? */
 		if (artnum <= 0)
 			continue;
 
@@ -1122,7 +1149,7 @@ read_nov_file(
 		 * artnum in overview data higher than groups high mark
 		 *
 		 * TODO: - warn user about broken overviews?
-		 *       - try to parse the Xref:-line to get the crrect artnum
+		 *       - try to parse the Xref:-line to get the correct artnum
 		 *       - see also parse_unread_arts()
 		 */
 		if (artnum > group->xmax)
@@ -1350,49 +1377,25 @@ write_nov_file(
 	struct t_group *group)
 {
 	FILE *fp;
-	char *nov_file;
-	char tmp[PATH_LEN];
 	int i;
 	struct t_article *article;
 
 	/*
-	 * Don't write local index if we have XOVER, unless the user has
-	 * asked for caching.
+	 * Can't write or caching is off
 	 */
-	if (no_write || (read_news_via_nntp && xover_supported && !tinrc.cache_overview_files))
+	if (no_write || !tinrc.cache_overview_files)
 		return;
 
-	/*
-	 * TODO: don't write cached overviews if:
-	 *       !read_news_via_nntp && !tinrc.cache_overview_files &&
-	 *       data in novrootdir are correct overviews
-	 */
-
-	/*
-	 * setup the overview file (local only)
-	 *
-	 * don't write an overview file if R_OK returns a different name
-	 * than W_OK, since we won't read it anyway.
-	 */
-	STRCPY(tmp, ((((nov_file = find_nov_file(group, R_OK)) != 0)) ? nov_file : ""));
-	nov_file = find_nov_file(group, W_OK);
-	if (strcmp(tmp, nov_file))
+	if ((fp = open_xover_fp(group, "w", 0L, 0L, FALSE)) == NULL)
 		return;
 
-#ifdef DEBUG
-	if (debug)
-		error_message("WRITE file=[%s]", nov_file);
-#endif /* DEBUG */
-
-	if ((fp = open_xover_fp(group, "w", 0L, 0L)) == NULL) {
-		error_message(_(txt_cannot_write_index), nov_file);
-		return;
-	}
 	if (group->attribute->sort_art_type != SORT_ARTICLES_BY_NOTHING)
 		SortBy(artnum_comp);
 
-	if (!overview_index_filename)
-		fprintf(fp, "%s\n", group->name);
+	/*
+	 * Needed to preserve uniqueness in hashed private overview files
+	 */
+	fprintf(fp, "%s\n", group->name);
 
 	for_each_art(i) {
 		article = &arts[i];
@@ -1459,126 +1462,166 @@ write_nov_file(
 
 
 /*
- * A complex little function to determine where to read the index file
- * from and where to write it.
+ * A complex little function to determine the correct overview index file
+ * according to 'mode' (read or write)
+ * NULL is returned if the current setup dictates otherwise
  *
  * GROUP_TYPE_MAIL index files are read/written in ~/.tin/.mail
- *
  * GROUP_TYPE_SAVE index files are read/written in ~/.tin/.save
  *
- * GROUP_TYPE_NEWS index files are a little bit more complex :(
- * READ:
- *    if  reading via NNTP
- *       path = TMPDIR/num.idx
- *       hash = FALSE
- *    else if  SPOOLDIR/group/name/.overview exists
- *       path = SPOOLDIR/group/name/.overview
- *    else if  SPOOLDIR/.news exists
- *       path = SPOOLDIR/.news
- *       hash = TRUE
- *    else
- *       path = ~/.tin/.news
- *       hash = TRUE
- *
- * WRITE:
- *    if SPOOLDIR/group/name writable
- *       path = SPOOLDIR/group/name/.overview
- *       hash = FALSE
- *    else if SPOOLDIR/.news exists AND writable
- *       path = SPOOLDIR/.news
- *       hash = TRUE
- *    else
- *       path = ~/.tin/.news
- *       hash = TRUE
+ * Both of these are hashed
+ *
+ * GROUP_TYPE_NEWS index files are a little bit more complex
  *
- * If hash = TRUE the index filename will be in format number.number.
+ * When hashing the index filename will be in format number.number.
  * Hashing the groupname gets a number. See if that #.1 file exists;
  * if so, read first line. Is this the group we want? If no, try #.2.
  * Repeat until no such file or we find an existing file that matches
  * our group. Return pointer to path or NULL if not found.
  */
-char *
+static char *
 find_nov_file(
 	struct t_group *group,
 	int mode)
 {
+	FILE *fp;
 	const char *dir;
 	char buf[PATH_LEN];
+	int i;
+	struct stat sb;
+	unsigned long hash;
 	static char nov_file[PATH_LEN];
-	t_bool hash_filename;
+	static t_bool once_only = FALSE;	/* Trap things that are done only 1 time */
 
-	if (group == NULL)
+	if (group == NULL || (mode != R_OK && mode != W_OK))
 		return NULL;
 
-	overview_index_filename = FALSE;	/* Write groupname in nov file? (FALSE means write) */
-	hash_filename = FALSE;
-	dir = "";
-
 	switch (group->type) {
 		case GROUP_TYPE_MAIL:
 			dir = index_maildir;
-			hash_filename = TRUE;
 			break;
 
 		case GROUP_TYPE_SAVE:
 			dir = index_savedir;
-			hash_filename = TRUE;
 			break;
 
 		case GROUP_TYPE_NEWS:
-			if (read_news_via_nntp && xover_supported && !tinrc.cache_overview_files)
-				/* what is this good for? */
-				snprintf(nov_file, sizeof(nov_file), "%s%d.idx", TMPDIR, (int) process_id);
-			else {
+			/*
+			 * xover_cmd is not an issue here, any gripes and warnings
+			 * about XOVER are handled in nntp_open()
+			 */
+
+			/*
+			 * When reading via NNTP, system wide overviews are irrelevent, of
+			 * course, and the private overview filename will be the same for
+			 * both reading and writing.
+			 *
+			 * When working locally, we only use a private cache for reading
+			 * if requested and when system wide overviews don't already exist.
+			 * When writing then only private overviews can be used since
+			 * updating system wide overviews is not safe wrt locking etc.
+			 *
+			 * See if local overview file $SPOOLDIR/<groupname>/.overview exists
+			 */
 #ifndef NNTP_ONLY
+			if (!read_news_via_nntp) {
 				make_base_group_path(novrootdir, group->name, buf);
 				joinpath(nov_file, buf, novfilename);
-				if (mode == R_OK || mode == W_OK) {		/* This MUST be true ? */
-					if (!access(nov_file, mode))
-						overview_index_filename = TRUE;
-				}
-#endif /* !NNTP_ONLY */
-				if (!overview_index_filename) {
-					dir = index_newsdir;
-					hash_filename = TRUE;
+				if (access(nov_file, R_OK) == 0) {
+					if (mode == R_OK)
+						return nov_file;		/* Use system wide overviews */
+					else
+						return NULL;			/* Don't write cache in this case */
 				}
 			}
+#endif /* NNTP_ONLY */
+
+			/*
+			 * We only get here when private overviews are going to be used
+			 * Go no further if they are explicitly turned off
+			 */
+			if (!tinrc.cache_overview_files)
+				return NULL;
+
+			/*
+			 * Append -<nntpserver> to private cache dir
+			 */
+			if (!once_only && nntp_server) {
+				const char *from;
+				char *to;
+				int c;
+
+				to = index_newsdir + strlen(index_newsdir);
+				*(to++) = '-';
+				for (from = nntp_server; (c = *from) != 0; ++from)
+					*(to++) = tolower(c);
+				*to = '\0';
+				once_only = TRUE;
+			}
+
+			/*
+			 * Only try to set up the private cache when writing. If it
+			 * doesn't exist yet, then ergo we can't read from it.
+			 * The cache will be checked/created on every write; a previous
+			 * bug report complained that this was not the case
+			 */
+			if (stat(index_newsdir, &sb) == -1) {			/* Private cache doesn't exist */
+				if (mode == R_OK)
+					return NULL;
+				if (my_mkdir(index_newsdir, (mode_t) S_IRWXU) != 0)
+					return NULL;
+			} else {
+				if (!S_ISDIR(sb.st_mode))
+					return NULL;
+			}
+
+			/*
+			 * Update the newsgroups cache to point to the new location
+			 * now that we know it is valid
+			 */
+			if (!once_only)
+				joinpath(local_newsgroups_file, index_newsdir, NEWSGROUPS_FILE);
+
+			dir = index_newsdir;
 			break;
 
 		default: /* not reached */
-			break;
+			return NULL;
 	}
 
-	if (hash_filename) {
-		FILE *fp;
+	/*
+	 * We only get here if writing to a private overview.
+	 * These always have hashed filenames.
+	 * Try <hash>.<seqno> and check the group name tagline until
+	 * matching index file is found. If not found return next unused
+	 * filename
+	 */
+	hash = hash_groupname(group->name);
+
+	for (i = 1; ; i++) {
 		char *ptr;
-		int i;
-		unsigned long hash = hash_groupname(group->name);
 
-		for (i = 1; ; i++) {
-			snprintf(buf, sizeof(buf), "%lu.%d", hash, i);
-			joinpath(nov_file, dir, buf);
+		snprintf(buf, sizeof(buf), "%lu.%d", hash, i);
+		joinpath(nov_file, dir, buf);
 
-			if ((fp = fopen(nov_file, "r")) == NULL)
-				return nov_file;
+		if ((fp = fopen(nov_file, "r")) == NULL)
+			return nov_file;
 
-			/*
-			 * Don't follow, why should a zero length index file
-			 * cause the write to fail ?
-			 */
-			if (fgets(buf, (int) sizeof(buf), fp) == NULL) {
-				fclose(fp);
-				return nov_file;
-			}
+		/*
+		 * No group name header, so not a valid index file => overwrite it
+		 */
+		if (fgets(buf, (int) sizeof(buf), fp) == NULL) {
 			fclose(fp);
+			return nov_file;
+		}
+		fclose(fp);
 
-			if ((ptr = strrchr(buf, '\n')) != NULL)
-				*ptr = '\0';
+		if ((ptr = strrchr(buf, '\n')) != NULL)
+			*ptr = '\0';
 
-			if (STRCMPEQ(buf, group->name))
-				return nov_file;
+		if (STRCMPEQ(buf, group->name))
+			return nov_file;
 
-		}
 	}
 
 	return nov_file;
@@ -1766,7 +1809,7 @@ score_comp(
 		if (s2->score > s1->score)
 			return 1;
 	}
-	return 0;
+	return s1->date - s2->date > 0 ? 1 : -1;
 }
 
 
@@ -1794,7 +1837,7 @@ lines_comp(
 		if (s2->line_count > s1->line_count)
 			return 1;
 	}
-	return 0;
+	return s1->date - s2->date > 0 ? 1 : -1;
 }
 
 
@@ -1809,18 +1852,22 @@ score_comp_base(
 	int a = get_score_of_thread(*(const long *)p1);
 	int b = get_score_of_thread(*(const long *)p2);
 
-	if (CURR_GROUP.attribute->sort_threads_type == SORT_THREADS_BY_SCORE_ASCEND) {
-		if (a > b)
-			return 1;
-		if (a < b)
-			return -1;
-	} else {
-		if (a < b)
-			return 1;
-		if (a > b)
-			return -1;
+	/* If scores are equal, compare using the article sort order.
+	 * This determines the order in a group of equally scored threads.
+	 */
+	if (a == b) {
+		const struct t_article *s1 = &arts[*(const long *)p1];
+		const struct t_article *s2 = &arts[*(const long *)p2];
+		t_compfunc comp_func = eval_sort_arts_func(CURR_GROUP.attribute->sort_art_type);
+
+		if (comp_func)
+			return (*comp_func)(s1, s2);
+		return 0;
 	}
-	return 0;
+
+	if (CURR_GROUP.attribute->sort_threads_type == SORT_THREADS_BY_SCORE_ASCEND)
+		return a > b ? 1 : -1;
+	return a < b ? 1 : -1;
 }
 
 
@@ -1887,6 +1934,8 @@ valid_artnum(
 }
 
 
+/*----------------------------- Overview handling -----------------------*/
+
 static char *
 print_date(
 	time_t secs)
@@ -1932,4 +1981,40 @@ print_from(
 		STRCPY(from, article->from);
 
 	return from;
+}
+
+
+/*
+ * Open a group news overview file
+ * Use NNTP XOVER where possible unless 'local' is set
+ */
+static FILE *
+open_xover_fp(
+	struct t_group *group,
+	const char *mode,
+	long min,
+	long max,
+	t_bool local)
+{
+#ifdef NNTP_ABLE
+	if (!local && xover_cmd && *mode == 'r' && group->type == GROUP_TYPE_NEWS) {
+		char line[NNTP_STRLEN];
+
+		sprintf(line, "%s %ld-%ld", xover_cmd, min, max);
+		return (nntp_command(line, OK_XOVER, NULL, 0));
+	} else
+#endif /* NNTP_ABLE */
+	{
+		FILE *fp;
+		char *nov_file = find_nov_file(group, (*mode == 'r') ? R_OK : W_OK);
+
+		if (nov_file != NULL) {
+			if ((fp = fopen(nov_file, mode)) != NULL)
+				return fp;
+
+			if (*mode != 'r')
+				error_message(_(txt_cannot_open), nov_file);
+		}
+		return NULL;
+	}
 }
diff -Nurp tin-1.5.18/src/config.c tin-1.6.0/src/config.c
--- tin-1.5.18/src/config.c	Thu May 15 16:42:00 2003
+++ tin-1.6.0/src/config.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : config.c
  *  Author    : I. Lea
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-07-02
  *  Notes     : Configuration file routines
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>
@@ -50,6 +50,9 @@
 #ifndef MENUKEYS_H
 #	include "menukeys.h"
 #endif /* !MENUKEYS_H */
+#ifndef TNNTP_H
+#	include "tnntp.h"
+#endif /* TNNTP_H */
 
 /*
  * local prototypes
@@ -68,6 +71,7 @@ static void print_option(enum option_enu
 static void redraw_screen(int option);
 static void show_config_page(void);
 static void unhighlight_option(int option);
+static void write_server_config(void);
 #ifdef HAVE_COLOR
 	static t_bool match_color(char *line, const char *pat, int *dst, int max);
 #endif /* HAVE_COLOR */
@@ -1306,8 +1310,18 @@ write_config_file(
 	fprintf(fp, _(txt_tinrc_newnews));
 	{
 		char timestring[30];
+		int j = find_newnews_index(nntp_server);
 
+		/*
+		 * Newnews timestamps in tinrc are bogus as of tin 1.5.19 because they
+		 * are now stored in a separate file to prevent overwriting them from
+		 * another instance running concurrently. Except for the current server,
+		 * however, we must remember them because otherwise we would lose them
+		 * after the first start of a tin 1.5.19 (or later) version.
+		 */
 		for (i = 0; i < num_newnews; i++) {
+			if (i == j)
+				continue;
 			if (my_strftime(timestring, sizeof(timestring) - 1, "%Y-%m-%d %H:%M:%S UTC", gmtime(&(newnews[i].time))))
 				fprintf(fp, "newnews=%s %lu (%s)\n", newnews[i].host, (unsigned long int) newnews[i].time, timestring);
 		}
@@ -1321,6 +1335,7 @@ write_config_file(
 		rename_file(file_tmp, file);
 
 	free(file_tmp);
+	write_server_config();
 }
 
 
@@ -1543,14 +1558,8 @@ unhighlight_option(
 
 /*
  * Refresh the config page which holds the actual option. If act_option is
- * zero fall back on the last given option; if even that is not present,
- * use 1 (first option) as fall back value. Note that act_option is the
- * number shown on the screen, not the index in option_table (which is
- * one smaller). Set force_redraw to TRUE if you want to enforce a refresh,
- * and to FALSE if you want to refresh the screen only when necessary
- * (needed by signal.c: config_resize(); the resizing could result in
- * first_option_on_page == actual_top_option even if there are now more/less
- * options on the screen than before).
+ * smaller zero fall back on the last given option (first option if there was
+ * no last option) and refresh the screen.
  */
 void
 refresh_config_page(
@@ -1941,9 +1950,11 @@ change_config_file(
 
 								group->attribute->thread_arts = tinrc.thread_articles;
 								make_threads(group, TRUE);
-								/* update cursor position */
-								if ((n = which_thread(old_base_art)) >= 0)
-									grpmenu.curr = n;
+								/* in non-empty groups update cursor position */
+								if (grpmenu.max > 0) {
+									if ((n = which_thread(old_base_art)) >= 0)
+										grpmenu.curr = n;
+								}
 							}
 							clear_message();
 							break;
@@ -2824,4 +2835,121 @@ rc_update(
 
 	rewind(fp);
 	return TRUE;
+}
+
+
+void
+read_server_config(
+	void)
+{
+	FILE *fp;
+	char *line;
+	char file[PATH_LEN];
+	char newnews_info[LEN];
+	char serverdir[PATH_LEN];
+	char version[LEN];
+	int upgrade = RC_CHECK;
+
+#ifdef NNTP_ABLE
+	if (read_news_via_nntp && !read_saved_news && nntp_tcp_port != IPPORT_NNTP)
+		snprintf(file, sizeof(file), "%s:%d", nntp_server, nntp_tcp_port);
+	else
+#endif /* NNTP_ABLE */
+	{
+		STRCPY(file, nntp_server);
+	}
+	JOINPATH(serverdir, rcdir, file);
+	joinpath(file, serverdir, SERVERCONFIG_FILE);
+
+	if ((fp = fopen(file, "r")) == NULL)
+		return;
+	while (NULL != (line = tin_fgets(fp, FALSE))) {
+		if (('#' == *line) || ('\0' == *line))
+			continue;
+
+		if (match_string(line, "last_newnews=", newnews_info, sizeof(newnews_info))) {
+			int tmp_len = strlen(nntp_server) + strlen(newnews_info) + 2;
+			char *tmp_info = my_malloc(tmp_len);
+
+			snprintf(tmp_info, tmp_len, "%s %s", nntp_server, newnews_info);
+			load_newnews_info(tmp_info);
+			free(tmp_info);
+			break;
+		}
+		if (match_string(line, "version=", version, sizeof(version))) {
+			if (RC_CHECK != upgrade)
+				/* ignore duplicate version lines; first match counts */
+				break;
+			upgrade = check_upgrade(line, "version=", SERVERCONFIG_VERSION);
+			if (RC_IGNORE == upgrade)
+				/* Expected version number; nothing to do -> continue */
+				break;
+
+			/* Nothing to do yet for RC_UPGRADE and RC_DOWNGRADE */
+			break;
+		}
+	}
+	fclose(fp);
+}
+
+
+static void
+write_server_config(
+	void)
+{
+	FILE *fp;
+	char *file_tmp;
+	char file[PATH_LEN];
+	char timestring[30];
+	char serverdir[PATH_LEN];
+	int i;
+	struct stat statbuf;
+
+	if (read_saved_news)
+		/* don't update server files while reading locally stored articles */
+		return;
+#ifdef NNTP_ABLE
+	if (read_news_via_nntp && nntp_tcp_port != IPPORT_NNTP)
+		snprintf(file, sizeof(file), "%s:%d", nntp_server, nntp_tcp_port);
+	else
+#endif /* NNTP_ABLE */
+	{
+		STRCPY(file, nntp_server);
+	}
+	JOINPATH(serverdir, rcdir, file);
+	joinpath(file, serverdir, SERVERCONFIG_FILE);
+
+	if ((no_write || post_article_and_exit || post_postponed_and_exit) && file_size(file) != -1L)
+		return;
+
+	if (-1 == stat(serverdir, &statbuf)) {
+		if (-1 == my_mkdir(serverdir, (mode_t) (S_IRWXU)))
+			/* Can't create directory TODO: Add error handling */
+			return;
+	}
+
+	/* generate tmp-filename */
+	file_tmp = get_tmpfilename(file);
+
+	if ((fp = fopen(file_tmp, "w")) == NULL) {
+		error_message(_(txt_filesystem_full_backup), SERVERCONFIG_FILE);
+		free(file_tmp);
+		return;
+	}
+
+	fprintf(fp, _(txt_serverconfig_header), PRODUCT, tin_progname, VERSION, RELEASEDATE, RELEASENAME, PRODUCT, PRODUCT);
+	fprintf(fp, "version=%s\n", SERVERCONFIG_VERSION);
+
+	if ((i = find_newnews_index(nntp_server)) >= 0)
+		if (my_strftime(timestring, sizeof(timestring) - 1, "%Y-%m-%d %H:%M:%S UTC", gmtime(&(newnews[i].time))))
+			fprintf(fp, "last_newnews=%lu (%s)\n", (unsigned long int) newnews[i].time, timestring);
+
+	fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); /* rename_file() preserves mode */
+
+	if (ferror(fp) || fclose(fp))
+		error_message(_(txt_filesystem_full), SERVERCONFIG_FILE);
+	else
+		rename_file(file_tmp, file);
+
+	free(file_tmp);
 }
diff -Nurp tin-1.5.18/src/filter.c tin-1.6.0/src/filter.c
--- tin-1.5.18/src/filter.c	Sun May 18 19:36:44 2003
+++ tin-1.6.0/src/filter.c	Sat Jul 12 15:49:46 2003
@@ -1318,7 +1318,7 @@ quick_filter(
 	int type,
 	struct t_group *group,
 	struct t_article *art,
-    int origin)
+	int origin)
 {
 	char *scope;
 	char txt[LEN];
diff -Nurp tin-1.5.18/src/init.c tin-1.6.0/src/init.c
--- tin-1.5.18/src/init.c	Wed May 21 19:14:31 2003
+++ tin-1.6.0/src/init.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : init.c
  *  Author    : I. Lea
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-16
+ *  Updated   : 2003-06-06
  *  Notes     :
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>
@@ -157,7 +157,6 @@ t_bool read_saved_news = FALSE;		/* tin 
 t_bool show_description = TRUE;		/* current copy of tinrc flag */
 t_bool verbose = FALSE;			/* update index files only mode */
 t_bool word_highlight;		/* word highlighting on/off */
-t_bool xover_supported = FALSE;
 t_bool xref_supported = TRUE;
 #ifdef HAVE_COLOR
 	t_bool use_color;		/* enables/disables ansi-color support under linux-console and color-xterm */
diff -Nurp tin-1.5.18/src/lang.c tin-1.6.0/src/lang.c
--- tin-1.5.18/src/lang.c	Sun May 18 19:48:39 2003
+++ tin-1.6.0/src/lang.c	Sat Jul 12 15:51:20 2003
@@ -3,7 +3,7 @@
  *  Module    : lang.c
  *  Author    : I. Lea
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-06-29
  *  Notes     :
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>
@@ -42,35 +42,36 @@
 constext txt_1_resp[] = N_("1 Response%s");
 constext txt_7bit[] = "7bit";
 constext txt_8bit[] = "8bit";
+
 constext txt_active_file_is_empty[] = N_("\n%s contains no newsgroups. Exiting.");
-constext txt_append_overwrite_quit[] = N_("File %s exists. %s=append, %s=overwrite, %s=quit: ");
 constext txt_all[] = N_("all ");
+constext txt_all_groups[] = N_("All groups");
+constext txt_append_overwrite_quit[] = N_("File %s exists. %s=append, %s=overwrite, %s=quit: ");
 constext txt_art_cancel[] = N_("Article cancelled (deleted).");
 constext txt_art_cannot_cancel[] = N_("Article cannot be cancelled (deleted).");
+constext txt_art_deleted[] = N_("Article deleted.");
 constext txt_art_newsgroups[] = N_("\nYour article:\n  \"%s\"\nwill be posted to the following %s:\n");
 constext txt_art_not_posted[] = N_("Article not posted!");
 constext txt_art_not_saved[] = N_("Article not saved");
 constext txt_art_pager_com[] = N_("Article Level Commands");
+constext txt_art_parent_none[] = N_("Article has no parent");
+constext txt_art_parent_killed[] = N_("Parent article has been killed");
+constext txt_art_parent_unavail[] = N_("Parent article is unavailable");
 constext txt_art_posted[] = N_("Article posted: %s");
 constext txt_art_rejected[] = N_("Article rejected (saved to %s)");
 constext txt_art_thread_regex_tag[] = N_("%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: ");
 constext txt_art_unavailable[] = N_("Article unavailable");
-constext txt_art_parent_none[] = N_("Article has no parent");
-constext txt_art_parent_killed[] = N_("Parent article has been killed");
-constext txt_art_parent_unavail[] = N_("Parent article is unavailable");
+constext txt_art_undeleted[] = N_("Article undeleted.");
 constext txt_article_cancelled[] = "Article cancelled by author.\n";
 constext txt_article_plural[] = N_("articles");
 constext txt_article_reposted[] = N_("This is a repost of the following article:");
 constext txt_article_singular[] = N_("article");
 constext txt_article_upper[] = N_("Article");
 constext txt_articles_mailed[] = N_("-- %d %s mailed --");
-#ifndef DISABLE_PRINTING
-	constext txt_articles_printed[] = N_("%d %s printed");
-#endif /* !DISABLE_PRINTING */
+constext txt_at_s[] = N_(" at %s");
 constext txt_attach[] = N_("%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n");
 constext txt_attach_charset[] = N_(", charset: ");
 constext txt_attach_description[] = N_("%*s[-- Description: %s --]\n");
-constext txt_uue[] = N_("%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n\n");
 constext txt_auth_failed[] = N_("%d Authentication failed");
 constext txt_auth_needed[] = N_("Server expects authentication.\n");
 constext txt_auth_pass[] = N_("    Please enter password: ");
@@ -82,6 +83,7 @@ constext txt_authorization_fail[] = N_("
 constext txt_autosubscribed[] = N_("\nAutosubscribed to %s");
 constext txt_autosubscribing_groups[] = N_("Autosubscribing groups...\n");
 constext txt_autoselecting_articles[] = N_("Autoselecting articles (use '%s' to see all unread) ...");
+
 constext txt_bad_active_file[] = N_("Active file corrupt - %s");
 constext txt_bad_article[] = N_("Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: ");
 constext txt_bad_attrib[] = N_("Unrecognized attribute: %s");
@@ -91,24 +93,17 @@ constext txt_base_article[] = N_("Base a
 constext txt_base_article_range[] = N_("Base article range");
 constext txt_batch_update_unavail[] = N_("%s: Updating of index files not supported\n");
 constext txt_begin_of_art[] = N_("*** Beginning of article ***");
+
 constext txt_cancel_article[] = N_("Cancel (delete) or supersede (overwrite) article [%%.*s]? (%s/%s/%s): ");
 constext txt_cancelling_art[] = N_("Cancelling article...");
 constext txt_cannot_create_uniq_name[] = "Can't create unique tempfile-name";
 constext txt_cannot_create[] = N_("Cannot create %s");
 constext txt_cannot_find_base_art[] = N_("Can't find base article %d");
-constext txt_cannot_get_nntp_server_name[] = N_("Cannot find NNTP server name");
-#if defined(M_UNIX) && !defined(USE_TERMINFO)
-	constext txt_cannot_get_term_entry[] = N_("%s: Can't get entry for TERM\n");
-#endif /* M_UNIX && !USE_TERMINFO */
 constext txt_cannot_open[] = N_("Can't open %s");
-#if defined(NNTP_ABLE) && !defined(NNTP_ONLY)
-	constext txt_cannot_open_active_file[] = N_("Can't open %s. Try %s -r to read news via NNTP.\n");
-#endif /* NNTP_ABLE && !NNTP_ONLY */
 constext txt_cannot_open_for_saving[] = N_("Couldn't open %s for saving");
 constext txt_cannot_post[] = N_("*** Posting not allowed ***");
 constext txt_cannot_post_group[] = N_("Posting is not allowed to %s");
 constext txt_cannot_retrieve[] = N_("Can't retrieve %s");
-constext txt_cannot_write_index[] = N_("Can't write index %s");
 constext txt_cannot_write_to_directory[] = N_("%s is a directory");
 constext txt_catchup[] = N_("Catchup");
 constext txt_catchup_group[] = N_("Catchup %s...");
@@ -119,36 +114,20 @@ constext txt_caughtup[] = N_("Caughtup")
 constext txt_check_article[] = N_("Check Prepared Article");
 constext txt_checking_new_groups[] = N_("Checking for new groups... ");
 constext txt_checking_for_news[] = N_("Checking for news...");
-#ifndef HAVE_LIBUU
-	constext txt_checksum_of_file[] = N_("\tChecksum of %s (%ld %s)");
-#endif /* !HAVE_LIBUU */
 constext txt_choose_post_process_type[] = N_("Post-process %s=no, %s=yes, %s=shar, %s=quit: ");
 constext txt_color_off[] = N_("ANSI color disabled");
 constext txt_color_on[] = N_("ANSI color enabled");
 constext txt_command_failed[] = N_("Command failed: %s");
 constext txt_confirm_select_on_exit[] = N_("Mark not selected articles read?");
 constext txt_connecting[] = N_("Connecting to %s...");
-constext txt_connecting_port[] = N_("Connecting to %s:%d...");
-constext txt_connection_to[] = N_("\nConnection to %s: ");
-
-#ifdef M_AMIGA
-	constext txt_copyright_notice[] = "%s (c) Copyright 1991-2003 Iain Lea & Mark Tomlinson.";
-#endif /* M_AMIGA */
-
-#ifdef M_UNIX
-	constext txt_copyright_notice[] = "%s (c) Copyright 1991-2003 Iain Lea.";
-#endif /* M_UNIX */
-
-#ifdef VMS
-	constext txt_copyright_notice[] = "%s (c) Copyright 1991-2003 Iain Lea & Tod McQuillin & other.";
-#endif /* VMS */
-
 constext txt_cr[] = N_("<CR>");
 constext txt_creating_active[] = N_("Creating active file for saved groups...\n");
 constext txt_creating_newsrc[] = N_("Creating newsrc file...\n");
+
+constext txt_default[] = N_("Default");
 constext txt_delete_processed_files[] = N_("Delete saved files that have been post processed?");
 constext txt_deleting[] = N_("Deleting temporary files...");
-constext txt_disconnecting[] = N_("Disconnecting from server...\n");
+
 constext txt_end_of_art[] = N_("*** End of article ***");
 constext txt_end_of_arts[] = N_("*** End of articles ***");
 constext txt_end_of_groups[] = N_("*** End of groups ***");
@@ -213,17 +192,6 @@ Error: Posting contains  non-ASCII chara
 constext txt_error_header_line_blank[] = N_("\nError: Article starts with blank line instead of header\n");
 constext txt_error_header_line_colon[] = N_("\nError: Header on line %d does not have a colon after the header name:\n%s\n");
 constext txt_error_header_line_empty[] = N_("\nError: The \"%s:\" line is empty.\n");
-#ifndef FOLLOW_USEFOR_DRAFT
-	constext txt_error_header_line_comma[] = N_("\n\
-Error: The \"%s:\" line has spaces  in it that MUST be removed.\n\
-       The only allowable  space is the one  separating the colon (:)\n\
-       from  the  contents.  Use a  comma  (,)  to separate  multiple\n\
-       newsgroup names.\n");
-	constext txt_error_header_line_groups_contd[] = N_("\n\
-Error: The \"%s:\" line is  continued in  the next line.  Since\n\
-       the line  may not  contain  whitespace,  this is  not allowed.\n\
-       Please write all newsgroups into a single line.\n");
-#endif /* !FOLLOW_USEFOR_DRAFT */
 constext txt_error_header_line_missing[] = N_("\nError: The \"%s:\" line is missing from the article header.\n");
 constext txt_error_header_line_space[] = N_("\nError: Header on line %d does not have a space after the colon:\n%s\n");
 constext txt_error_header_duplicate[] = N_("\nError: There are multiple (%d) \"%s:\" lines in the header.\n");
@@ -243,21 +211,12 @@ constext txt_error_plural[] = N_("errors
 constext txt_error_sender_in_header_not_allowed[] = N_("\nError on line %d: \"Sender:\" header not allowed (it will be added for you)\n");
 constext txt_error_server_has_no_listed_groups[] = N_("Server has non of the groups listed in %s");
 constext txt_error_singular[] = N_("error");
-#if defined(NNTP_ABLE) && defined(INET6)
-	constext txt_error_socket_or_connect_problem[] = N_("\nsocket or connect problem\n");
-#endif /* NNTP_ABLE && INET6 */
-#if defined(NNTP_ABLE) && defined(TLI) && !defined(INET6)
-	constext txt_error_server_unavailable[] = N_("Server unavailable\n");
-	constext txt_error_topen[] = "t_open: can't t_open /dev/tcp";
-#endif /* NNTP_ABLE && TLI && !INET6 */
 constext txt_error_unknown_dlevel[] = N_("Unknown display level");
-constext txt_error_unknown_service[] = N_("%s/tcp: Unknown service.\n");
-constext txt_error_wrong_newsgroupname_in_group_response[] = N_("Wrong newsgroup name in response of GROUP command, %s for %s");
 constext txt_esc[] = N_("<ESC>");
 constext txt_exiting[] = N_("Exiting...");
 constext txt_external_mail_done[] = N_("leaving external mail-reader");
 constext txt_extracting_shar[] = N_("Extracting %s...");
-constext txt_failed_to_connect_to_server[] = N_("Failed to connect to NNTP server %s. Exiting...");
+
 constext txt_filesystem_full[] = N_("Error writing %s file. Filesystem full? File reset to previous state.");
 constext txt_filesystem_full_backup[] = N_("Error making backup of %s file. Filesystem full?");
 constext txt_filter_global_rules[] = N_("Filtering global rules (%d/%d)...");
@@ -265,16 +224,37 @@ constext txt_filter_rule_created[] = N_(
 constext txt_feed_pattern[] = N_("Enter pattern [%s]> ");
 constext txt_followup_newsgroups[] = N_("\nYou requested followups to your article to go to the following %s:\n");
 constext txt_followup_poster[] = N_("  %s\t Answers will be directed to you by mail.\n");
+constext txt_filter_file[] = N_("# Format:\n\
+#   comment=STRING    Optional. Multiple lines allowed. Comments must be placed\n\
+#                     at the beginning of a rule, or they will be moved to the\n\
+#                     next rule. '#' is not a valid keyword for a comment!\n\
+#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n\
+#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n\
+#   score=NUM|STRING  Mandatory. Score to give. Either:\n\
+#     score=NUM         A number (e.g. 70). Or:\n\
+#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n\
+#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n\
+#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n\
+#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n\
+#                     full references.\n\
+#   msgid_last=STRING Optional. Like above, but with last reference only.\n\
+#   msgid_only=STRING Optional. Like above, but without references.\n\
+#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) without\n\
+#                     Message-ID:\n\
+#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n\
+#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' opt.\n\
+#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n\
+#   time=NUM          Optional. time_t value when rule expires\n#\n");
+constext txt_filter_score[] = N_("Enter score for rule (default=%d): ");
+constext txt_filter_score_help[] = N_("Enter the score weight (range 0 < score <= %d)"); /* SCORE_MAX */
+constext txt_full[] = N_("Full");
+constext txt_filter_comment[] = N_("Comment (optional)  : ");
+constext txt_filter_text_type[] = N_("Apply pattern to    : ");
+constext txt_from_line_only[] = N_("From: line (ignore case)      ");
+constext txt_from_line_only_case[] = N_("From: line (case sensitive)   ");
+
 constext txt_gethostbyname[] = N_("%s%s: Unknown host.\n");
-constext txt_giving_up[] = N_("Giving up...\n");
 constext txt_global[] = N_("global ");
-
-#if defined(HAVE_POLL) || defined(HAVE_SELECT)
-	constext txt_group[] = N_("Group %.*s ('q' to quit)...");
-#else
-	constext txt_group[] = N_("Group %.*s...");
-#endif /* HAVE_POLL || HAVE_SELECT */
-
 constext txt_group_aliased[] = N_("Please use %.100s instead");
 constext txt_group_is_moderated[] = N_("Group %s is moderated. Continue?");
 constext txt_group_plural[] = N_("groups");
@@ -282,6 +262,16 @@ constext txt_group_select_com[] = N_("To
 constext txt_group_selection[] = N_("Group Selection");
 constext txt_group_singular[] = N_("group");
 
+constext txt_help_filter_comment[] = N_("One or more lines of comment. <CR> to add a line or proceed if line is empty.");
+constext txt_help_filter_from[] = N_("From: line to add to filter file. <SPACE> toggles & <CR> sets.");
+constext txt_help_filter_lines[] = N_("Linecount of articles to be filtered. < for less, > for more, = for equal.");
+constext txt_help_filter_msgid[] = N_("Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets.");
+constext txt_help_filter_subj[] = N_("Subject: line to add to filter file. <SPACE> toggles & <CR> sets.");
+constext txt_help_filter_text[] = N_("Enter text pattern to filter if Subject: & From: lines are not what you want.");
+constext txt_help_filter_text_type[] = N_("Select where text pattern should be applied. <SPACE> toggles & <CR> sets.");
+constext txt_help_filter_time[] = N_("Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets.");
+constext txt_help_kill_scope[] = N_("Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets.");
+constext txt_help_select_scope[] = N_("Apply select to current group or all groups. <SPACE> toggles & <CR> sets.");
 constext txt_help_article_autokill[] = N_("kill an article via a menu");
 constext txt_help_article_autoselect[] = N_("auto-select (hot) an article via a menu");
 constext txt_help_article_browse_urls[] = N_("Browse URLs in article");
@@ -300,9 +290,6 @@ constext txt_help_article_next[] = N_("d
 constext txt_help_article_next_thread[] = N_("display first article in next thread");
 constext txt_help_article_next_unread[] = N_("display next unread article");
 constext txt_help_article_parent[] = N_("go to the article that this one followed up");
-#ifdef HAVE_PGP_GPG
-	constext txt_help_article_pgp[] = N_("perform PGP operations on article");
-#endif /* HAVE_PGP_GPG */
 constext txt_help_article_prev[] = N_("display previous article");
 constext txt_help_article_prev_unread[] = N_("display previous unread article");
 constext txt_help_article_quick_kill[] = N_("quickly kill an article using defaults");
@@ -336,16 +323,10 @@ constext txt_help_global_mail[] = N_("ma
 constext txt_help_global_option_menu[] = N_("menu of configurable options");
 constext txt_help_global_page_down[] = N_("down one page");
 constext txt_help_global_page_up[] = N_("up one page");
-#ifndef DONT_HAVE_PIPING
-	constext txt_help_global_pipe[] = N_("pipe article/thread/hot/pattern/tagged articles into command");
-#endif /* !DONT_HAVE_PIPING */
 constext txt_help_global_post[] = N_("post (write) article to current group");
 constext txt_help_global_post_postponed[] = N_("post postponed articles");
 constext txt_help_global_posting_history[] = N_("list articles posted by you (from posted file)");
 constext txt_help_global_previous_menu[] = N_("return to previous menu");
-#ifndef DISABLE_PRINTING
-	constext txt_help_global_print[] = N_("output article/thread/hot/pattern/tagged articles to printer");
-#endif /* !DISABLE_PRINTING */
 constext txt_help_global_quit_tin[] = N_("quit tin immediately");
 constext txt_help_global_redraw_screen[] = N_("redraw page");
 constext txt_help_global_save[] = N_("save article/thread/hot/pattern/tagged articles to file");
@@ -357,13 +338,7 @@ constext txt_help_global_search_body_com
 constext txt_help_global_search_subj_backwards[] = N_("search for articles by Subject line backwards");
 constext txt_help_global_search_subj_forwards[] = N_("search for articles by Subject line forwards");
 constext txt_help_global_search_repeat[] = N_("repeat last search");
-#ifndef NO_SHELL_ESCAPE
-	constext txt_help_global_shell_escape[] = N_("shell escape");
-#endif /* !NO_SHELL_ESCAPE */
 constext txt_help_global_tag[] = N_("tag current article for reposting/mailing/piping/printing/saving");
-#ifdef HAVE_COLOR
-	constext txt_help_global_toggle_color[] = N_("toggle color");
-#endif /* HAVE_COLOR */
 constext txt_help_global_toggle_info_line[] = N_("toggle info message in last line (subject/description)");
 constext txt_help_global_toggle_inverse_video[] = N_("toggle inverse video");
 constext txt_help_global_toggle_mini_help[] = N_("toggle mini help menu display");
@@ -437,6 +412,7 @@ constext txt_help_title_disp[] = N_("Dis
 constext txt_help_title_misc[] = N_("Miscellaneous\n-------------");
 constext txt_help_title_navi[] = N_("Moving around\n-------------");
 constext txt_help_title_ops[] = N_("Group/thread/article operations\n-------------------------------");
+
 constext txt_index_page_com[] = N_("Group Level Commands");
 constext txt_info_add_kill[] = N_("Kill filter added");
 constext txt_info_add_select[] = N_("Auto-selection filter added");
@@ -477,28 +453,25 @@ constext txt_invalid_from[] = N_("Invali
 constext txt_invalid_sender[] = N_("Invalid  Sender:-header %s");
 constext txt_inverse_off[] = N_("Inverse video disabled");
 constext txt_inverse_on[] = N_("Inverse video enabled");
+
 constext txt_keymap_missing_key[] = N_("Missing definition for %s\n");
 constext txt_keymap_invalid_key[] = N_("Invalid key definition '%s'\n");
 constext txt_keymap_invalid_name[] = N_("Invalid keyname '%s'\n");
-#ifdef DEBUG
-	constext txt_keymap_redef[] = N_("Redefined key %s '%s' -> '%s'\n");
-	constext txt_usage_debug[] = N_("  -D       debug mode 1=NNTP 2=ALL");
-#endif /* DEBUG */
 constext txt_keymap_conflict[] = N_("Key '%s' is defined for both %s%s and %s%s\n");
-constext txt_last_resp[] = N_("-- Last response --");
-
-#ifdef HAVE_LIBUU
-	constext txt_libuu_saved[] = N_("%d files successfully written from %d articles. %d %s occurred.");
-	constext txt_libuu_error_missing[] = N_("Missing parts.");
-	constext txt_libuu_error_no_begin[] = N_("No beginning.");
-	constext txt_libuu_error_no_data[] = N_("No data.");
-	constext txt_libuu_error_unknown[] = N_("Unknown error.");
-#endif /* HAVE_LIBUU */
-constext txt_uu_error_decode[] = N_("Error decoding %s : %s");
-constext txt_uu_error_no_end[] = N_("No end.");
-constext txt_uu_success[] = N_("%s successfully decoded.");
+constext txt_kill_from[] = N_("Kill From:     [%-*.*s] (y/n): ");
+constext txt_kill_lines[] = N_("Kill Lines: (</>num): ");
+constext txt_kill_menu[] = N_("Kill Article Menu");
+constext txt_kill_msgid[] = N_("Kill Msg-Id:   [%-*.*s] (f/l/o/n): ");
+constext txt_kill_scope[] = N_("Kill pattern scope  : ");
+constext txt_kill_subj[] = N_("Kill Subject:  [%-*.*s] (y/n): ");
+constext txt_kill_text[] = N_("Kill text pattern   : ");
+constext txt_kill_time[] = N_("Kill time in days   : ");
 
+constext txt_last[] = N_("Last");
+constext txt_last_resp[] = N_("-- Last response --");
 constext txt_lines[] = N_("Lines %s  ");
+
+constext txt_msgid_line_only[] = N_("Message-ID: line              ");
 constext txt_mail[] = "Mail";
 constext txt_mailbox[] = N_("mailbox ");
 constext txt_mail_art_to[] = N_("Mail article(s) to [%.*s]> ");
@@ -524,25 +497,6 @@ constext txt_mini_info_1[] = N_("%s=line
 constext txt_mini_info_2[] = N_("%s=search forwards; %s=search backwards; %s=quit");
 constext txt_mini_page_1[] = N_("<n>=set current to n; %s=next unread; %s=search pattern; %s=kill/select");
 constext txt_mini_page_2[] = N_("%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read");
-
-#ifndef DISABLE_PRINTING
-#	ifndef DONT_HAVE_PIPING
-		constext txt_mini_group_3[] = N_("%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post");
-		constext txt_mini_page_3[] = N_("%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post");
-#	else
-		constext txt_mini_group_3[] = N_("%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post");
-		constext txt_mini_page_3[] = N_("%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post");
-#	endif /* DONT_HAVE_PIPING */
-#else
-#	ifndef DONT_HAVE_PIPING
-		constext txt_mini_group_3[] = N_("%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post");
-		constext txt_mini_page_3[] = N_("%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post");
-#	else
-		constext txt_mini_group_3[] = N_("%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post");
-		constext txt_mini_page_3[] = N_("%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post");
-#	endif /* DONT_HAVE_PIPING */
-#endif /* DISABLE_PRINTING */
-
 constext txt_mini_select_1[] = N_("<n>=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup");
 constext txt_mini_select_2[] = N_("%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread");
 constext txt_mini_select_3[] = N_("%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out");
@@ -550,6 +504,7 @@ constext txt_mini_thread_1[] = N_("<n>=s
 constext txt_mini_thread_2[] = N_("%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread");
 constext txt_more[] = N_("--More--");
 constext txt_moving[] = N_("Moving %s...");
+
 constext txt_name[] = N_(", name: ");
 constext txt_newsgroup[] = N_("Goto newsgroup [%s]> ");
 constext txt_newsgroup_plural[] = N_("newsgroups");
@@ -560,35 +515,9 @@ constext txt_newsrc_nogroups[] = N_("War
 constext txt_newsrc_saved[] = N_("newsrc file saved successfully.\n");
 constext txt_next_resp[] = N_("-- Next response --");
 constext txt_nntp_authorization_failed[] = N_("NNTP authorization password not found for %s");
-
-#ifdef NNTP_ABLE
-	constext txt_nntp_ok_goodbye[] = N_("205  Closing connection");
-	constext txt_usage_force_authentication[] = N_("  -A       force authentication on connect");
-	constext txt_usage_newsserver[] = N_("  -g serv  read news from NNTP server serv [default=%s]");
-	constext txt_usage_port[] = N_("  -p port  use port as NNTP port [default=%d]");
-	constext txt_usage_quickstart[] = N_("  -Q       quick start. Same as -nqd");
-	constext txt_usage_read_only_active[] = N_("  -l       use only LIST instead of GROUP (-n) command");
-	constext txt_usage_read_only_subscribed[] = N_("  -n       only read subscribed .newsrc groups from NNTP server");
-#else
-	constext txt_usage_quickstart[] = N_("  -Q       quick start. Same as -qd");
-	constext txt_usage_read_only_active[] = N_("  -l       read only active file instead of scanning spool (-n) command");
-	constext txt_usage_read_only_subscribed[] = N_("  -n       only read subscribed .newsrc groups from spool");
-#endif /* NNTP_ABLE */
-
 constext txt_no[] = N_("No  ");
 constext txt_no_arts[] = N_("*** No articles ***");
 constext txt_no_arts_posted[] = N_("No articles have been posted");
-
-#ifndef DONT_HAVE_PIPING
-	constext txt_no_command[] = N_("No command");
-#endif /* !DONT_HAVE_PIPING */
-
-#ifdef HAVE_COLOR
-#	ifdef USE_CURSES
-		constext txt_no_colorterm[] = N_("Terminal does not support color");
-#	endif /* USE_CURSES */
-#endif /* HAVE_COLOR */
-
 constext txt_no_description[] = N_("*** No description ***");
 constext txt_no_filename[] = N_("No filename");
 constext txt_no_group[] = N_("No group");
@@ -614,12 +543,10 @@ constext txt_no_term_clearscreen[] = N_(
 constext txt_no_term_cursor_motion[] = N_("%s: Terminal must have cursor motion (cm)\n");
 constext txt_no_term_set[] = N_("%s: TERM variable must be set to use screen capabilities\n");
 constext txt_no_viewer_found[] = N_("No viewer found for %s/%s\n");
-constext txt_no_xover_support[] = N_("Your server does not support the NNTP XOVER or OVER command.\nTin will use local index files instead.\n");
 constext txt_not_exist[] = N_("Newsgroup does not exist on this server");
 constext txt_not_in_active_file[] = N_("Group %s not found in active file");
 constext txt_nrctbl_create[] = N_("c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: ");
 constext txt_nrctbl_default[] = N_("use a)lternative name, use d)efault .newsrc, q)uit tin: ");
-
 constext txt_nrctbl_info[] = N_("# NNTP-server -> newsrc translation table and NNTP-server\n\
 # shortname list for %s %s\n#\n# the format of this file is\n\
 #   <FQDN of NNTP-server> <newsrc file> <shortname> ...\n#\n\
@@ -627,6 +554,7 @@ constext txt_nrctbl_info[] = N_("# NNTP-
 #\n# examples:\n#   news.tin.org  .newsrc-tin.org  tinorg\n\
 #   news.ka.nu    /tmp/nrc-nu      kanu    nu\n#\n");
 
+constext txt_only[] = N_("Only");
 constext txt_option_not_enabled[] = N_("Option not enabled. Recompile with %s.");
 constext txt_options_menu[] = N_("Options Menu");
 constext txt_out_of_memory[] = "%s: memory exhausted trying to allocate %d bytes in file %s line %d";
@@ -634,23 +562,6 @@ constext txt_out_of_memory[] = "%s: memo
 constext txt_pcre_error_at[] = N_("Error in regex: %s at pos. %d '%s'");
 constext txt_pcre_error_num[] = N_("Error in regex: pcre internal error %d");
 constext txt_pcre_error_text[] = N_("Error in regex: study - pcre internal error %s");
-
-#ifdef HAVE_PGP_GPG
-	constext txt_pgp_add[] = N_("Add key(s) to public keyring?");
-	constext txt_pgp_mail[] = N_("%s=encrypt, %s=sign, %s=both, %s=quit: ");
-	constext txt_pgp_news[] = N_("%s=sign, %s=sign & include public key, %s=quit: ");
-	constext txt_pgp_not_avail[] = N_("PGP has not been set up (can't open %s)");
-	constext txt_pgp_nothing[] = N_("Article not signed and no public keys found");
-#endif /* HAVE_PGP_GPG */
-
-#ifndef DONT_HAVE_PIPING
-	constext txt_pipe[] = N_("Pipe");
-	constext txt_pipe_to_command[] = N_("Pipe to command [%.*s]> ");
-	constext txt_piping[] = N_("Piping...");
-#else
-	constext txt_piping_not_enabled[] = N_("Piping not enabled.");
-#endif /* !DONT_HAVE_PIPING */
-
 constext txt_post_a_followup[] = N_("Post a followup...");
 /* TODO: replace hardcoded key-name in txt_post_error_ask_postpone */
 constext txt_post_error_ask_postpone[] = N_("An error has occurred while posting the article. If you think that this\n\
@@ -661,18 +572,17 @@ constext txt_post_newsgroups[] = N_("Pos
 constext txt_post_processing[] = N_("-- post processing started --");
 constext txt_post_processing_finished[] = N_("-- post processing completed --");
 constext txt_post_subject[] = N_("Post subject [%s]> ");
-#ifdef NNTP_INEWS
-	constext txt_post_via_builtin_inews[] = N_("Posting using external inews failed. Use built in inews instead?");
-	constext txt_post_via_builtin_inews_only[] = N_("It worked! Should I always use my built in inews from now on?");
-#endif /* NNTP_INEWS */
 constext txt_posted_info_file[] = N_("# Summary of mailed/posted messages viewable by 'W' command from within tin.\n");
 constext txt_posting[] = N_("Posting article...");
 constext txt_postpone_repost[] = N_("Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): ");
 constext txt_prefix_hot[] = N_("Hot %s");
 constext txt_prefix_tagged[] = N_("Tagged %s");
+constext txt_processing_mail_arts[] = N_("Processing mail messages marked for deletion.");
+constext txt_processing_saved_arts[] = N_("Processing saved articles marked for deletion.");
 constext txt_prompt_fup_ignore[] = N_("Accept Followup-To? %s=post, %s=ignore, %s=quit: ");
 constext txt_prompt_unchanged_mail[] = N_("Article unchanged, abort mailing?");
 constext txt_prompt_see_postponed[] = N_("Do you want to see postponed articles (%d)?");
+
 constext txt_quick_filter_kill[] = N_("Add quick kill filter?");
 constext txt_quick_filter_select[] = N_("Add quick selection filter?");
 constext txt_quit[] = N_("Do you really want to quit?");
@@ -683,6 +593,7 @@ constext txt_quit_edit_save_kill[] = N_(
 constext txt_quit_edit_save_select[] = N_("%s=quit %s=edit %s=save select description: ");
 constext txt_quit_no_write[] = N_("Do you really want to quit without saving your configuration?");
 constext txt_quoted_printable[] = "quoted-printable";
+
 constext txt_range_invalid[] = N_("Invalid range - valid are '0-9.$' eg. 1-$");
 constext txt_read_abort[] = N_("Do you want to abort this operation?");
 constext txt_read_exit[] = N_("Do you want to exit tin immediately?");
@@ -695,15 +606,10 @@ constext txt_reading_filter_file[] = N_(
 constext txt_reading_groups[] = N_("Reading %s groups...");
 constext txt_reading_input_history_file[] = N_("Reading input history file...\n");
 constext txt_reading_keymap_file[] = N_("Reading keymap file...\n");
-#ifdef HAVE_MH_MAIL_HANDLING
-	constext txt_reading_mail_active_file[] = N_("Reading mail active file... ");
-	constext txt_reading_mailgroups_file[] = N_("Reading mailgroups file... ");
-#endif /* HAVE_MH_MAIL_HANDLING */
 constext txt_reading_news_active_file[] = N_("Reading groups from active file... ");
 constext txt_reading_news_newsrc_file[] = N_("Reading groups from newsrc file... ");
 constext txt_reading_newsgroups_file[] = N_("Reading newsgroups file... ");
 constext txt_reading_newsrc[] = N_("Reading newsrc file...");
-constext txt_reconnect_to_news_server[] = N_("Connection to news server has timed out. Reconnect?");
 constext txt_remove_bogus[] = N_("Bogus group %s removed.");
 constext txt_rename_error[] = N_("Error: rename %s to %s");
 constext txt_reply_to_author[] = N_("Reply to author...");
@@ -713,8 +619,26 @@ constext txt_repost_group[] = N_("Repost
 constext txt_reset_newsrc[] = N_("Reset newsrc?");
 constext txt_resp_redirect[] = N_("Responses have been directed to the following newsgroups");
 constext txt_resp_to_poster[] = N_("Responses have been directed to poster. %s=mail, %s=post, %s=quit: ");
-constext txt_resp_x_of_n[] = N_("RespNo %3d of %3d%s");
+constext txt_resp_x_of_n[] = N_("RespNo %4d of %4d%s");
 constext txt_return_key[] = N_("Press <RETURN> to continue...");
+
+constext txt_select_from[] = N_("Select From    [%-*.*s] (y/n): ");
+constext txt_select_lines[] = N_("Select Lines: (</>num): ");
+constext txt_select_menu[] = N_("Auto-select Article Menu");
+constext txt_select_msgid[] = N_("Select Msg-Id  [%-*.*s] (f/l/o/n): ");
+constext txt_select_scope[] = N_("Select pattern scope: ");
+constext txt_select_subj[] = N_("Select Subject [%-*.*s] (y/n): ");
+constext txt_select_text[] = N_("Select text pattern : ");
+constext txt_select_time[] = N_("Select time in days   : ");
+constext txt_serverconfig_header[] = N_("# %s server configuration file\n\
+# This file was automatically saved by %s %s %s (\"%s\")\n#\n\
+# Do not edit while %s is running, since all your changes to this file\n\
+# will be overwritten when you leave %s.\n\
+# Do not edit at all if you don't know what you do.\n\
+############################################################################\n\n");
+constext txt_show_unread[] = N_("Showing unread groups only");
+constext txt_subj_line_only[] = N_("Subject: line (ignore case)   ");
+constext txt_subj_line_only_case[] = N_("Subject: line (case sensitive)");
 constext txt_save[] = N_("Save");
 constext txt_save_attachment[] = N_("Save '%s' (%s/%s)?");
 constext txt_save_config[] = N_("Save configuration before continuing?");
@@ -741,12 +665,7 @@ constext txt_select_group[] = N_("Select
 constext txt_select_pattern[] = N_("Enter selection pattern [%s]> ");
 constext txt_select_thread[] = N_("Select thread > ");
 constext txt_send_bugreport[] = N_("%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n");
-constext txt_server_name_in_file_env_var[] = N_("Put the server name in the file %s,\nor set the environment variable NNTPSERVER");
 constext txt_servers_active[] = N_("servers active-file");
-#ifndef NO_SHELL_ESCAPE
-	constext txt_shell_command[] = N_("Shell Command (%s)");
-	constext txt_shell_escape[] = N_("Enter shell command [%s]> ");
-#endif /* !NO_SHELL_ESCAPE */
 constext txt_skipping_newgroups[] = N_("Cannot move into new newsgroups. Subscribe first...");
 constext txt_space[] = N_("<SPACE>");
 constext txt_starting_command[] = N_("Starting: (%s)");
@@ -760,21 +679,11 @@ constext txt_supersede_article[] = N_("R
 constext txt_supersede_group[] = N_("Supersede article(s) to group(s) [%s]> ");
 constext txt_superseding_art[] = N_("Superseding article ...");
 constext txt_suspended_message[] = N_("\nStopped. Type 'fg' to restart %s\n");
+
+constext txt_time_default_days[] = N_("%d days");
 constext txt_tab[] = N_("<TAB>");
 constext txt_tagged_art[] = N_("Tagged article");
 constext txt_tagged_thread[] = N_("Tagged thread");
-
-#ifdef HAVE_COLOR
-	constext txt_tinrc_colors[] = N_("# For color-adjust use the following numbers\n\
-#  0-black       1-red         2-green        3-brown\n\
-#  4-blue        5-pink        6-cyan         7-white\n\
-# These are *only* for foreground:\n\
-#  8-gray        9-lightred   10-lightgreen  11-yellow\n\
-# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n\
-# A '-1' is interpreted as default (foreground normally is white, and\n\
-# background black)\n\n");
-#endif /* HAVE_COLOR */
-
 constext txt_tinrc_defaults[] = N_("# Default action/prompt strings\n");
 constext txt_tinrc_filter[] = N_("# Defaults for quick (1 key) kill & auto-selection filters\n\
 # header=NUM  0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n\
@@ -783,23 +692,377 @@ constext txt_tinrc_filter[] = N_("# Defa
 # global=ON/OFF  ON=apply to all groups OFF=apply to current group\n\
 # case=ON/OFF    ON=filter case sensitive OFF=ignore case\n\
 # expire=ON/OFF  ON=limit to default_filter_days OFF=don't ever expire\n");
-
 /* do NOT localize the next string! */
 constext txt_tinrc_header[] = "# %s configuration file V%s\n\
 # This file was automatically saved by %s %s %s (\"%s\")\n#\n\
 # Do not edit while tin is running, since all your changes to this file\n\
 # will be overwritten when you leave tin.\n#\n\
 ############################################################################\n\n";
-
 constext txt_tinrc_info_in_last_line[] = N_("# If ON use print current subject or newsgroup description in the last line\n");
 constext txt_tinrc_newnews[] = N_("# Host & time info used for detecting new groups (don't touch)\n");
+constext txt_there_is_no_news[] = N_("There is no news\n");
+constext txt_thread[] = N_("Thread");
+constext txt_thread_com[] = N_("Thread Level Commands");
+constext txt_thread_marked_as_deselected[] = N_("Thread deselected");
+constext txt_thread_marked_as_selected[] = N_("Thread selected");
+constext txt_thread_range[] = N_("Thread range");
+constext txt_thread_x_of_n[] = N_("%sThread %4s of %4s");
+constext txt_threading_arts[] = N_("Threading articles...");
+constext txt_toggled_high[] = N_("Toggled word highlighting %s");
+constext txt_toggled_rot13[] = N_("Toggled rot13 encoding");
+constext txt_toggled_tex2iso[] = N_("Toggled german TeX encoding %s");
+constext txt_toggled_tabwidth[] = N_("Toggled tab-width to %d");
+constext txt_trying_dotlock[] = N_("%d Trying to dotlock %s");
+constext txt_trying_lock[] = N_("%d Trying to lock %s");
+constext txt_type_h_for_help[] = N_("           h=help\n");
+
+constext txt_unlimited_time[] = N_("Unlimited");
 constext txt_unsubscribe_pattern[] = N_("Enter wildcard unsubscribe pattern> ");
+constext txt_uu_error_decode[] = N_("Error decoding %s : %s");
+constext txt_uu_error_no_end[] = N_("No end.");
+constext txt_uu_success[] = N_("%s successfully decoded.");
+constext txt_uue[] = N_("%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n\n");
+constext txt_unread[] = N_("unread ");
+constext txt_unsubscribed_num_groups[] = N_("unsubscribed from %d groups");
+constext txt_unsubscribed_to[] = N_("Unsubscribed from %s");
+constext txt_unsubscribing[] = N_("Unsubscribing... ");
+constext txt_untagged_art[] = N_("Untagged article");
+constext txt_untagged_thread[] = N_("Untagged thread");
+constext txt_unthreading_arts[] = N_("Unthreading articles...");
+constext txt_updated[] = N_("Updated");
+constext txt_updating[] = N_("Updating");
+constext txt_url_open[] = N_("Opening %s\n");
+constext txt_url_done[] = N_("No more URL's in this article");
+constext txt_use_mime[] = N_("Use MIME display program for this message?");
+constext txt_usage_catchup[] = N_("  -c       mark all news as read in subscribed newsgroups (batch mode)");
+constext txt_usage_check_for_unread_news[] = N_("  -Z       return status indicating if any unread news (batch mode)");
+constext txt_usage_dont_check_new_newsgroups[] = N_("  -q       don't check for new newsgroups");
+constext txt_usage_dont_save_files_on_quit[] = N_("  -X       don't save any files on quit");
+constext txt_usage_dont_show_descriptions[] = N_("  -d       don't show newsgroup descriptions");
+constext txt_usage_getart_limit[] = N_("  -G limit get only limit articles/group");
+constext txt_usage_help_information[] = N_("  -H       help information about %s");
+constext txt_usage_help_message[] = N_("  -h       this help message");
+constext txt_usage_index_newsdir[] = N_("  -I dir   news index file directory [default=%s]");
+constext txt_usage_update_index_files[] = N_("  -u       update index files (batch mode)");
+constext txt_usage_maildir[] = N_("  -m dir   mailbox directory [default=%s]");
+constext txt_usage_mail_bugreport[] = N_("\nMail bug reports/comments to %s");
+constext txt_usage_mail_new_news[] = N_("  -N       mail new news to your posts (batch mode)");
+constext txt_usage_mail_new_news_to_user[] = N_("  -M user  mail new news to specified user (batch mode)");
+constext txt_usage_newsrc_file[] = N_("  -f file  subscribed to newsgroups file [default=%s]");
+constext txt_usage_post_article[] = N_("  -w       post an article and exit");
+constext txt_usage_post_postponed_arts[] = N_("  -o       post all postponed articles and exit");
+constext txt_usage_read_news_remotely[] = N_("  -r       read news remotely from default NNTP server");
+constext txt_usage_read_saved_news[] = N_("  -R       read news saved by -S option");
+constext txt_usage_savedir[] = N_("  -s dir   save news directory [default=%s]");
+constext txt_usage_save_new_news[] = N_("  -S       save new news for later reading (batch mode)");
+constext txt_usage_start_if_unread_news[] = N_("  -z       start if any unread news");
+constext txt_usage_tin[] = N_("A Usenet reader.\n\nUsage: %s [options] [newsgroup[,...]]");
+constext txt_usage_verbose[] = N_("  -v       verbose output for batch mode options");
+constext txt_usage_version[] = N_("  -V       print version & date information");
+constext txt_useful_without_batch_mode[] = N_("%s only useful without batch mode operations\n");
+constext txt_useful_with_batch_mode[] = N_("%s only useful for batch mode operations\n");
+
+constext txt_value_out_of_range[] = N_("\n%s%d out of range (0 - %d). Reset to 0");
 constext txt_view_attachment[] = N_("View '%s' (%s/%s)?");
 
-/*
- * Special value used to override option-list behavior
- */
-constext txt_default[] = N_("Default");
+constext txt_warn_art_line_too_long[] = N_("\nWarning: posting exceeds %d columns. Line %d is the first long one:\n%-100s\n");
+constext txt_warn_article_unchanged[] = N_("\nWarning: article unchanged after editing\n");
+constext txt_warn_blank_subject[] = N_("\nWarning: \"Subject:\" contains only whitespaces.\n");
+constext txt_warn_re_but_no_references[] = N_("\n\
+Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n");
+constext txt_warn_references_but_no_re[] = N_("\n\
+Warning: Article has \"References:\" but \"Subject:\" does not begin\n\
+         with \"Re: \" and does not contain \"(was:\".\n");
+constext txt_warn_cancel[] = N_("Read carefully!\n\n\
+  You are about to cancel an article seemingly written by you. This will wipe\n\
+  the article from most  news servers  throughout the world,  but there is no\n\
+  guarantee that it will work.\n\nThis is the article you are about to cancel:\n\n");
+constext txt_warn_encoding_and_external_inews[] = N_("\n\
+Warning: You are using a non-plain transfer encoding (such as base64 or\n\
+         quoted-printable) and an external inews program to submit your\n\
+         article. If a signature is appended by that inews program it will\n\
+         not be encoded properly.\n");
+constext txt_warn_update[] = N_("\n\nYou are upgrading to tin %s from an earlier version.\n\
+Some values in your %s file have changed!\nRead WHATSNEW, etc...\n");
+constext txt_warn_downgrade[] = N_("\n\nYou are downgrading to tin %s from a more recent version!\n\
+Some values in your %s file may be ignored, others might have changed!\n");
+constext txt_warn_unrecognized_version[] = "\n\nUnrecognized version string!\n";
+constext txt_warn_newsrc[] = N_("Warning: tin wrote fewer groups to your\n\t%s\n\
+than it read at startup. If you didn't unsubscribe from %ld %s during\n\
+this session this indicates an error and you should backup your %s\n\
+before you start tin once again!\n");
+constext txt_warn_multiple_sigs[] = N_("\nWarning: Found %d '-- \\n' lines, this may confuse some people.\n");
+constext txt_warn_not_all_arts_saved[] = N_("Warning: Only %d out of %d articles were saved");
+constext txt_warn_sig_too_long[] = N_("\n\
+Warning: Your signature  is longer than %d lines.  Since signatures usually do\n\
+         not  transport any  useful information,  they should be as  short as\n\
+         possible.\n");
+constext txt_warn_suspicious_mail[] = N_("Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? ");
+constext txt_warn_wrong_sig_format[] = N_("\nWarning: Signatures should start with '-- \\n' not with '--\\n'.\n");
+constext txt_writing_attributes_file[] = N_("Writing attributes file...");
+
+constext txt_x_resp[] = N_("%d Responses%s");
+
+constext txt_yanked_groups[] = N_("Added %d %s");
+constext txt_yanked_none[] = N_("No unsubscribed groups to show");
+constext txt_yanked_sub_groups[] = N_("Showing subscribed to groups only");
+constext txt_yes[] = N_("Yes ");
+constext txt_you_have_mail[] = N_("    You have mail\n");
+
+
+/* TODO: cleanup */
+#ifdef CHARSET_CONVERSION
+	constext txt_warn_charset_conversion[] = N_("\n\
+Warning: Posting is in %s and contains characters which are not\n\
+         in your selected MM_NETWORK_CHARSET: %s.\n\
+         These characters will be replaced by '?' if you post this\n\
+         article unchanged. To avoid garbling your article please either\n\
+         edit it and remove those characters or change the setting of\n\
+         MM_NETWORK_CHARSET to a suitable value for your posting via the\n\
+         M)enu option.\n");
+#endif /* CHARSET_CONVERSION */
+
+#ifdef DEBUG
+	constext txt_keymap_redef[] = N_("Redefined key %s '%s' -> '%s'\n");
+	constext txt_usage_debug[] = N_("  -D       debug mode 1=NNTP 2=ALL");
+#endif /* DEBUG */
+
+#ifdef FORGERY
+	constext txt_warn_cancel_forgery[] = N_("Read carefully!\n\n\
+  You are about to cancel an article seemingly not written by you.  This will\n\
+  wipe the article from lots of news servers throughout the world;\n\
+  Usenet's majority  considers this  rather inappropriate,  to say the least.\n\
+  Only press 'd'  if you are  absolutely positive  that you are ready to take\n\
+  the rap.\n\nThis is the article you are about to cancel:\n\n");
+#endif /* FORGERY */
+
+#ifdef HAVE_COLOR
+	constext txt_help_global_toggle_color[] = N_("toggle color");
+	constext txt_tinrc_colors[] = N_("# For color-adjust use the following numbers\n\
+#  0-black       1-red         2-green        3-brown\n\
+#  4-blue        5-pink        6-cyan         7-white\n\
+# These are *only* for foreground:\n\
+#  8-gray        9-lightred   10-lightgreen  11-yellow\n\
+# 12-lightblue  13-lightpink  14-lightcyan   15-lightwhite\n\
+# A '-1' is interpreted as default (foreground normally is white, and\n\
+# background black)\n\n");
+	constext txt_usage_toggle_color[] = N_("  -a       toggle color flag");
+#endif /* HAVE_COLOR */
+
+#ifdef HAVE_FASCIST_NEWSADMIN
+	constext txt_error_followup_to_several_groups[] = N_("\nError: Followup-To set to more than one newsgroup!\n");
+	constext txt_error_missing_followup_to[] = N_("\nError: cross-posting to %d newsgroups and no Followup-To line!\n");
+	constext txt_error_not_valid_newsgroup[] = N_("\nError: \"%s\" is not a valid newsgroup!\n");
+#else
+	constext txt_warn_followup_to_several_groups[] = N_("\nWarning: Followup-To set to more than one newsgroup!\n");
+	constext txt_warn_missing_followup_to[] = N_("\nWarning: cross-posting to %d newsgroups and no Followup-To line!\n");
+	constext txt_warn_not_in_newsrc[] = N_("\nWarning: \"%s\" is not in your newsrc, it may be invalid at this site!\n");
+	constext txt_warn_not_valid_newsgroup[] = N_("\nWarning: \"%s\" is not a valid newsgroup at this site!\n");
+#endif /* HAVE_FASCIST_NEWSADMIN */
+
+#ifdef HAVE_LIBUU
+	constext txt_libuu_saved[] = N_("%d files successfully written from %d articles. %d %s occurred.");
+	constext txt_libuu_error_missing[] = N_("Missing parts.");
+	constext txt_libuu_error_no_begin[] = N_("No beginning.");
+	constext txt_libuu_error_no_data[] = N_("No data.");
+	constext txt_libuu_error_unknown[] = N_("Unknown error.");
+#else
+	constext txt_checksum_of_file[] = N_("\tChecksum of %s (%ld %s)");
+#endif /* HAVE_LIBUU */
+
+#ifdef HAVE_MH_MAIL_HANDLING
+	constext txt_reading_mail_active_file[] = N_("Reading mail active file... ");
+	constext txt_reading_mailgroups_file[] = N_("Reading mailgroups file... ");
+#endif /* HAVE_MH_MAIL_HANDLING */
+
+#ifdef HAVE_PGP_GPG
+	constext txt_help_article_pgp[] = N_("perform PGP operations on article");
+	constext txt_pgp_add[] = N_("Add key(s) to public keyring?");
+	constext txt_pgp_mail[] = N_("%s=encrypt, %s=sign, %s=both, %s=quit: ");
+	constext txt_pgp_news[] = N_("%s=sign, %s=sign & include public key, %s=quit: ");
+	constext txt_pgp_not_avail[] = N_("PGP has not been set up (can't open %s)");
+	constext txt_pgp_nothing[] = N_("Article not signed and no public keys found");
+#	ifdef HAVE_ISPELL
+		constext txt_quit_edit_post[] = N_("%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: ");
+		constext txt_quit_edit_send[] = N_("%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: ");
+		constext txt_quit_edit_xpost[] = N_("%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: ");
+#	else
+	constext txt_quit_edit_post[] = N_("%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: ");
+	constext txt_quit_edit_send[] = N_("%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: ");
+	constext txt_quit_edit_xpost[] = N_("%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: ");
+#	endif /* HAVE_ISPELL */
+#else
+#	ifdef HAVE_ISPELL
+		constext txt_quit_edit_post[] = N_("%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: ");
+		constext txt_quit_edit_send[] = N_("%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: ");
+		constext txt_quit_edit_xpost[] = N_("%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%.*s]: ");
+#	else
+		constext txt_quit_edit_post[] = N_("%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: ");
+		constext txt_quit_edit_send[] = N_("%s=quit, %s=edit, %s=send [%%.*s]: ");
+		constext txt_quit_edit_xpost[] = N_("%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: ");
+#	endif /* HAVE_ISPELL */
+#endif /* HAVE_PGP_GPG */
+
+#ifdef M_AMIGA
+	constext txt_copyright_notice[] = "%s (c) Copyright 1991-2003 Iain Lea & Mark Tomlinson.";
+	constext txt_env_var_not_found[] = N_("Environment variable %s not found. Set and retry...");
+	constext txt_usage_bbs_mode[] = N_("  -B       BBS mode. File operations limited to home directories.");
+#endif /* M_AMIGA */
+
+#ifdef M_UNIX
+	constext txt_copyright_notice[] = "%s (c) Copyright 1991-2003 Iain Lea.";
+#endif /* M_UNIX */
+
+#ifdef NNTP_ABLE
+	constext txt_caching_off[] = N_("Try cache_overview_files to speed up things.\n");
+	constext txt_caching_on[] = N_("Tin will use local index files instead.\n");
+	constext txt_cannot_get_nntp_server_name[] = N_("Cannot find NNTP server name");
+	constext txt_connecting_port[] = N_("Connecting to %s:%d...");
+	constext txt_disconnecting[] = N_("Disconnecting from server...\n");
+	constext txt_error_wrong_newsgroupname_in_group_response[] = N_("Wrong newsgroup name in response of GROUP command, %s for %s");
+	constext txt_failed_to_connect_to_server[] = N_("Failed to connect to NNTP server %s. Exiting...");
+	constext txt_nntp_ok_goodbye[] = N_("205  Closing connection");
+	constext txt_no_xover_support[] = N_("Your server does not support the NNTP XOVER or OVER command.\n");
+	constext txt_reconnect_to_news_server[] = N_("Connection to news server has timed out. Reconnect?");
+	constext txt_server_name_in_file_env_var[] = N_("Put the server name in the file %s,\nor set the environment variable NNTPSERVER");
+	constext txt_usage_force_authentication[] = N_("  -A       force authentication on connect");
+	constext txt_usage_newsserver[] = N_("  -g serv  read news from NNTP server serv [default=%s]");
+	constext txt_usage_port[] = N_("  -p port  use port as NNTP port [default=%d]");
+	constext txt_usage_quickstart[] = N_("  -Q       quick start. Same as -nqd");
+	constext txt_usage_read_only_active[] = N_("  -l       use only LIST instead of GROUP (-n) command");
+	constext txt_usage_read_only_subscribed[] = N_("  -n       only read subscribed .newsrc groups from NNTP server");
+#	ifdef HAVE_GETSERVBYNAME
+		constext txt_error_unknown_service[] = N_("%s/tcp: Unknown service.\n");
+#	endif /* HAVE_GETSERVBYNAME */
+#	ifdef INET6
+		constext txt_error_socket_or_connect_problem[] = N_("\nsocket or connect problem\n");
+#	else
+		constext txt_connection_to[] = N_("\nConnection to %s: ");
+		constext txt_giving_up[] = N_("Giving up...\n");
+#	endif /* INET6 */
+#	ifdef XHDR_XREF
+		constext txt_warn_xref_not_supported[] = N_("Your server does not have Xref: in its XOVER information.\n\
+Tin will try to use XHDR XREF instead (slows down things a bit).\n");
+#	else
+		constext txt_warn_xref_not_supported[] = N_("Your server does not have Xref: in its XOVER information.\n");
+#	endif /* XHDR_XREF */
+#	ifndef NNTP_ONLY
+		constext txt_cannot_open_active_file[] = N_("Can't open %s. Try %s -r to read news via NNTP.\n");
+#	endif /* !NNTP_ONLY */
+#else
+	constext txt_usage_quickstart[] = N_("  -Q       quick start. Same as -qd");
+	constext txt_usage_read_only_active[] = N_("  -l       read only active file instead of scanning spool (-n) command");
+	constext txt_usage_read_only_subscribed[] = N_("  -n       only read subscribed .newsrc groups from spool");
+	constext txt_warn_xref_not_supported[] = N_("Your server does not have Xref: in its NOV-files.\n");
+#endif /* NNTP_ABLE */
+
+#ifdef NNTP_INEWS
+	constext txt_post_via_builtin_inews[] = N_("Posting using external inews failed. Use built in inews instead?");
+	constext txt_post_via_builtin_inews_only[] = N_("It worked! Should I always use my built in inews from now on?");
+#endif /* NNTP_INEWS */
+
+#ifdef VMS
+	constext txt_copyright_notice[] = "%s (c) Copyright 1991-2003 Iain Lea & Tod McQuillin & other.";
+#endif /* VMS */
+
+#ifndef DISABLE_PRINTING
+	constext txt_articles_printed[] = N_("%d %s printed");
+	constext txt_help_global_print[] = N_("output article/thread/hot/pattern/tagged articles to printer");
+	constext txt_print[] = N_("Print");
+	constext txt_printing[] = N_("Printing...");
+#endif /* !DISABLE_PRINTING */
+
+#ifndef DONT_HAVE_PIPING
+	constext txt_help_global_pipe[] = N_("pipe article/thread/hot/pattern/tagged articles into command");
+	constext txt_no_command[] = N_("No command");
+	constext txt_pipe[] = N_("Pipe");
+	constext txt_pipe_to_command[] = N_("Pipe to command [%.*s]> ");
+	constext txt_piping[] = N_("Piping...");
+#else
+	constext txt_piping_not_enabled[] = N_("Piping not enabled.");
+#endif /* !DONT_HAVE_PIPING */
+
+#ifndef FOLLOW_USEFOR_DRAFT
+	constext txt_error_header_line_comma[] = N_("\n\
+Error: The \"%s:\" line has spaces  in it that MUST be removed.\n\
+       The only allowable  space is the one  separating the colon (:)\n\
+       from  the  contents.  Use a  comma  (,)  to separate  multiple\n\
+       newsgroup names.\n");
+	constext txt_error_header_line_groups_contd[] = N_("\n\
+Error: The \"%s:\" line is  continued in  the next line.  Since\n\
+       the line  may not  contain  whitespace,  this is  not allowed.\n\
+       Please write all newsgroups into a single line.\n");
+#else
+	constext txt_warn_header_line_groups_contd[] = N_("\n\
+Warning: The \"%s:\" line is continued in the next line.\n\
+         This is a very new feature and may not be accepted by all servers.\n\
+         To avoid trouble please write all newsgroups into a single line.\n");
+	constext txt_warn_header_line_comma[] = N_("\n\
+Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n");
+#endif /* !FOLLOW_USEFOR_DRAFT */
+
+#ifndef NO_ETIQUETTE
+	constext txt_warn_posting_etiquette[] = N_("\n\
+  If your article contains quoted text  please take some time to pare it down\n\
+  to just the  key points to which you are  responding,  or people will think\n\
+  you are a dweeb!  Many people have the habit of skipping any article  whose\n\
+  first page is largely  quoted material.  Format your article to fit in less\n\
+  then 80 chars,  since that's the conventional size  (72 is a good choice as\n\
+  it allows quoting without exceeding the limit).  If your lines are too long\n\
+  they'll wrap  around  ugly and  people won't  read what you  write.  If you\n\
+  aren't  careful  and considerate  in  formatting  your posting, people  are\n\
+  likely to ignore it completely.  It's a crowded net out there.\n");
+#endif /* !NO_ETIQUETTE */
+
+#ifndef NO_SHELL_ESCAPE
+	constext txt_help_global_shell_escape[] = N_("shell escape");
+	constext txt_shell_command[] = N_("Shell Command (%s)");
+	constext txt_shell_escape[] = N_("Enter shell command [%s]> ");
+#endif /* !NO_SHELL_ESCAPE */
+
+#if defined(M_UNIX) && !defined(USE_TERMINFO)
+	constext txt_cannot_get_term_entry[] = N_("%s: Can't get entry for TERM\n");
+#endif /* M_UNIX && !USE_TERMINFO */
+
+#if defined(HAVE_POLL) || defined(HAVE_SELECT)
+	constext txt_group[] = N_("Group %.*s ('q' to quit)...");
+#else
+	constext txt_group[] = N_("Group %.*s...");
+#endif /* HAVE_POLL || HAVE_SELECT */
+
+#if defined(NNTP_ABLE) && defined(TLI) && !defined(INET6)
+	constext txt_error_server_unavailable[] = N_("Server unavailable\n");
+	constext txt_error_topen[] = "t_open: can't t_open /dev/tcp";
+#endif /* NNTP_ABLE && TLI && !INET6 */
+
+#ifndef DISABLE_PRINTING
+#	ifndef DONT_HAVE_PIPING
+		constext txt_mini_group_3[] = N_("%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post");
+		constext txt_mini_page_3[] = N_("%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post");
+#	else
+		constext txt_mini_group_3[] = N_("%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post");
+		constext txt_mini_page_3[] = N_("%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post");
+#	endif /* DONT_HAVE_PIPING */
+#else
+#	ifndef DONT_HAVE_PIPING
+		constext txt_mini_group_3[] = N_("%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post");
+		constext txt_mini_page_3[] = N_("%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post");
+#	else
+		constext txt_mini_group_3[] = N_("%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post");
+		constext txt_mini_page_3[] = N_("%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post");
+#	endif /* DONT_HAVE_PIPING */
+#endif /* DISABLE_PRINTING */
+
+#ifdef HAVE_COLOR
+#	ifdef USE_CURSES
+		constext txt_no_colorterm[] = N_("Terminal does not support color");
+#	endif /* USE_CURSES */
+#endif /* HAVE_COLOR */
+
+#if defined(NNTP_ABLE) && defined(HAVE_INET_NTOA)
+	constext txt_trying[] = N_("Trying %s");
+#endif /* NNTP_ABLE && HAVE_INET_NTOA */
+
 
 /*
  * OFF ~ FALSE, ON ~ TRUE
@@ -973,7 +1236,7 @@ constext *txt_strip_bogus_type[] = {
 /* Ways of handling killed articles */
 constext *txt_kill_level_type[] = {
 		N_("Kill only unread arts"),
-		N_("Kill all arts & show with K"),
+		N_("Kill all arts & show with K"), /* TODO: s/K/art_marked_killed/ */
 		N_("Kill all arts and never show")
 };
 
@@ -1021,274 +1284,6 @@ constext *txt_mailbox_formats[] = {
 	"MBOXRD",
 	"MMDF"
 };
-
-#ifndef DISABLE_PRINTING
-	constext txt_print[] = N_("Print");
-	constext txt_printing[] = N_("Printing...");
-#endif /* !DISABLE_PRINTING */
-
-#ifdef HAVE_PGP_GPG
-#	ifdef HAVE_ISPELL
-		constext txt_quit_edit_post[] = N_("%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: ");
-		constext txt_quit_edit_send[] = N_("%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: ");
-		constext txt_quit_edit_xpost[] = N_("%s=quit, %s=edit, %s=ispell, %s=pgp, %s=post, %s=postpone [%%.*s]: ");
-#	else
-	constext txt_quit_edit_post[] = N_("%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: ");
-	constext txt_quit_edit_send[] = N_("%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: ");
-	constext txt_quit_edit_xpost[] = N_("%s=quit, %s=edit, %s=pgp, %s=post, %s=postpone [%%.*s]: ");
-#	endif /* HAVE_ISPELL */
-#else
-#	ifdef HAVE_ISPELL
-		constext txt_quit_edit_post[] = N_("%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: ");
-		constext txt_quit_edit_send[] = N_("%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: ");
-		constext txt_quit_edit_xpost[] = N_("%s=quit, %s=edit, %s=ispell, %s=post, %s=postpone [%%.*s]: ");
-#	else
-		constext txt_quit_edit_post[] = N_("%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: ");
-		constext txt_quit_edit_send[] = N_("%s=quit, %s=edit, %s=send [%%.*s]: ");
-		constext txt_quit_edit_xpost[] = N_("%s=quit, %s=edit, %s=post, %s=postpone [%%.*s]: ");
-#	endif /* HAVE_ISPELL */
-#endif /* HAVE_PGP_GPG */
-
-constext txt_at_s[] = N_(" at %s");
-constext txt_there_is_no_news[] = N_("There is no news\n");
-constext txt_thread[] = N_("Thread");
-constext txt_thread_com[] = N_("Thread Level Commands");
-constext txt_thread_marked_as_deselected[] = N_("Thread deselected");
-constext txt_thread_marked_as_selected[] = N_("Thread selected");
-constext txt_thread_range[] = N_("Thread range");
-constext txt_thread_x_of_n[] = N_("%sThread %4s of %4s");
-constext txt_threading_arts[] = N_("Threading articles...");
-constext txt_toggled_high[] = N_("Toggled word highlighting %s");
-constext txt_toggled_rot13[] = N_("Toggled rot13 encoding");
-constext txt_toggled_tex2iso[] = N_("Toggled german TeX encoding %s");
-constext txt_toggled_tabwidth[] = N_("Toggled tab-width to %d");
-constext txt_trying[] = N_("Trying %s");
-constext txt_trying_dotlock[] = N_("%d Trying to dotlock %s");
-constext txt_trying_lock[] = N_("%d Trying to lock %s");
-constext txt_type_h_for_help[] = N_("           h=help\n");
-constext txt_unread[] = N_("unread ");
-constext txt_unsubscribed_num_groups[] = N_("unsubscribed from %d groups");
-constext txt_unsubscribed_to[] = N_("Unsubscribed from %s");
-constext txt_unsubscribing[] = N_("Unsubscribing... ");
-constext txt_untagged_art[] = N_("Untagged article");
-constext txt_untagged_thread[] = N_("Untagged thread");
-constext txt_unthreading_arts[] = N_("Unthreading articles...");
-constext txt_updated[] = N_("Updated");
-constext txt_updating[] = N_("Updating");
-constext txt_url_open[] = N_("Opening %s\n");
-constext txt_url_done[] = N_("No more URL's in this article");
-constext txt_use_mime[] = N_("Use MIME display program for this message?");
-constext txt_usage_catchup[] = N_("  -c       mark all news as read in subscribed newsgroups (batch mode)");
-constext txt_usage_check_for_unread_news[] = N_("  -Z       return status indicating if any unread news (batch mode)");
-constext txt_usage_dont_check_new_newsgroups[] = N_("  -q       don't check for new newsgroups");
-constext txt_usage_dont_save_files_on_quit[] = N_("  -X       don't save any files on quit");
-constext txt_usage_dont_show_descriptions[] = N_("  -d       don't show newsgroup descriptions");
-constext txt_usage_getart_limit[] = N_("  -G limit get only limit articles/group");
-constext txt_usage_help_information[] = N_("  -H       help information about %s");
-constext txt_usage_help_message[] = N_("  -h       this help message");
-constext txt_usage_index_newsdir[] = N_("  -I dir   news index file directory [default=%s]");
-constext txt_usage_update_index_files[] = N_("  -u       update index files (batch mode)");
-constext txt_usage_maildir[] = N_("  -m dir   mailbox directory [default=%s]");
-constext txt_usage_mail_bugreport[] = N_("\nMail bug reports/comments to %s");
-constext txt_usage_mail_new_news[] = N_("  -N       mail new news to your posts (batch mode)");
-constext txt_usage_mail_new_news_to_user[] = N_("  -M user  mail new news to specified user (batch mode)");
-constext txt_usage_newsrc_file[] = N_("  -f file  subscribed to newsgroups file [default=%s]");
-constext txt_usage_post_article[] = N_("  -w       post an article and exit");
-constext txt_usage_post_postponed_arts[] = N_("  -o       post all postponed articles and exit");
-constext txt_usage_read_news_remotely[] = N_("  -r       read news remotely from default NNTP server");
-constext txt_usage_read_saved_news[] = N_("  -R       read news saved by -S option");
-constext txt_usage_savedir[] = N_("  -s dir   save news directory [default=%s]");
-constext txt_usage_save_new_news[] = N_("  -S       save new news for later reading (batch mode)");
-constext txt_usage_start_if_unread_news[] = N_("  -z       start if any unread news");
-constext txt_usage_tin[] = N_("A Usenet reader.\n\nUsage: %s [options] [newsgroup[,...]]");
-#ifdef HAVE_COLOR
-	constext txt_usage_toggle_color[] = N_("  -a       toggle color flag");
-#endif /* HAVE_COLOR */
-constext txt_usage_verbose[] = N_("  -v       verbose output for batch mode options");
-constext txt_usage_version[] = N_("  -V       print version & date information");
-constext txt_useful_without_batch_mode[] = N_("%s only useful without batch mode operations\n");
-constext txt_useful_with_batch_mode[] = N_("%s only useful for batch mode operations\n");
-constext txt_value_out_of_range[] = N_("\n%s%d out of range (0 - %d). Reset to 0");
-constext txt_warn_art_line_too_long[] = N_("\nWarning: posting exceeds %d columns. Line %d is the first long one:\n%-100s\n");
-constext txt_warn_article_unchanged[] = N_("\nWarning: article unchanged after editing\n");
-constext txt_warn_blank_subject[] = N_("\nWarning: \"Subject:\" contains only whitespaces.\n");
-#ifdef CHARSET_CONVERSION
-	constext txt_warn_charset_conversion[] = N_("\n\
-Warning: Posting is in %s and contains characters which are not\n\
-         in your selected MM_NETWORK_CHARSET: %s.\n\
-         These characters will be replaced by '?' if you post this\n\
-         article unchanged. To avoid garbling your article please either\n\
-         edit it and remove those characters or change the setting of\n\
-         MM_NETWORK_CHARSET to a suitable value for your posting via the\n\
-         M)enu option.\n");
-#endif /* CHARSET_CONVERSION */
-constext txt_warn_re_but_no_references[] = N_("\n\
-Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n");
-constext txt_warn_references_but_no_re[] = N_("\n\
-Warning: Article has \"References:\" but \"Subject:\" does not begin\n\
-         with \"Re: \" and does not contain \"(was:\".\n");
-constext txt_warn_cancel[] = N_("Read carefully!\n\n\
-  You are about to cancel an article seemingly written by you. This will wipe\n\
-  the article from most  news servers  throughout the world,  but there is no\n\
-  guarantee that it will work.\n\nThis is the article you are about to cancel:\n\n");
-constext txt_warn_encoding_and_external_inews[] = N_("\n\
-Warning: You are using a non-plain transfer encoding (such as base64 or\n\
-         quoted-printable) and an external inews program to submit your\n\
-         article. If a signature is appended by that inews program it will\n\
-         not be encoded properly.\n");
-
-#ifdef FOLLOW_USEFOR_DRAFT
-	constext txt_warn_header_line_groups_contd[] = N_("\n\
-Warning: The \"%s:\" line is continued in the next line.\n\
-         This is a very new feature and may not be accepted by all servers.\n\
-         To avoid trouble please write all newsgroups into a single line.\n");
-	constext txt_warn_header_line_comma[] = N_("\n\
-Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n");
-#endif /* FOLLOW_USEFOR_DRAFT */
-
-constext txt_warn_update[] = N_("\n\nYou are upgrading to tin %s from an earlier version.\n\
-Some values in your %s file have changed!\nRead WHATSNEW, etc...\n");
-
-constext txt_warn_downgrade[] = N_("\n\nYou are downgrading to tin %s from a more recent version!\n\
-Some values in your %s file may be ignored, others might have changed!\n");
-
-constext txt_warn_unrecognized_version[] = "\n\nUnrecognized version string!\n";
-
-constext txt_warn_newsrc[] = N_("Warning: tin wrote fewer groups to your\n\t%s\n\
-than it read at startup. If you didn't unsubscribe from %ld %s during\n\
-this session this indicates an error and you should backup your %s\n\
-before you start tin once again!\n");
-
-#ifdef FORGERY
-	constext txt_warn_cancel_forgery[] = N_("Read carefully!\n\n\
-  You are about to cancel an article seemingly not written by you.  This will\n\
-  wipe the article from lots of news servers throughout the world;\n\
-  Usenet's majority  considers this  rather inappropriate,  to say the least.\n\
-  Only press 'd'  if you are  absolutely positive  that you are ready to take\n\
-  the rap.\n\nThis is the article you are about to cancel:\n\n");
-#endif /* FORGERY */
-
-#ifndef HAVE_FASCIST_NEWSADMIN
-	constext txt_warn_followup_to_several_groups[] = N_("\nWarning: Followup-To set to more than one newsgroup!\n");
-	constext txt_warn_missing_followup_to[] = N_("\nWarning: cross-posting to %d newsgroups and no Followup-To line!\n");
-	constext txt_warn_not_in_newsrc[] = N_("\nWarning: \"%s\" is not in your newsrc, it may be invalid at this site!\n");
-	constext txt_warn_not_valid_newsgroup[] = N_("\nWarning: \"%s\" is not a valid newsgroup at this site!\n");
-#endif /* !HAVE_FASCIST_NEWSADMIN */
-
-#ifndef NO_ETIQUETTE
-	constext txt_warn_posting_etiquette[] = N_("\n\
-  If your article contains quoted text  please take some time to pare it down\n\
-  to just the  key points to which you are  responding,  or people will think\n\
-  you are a dweeb!  Many people have the habit of skipping any article  whose\n\
-  first page is largely  quoted material.  Format your article to fit in less\n\
-  then 80 chars,  since that's the conventional size  (72 is a good choice as\n\
-  it allows quoting without exceeding the limit).  If your lines are too long\n\
-  they'll wrap  around  ugly and  people won't  read what you  write.  If you\n\
-  aren't  careful  and considerate  in  formatting  your posting, people  are\n\
-  likely to ignore it completely.  It's a crowded net out there.\n");
-#endif /* !NO_ETIQUETTE */
-
-constext txt_warn_multiple_sigs[] = N_("\nWarning: Found %d '-- \\n' lines, this may confuse some people.\n");
-constext txt_warn_not_all_arts_saved[] = N_("Warning: Only %d out of %d articles were saved");
-constext txt_warn_sig_too_long[] = N_("\n\
-Warning: Your signature  is longer than %d lines.  Since signatures usually do\n\
-         not  transport any  useful information,  they should be as  short as\n\
-         possible.\n");
-constext txt_warn_suspicious_mail[] = N_("Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? ");
-constext txt_warn_wrong_sig_format[] = N_("\nWarning: Signatures should start with '-- \\n' not with '--\\n'.\n");
-constext txt_writing_attributes_file[] = N_("Writing attributes file...");
-constext txt_x_resp[] = N_("%d Responses%s");
-constext txt_yanked_groups[] = N_("Added %d %s");
-constext txt_yanked_none[] = N_("No unsubscribed groups to show");
-constext txt_yanked_sub_groups[] = N_("Showing subscribed to groups only");
-constext txt_show_unread[] = N_("Showing unread groups only");
-constext txt_yes[] = N_("Yes ");
-constext txt_you_have_mail[] = N_("    You have mail\n");
-constext txt_all_groups[] = N_("All groups");
-constext txt_filter_comment[] = N_("Comment (optional)  : ");
-constext txt_filter_text_type[] = N_("Apply pattern to    : ");
-constext txt_from_line_only[] = N_("From: line (ignore case)      ");
-constext txt_from_line_only_case[] = N_("From: line (case sensitive)   ");
-constext txt_help_filter_comment[] = N_("One or more lines of comment. <CR> to add a line or proceed if line is empty.");
-constext txt_help_filter_from[] = N_("From: line to add to filter file. <SPACE> toggles & <CR> sets.");
-constext txt_help_filter_lines[] = N_("Linecount of articles to be filtered. < for less, > for more, = for equal.");
-constext txt_help_filter_msgid[] = N_("Message-ID: line to add to filter file. <SPACE> toggles & <CR> sets.");
-constext txt_help_filter_subj[] = N_("Subject: line to add to filter file. <SPACE> toggles & <CR> sets.");
-constext txt_help_filter_text[] = N_("Enter text pattern to filter if Subject: & From: lines are not what you want.");
-constext txt_help_filter_text_type[] = N_("Select where text pattern should be applied. <SPACE> toggles & <CR> sets.");
-constext txt_help_filter_time[] = N_("Expiration time in days for the entered filter. <SPACE> toggles & <CR> sets.");
-constext txt_help_kill_scope[] = N_("Apply kill only to current group or all groups. <SPACE> toggles & <CR> sets.");
-constext txt_help_select_scope[] = N_("Apply select to current group or all groups. <SPACE> toggles & <CR> sets.");
-constext txt_kill_from[] = N_("Kill From:     [%-*.*s] (y/n): ");
-constext txt_kill_lines[] = N_("Kill Lines: (</>num): ");
-constext txt_kill_menu[] = N_("Kill Article Menu");
-constext txt_kill_msgid[] = N_("Kill Msg-Id:   [%-*.*s] (f/l/o/n): ");
-constext txt_kill_scope[] = N_("Kill pattern scope  : ");
-constext txt_kill_subj[] = N_("Kill Subject:  [%-*.*s] (y/n): ");
-constext txt_kill_text[] = N_("Kill text pattern   : ");
-constext txt_kill_time[] = N_("Kill time in days   : ");
-constext txt_msgid_line_only[] = N_("Message-ID: line              ");
-constext txt_select_from[] = N_("Select From    [%-*.*s] (y/n): ");
-constext txt_select_lines[] = N_("Select Lines: (</>num): ");
-constext txt_select_menu[] = N_("Auto-select Article Menu");
-constext txt_select_msgid[] = N_("Select Msg-Id  [%-*.*s] (f/l/o/n): ");
-constext txt_select_scope[] = N_("Select pattern scope: ");
-constext txt_select_subj[] = N_("Select Subject [%-*.*s] (y/n): ");
-constext txt_select_text[] = N_("Select text pattern : ");
-constext txt_select_time[] = N_("Select time in days   : ");
-constext txt_subj_line_only[] = N_("Subject: line (ignore case)   ");
-constext txt_subj_line_only_case[] = N_("Subject: line (case sensitive)");
-constext txt_time_default_days[] = N_("%d days");
-constext txt_unlimited_time[] = N_("Unlimited");
-constext txt_full[] = N_("Full");
-constext txt_last[] = N_("Last");
-constext txt_only[] = N_("Only");
-constext txt_filter_file[] = N_("# Format:\n\
-#   comment=STRING    Optional. Multiple lines allowed. Comments must be placed\n\
-#                     at the beginning of a rule, or they will be moved to the\n\
-#                     next rule. '#' is not a valid keyword for a comment!\n\
-#   group=STRING      Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n\
-#   case=NUM          Mandatory. Compare=0 / ignore=1 case when filtering.\n\
-#   score=NUM|STRING  Mandatory. Score to give. Either:\n\
-#     score=NUM         A number (e.g. 70). Or:\n\
-#     score=STRING      One of the two keywords: 'hot' or 'kill'.\n\
-#   subj=STRING       Optional. Subject: line (e.g. How to be a wizard).\n\
-#   from=STRING       Optional. From: line (e.g. *Craig Shergold*).\n\
-#   msgid=STRING      Optional. Message-ID: line (e.g. <123@ether.net>) with\n\
-#                     full references.\n\
-#   msgid_last=STRING Optional. Like above, but with last reference only.\n\
-#   msgid_only=STRING Optional. Like above, but without references.\n\
-#   refs_only=STRING  Optional. References: line (e.g. <123@ether.net>) without\n\
-#                     Message-ID:\n\
-#   lines=[<>]?NUM    Optional. Lines: line. '<' or '>' are optional.\n\
-#   gnksa=[<>]?NUM    Optional. GNKSA parse_from() return code. '<' or '>' opt.\n\
-#   xref=PATTERN      Optional. Kill pattern (e.g. alt.flame*)\n\
-#   time=NUM          Optional. time_t value when rule expires\n#\n");
-constext txt_filter_score[] = N_("Enter score for rule (default=%d): ");
-constext txt_filter_score_help[] = N_("Enter the score weight (range 0 < score <= %d)"); /* SCORE_MAX */
-
-constext txt_art_deleted[] = N_("Article deleted.");
-constext txt_art_undeleted[] = N_("Article undeleted.");
-constext txt_processing_mail_arts[] = N_("Processing mail messages marked for deletion.");
-constext txt_processing_saved_arts[] = N_("Processing saved articles marked for deletion.");
-
-#ifdef M_AMIGA
-	constext txt_env_var_not_found[] = N_("Environment variable %s not found. Set and retry...");
-	constext txt_usage_bbs_mode[] = N_("  -B       BBS mode. File operations limited to home directories.");
-#endif /* M_AMIGA */
-
-#ifdef HAVE_FASCIST_NEWSADMIN
-	constext txt_error_followup_to_several_groups[] = N_("\nError: Followup-To set to more than one newsgroup!\n");
-	constext txt_error_missing_followup_to[] = N_("\nError: cross-posting to %d newsgroups and no Followup-To line!\n");
-	constext txt_error_not_valid_newsgroup[] = N_("\nError: \"%s\" is not a valid newsgroup!\n");
-#endif /* HAVE_FASCIST_NEWSADMIN */
-
-#ifdef XHDR_XREF
-	constext txt_warn_xref_not_supported[] = N_("Your server does not have Xref: in its XOVER information.\n\
-Tin will try to use XHDR XREF instead (slows down things a bit).\n");
-#else
-	constext txt_warn_xref_not_supported[] = N_("Your server does not have Xref: in its XOVER information.\n");
-#endif /* XHDR_XREF */
 
 struct opttxt txt_display_options = {
 	NULL,
diff -Nurp tin-1.5.18/src/lock.c tin-1.6.0/src/lock.c
--- tin-1.5.18/src/lock.c	Thu May 15 16:25:29 2003
+++ tin-1.6.0/src/lock.c	Sat Jul 12 15:49:46 2003
@@ -52,6 +52,9 @@
 #	endif /* HAVE_FCNTL */
 #endif /* !USE_FLOCK && !USE_LOCKF && !USE_FCNTL */
 
+/*
+ * TODO: add support for $LOCKEXT
+ */
 #define LOCK_SUFFIX ".lock"
 
 /*
diff -Nurp tin-1.5.18/src/main.c tin-1.6.0/src/main.c
--- tin-1.5.18/src/main.c	Wed May 21 19:14:31 2003
+++ tin-1.6.0/src/main.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : main.c
  *  Author    : I. Lea & R. Skrenta
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-11
+ *  Updated   : 2003-06-29
  *  Notes     :
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>, Rich Skrenta <skrenta@pbm.com>
@@ -47,7 +47,7 @@
 
 #if defined(M_AMIGA) && defined(__SASC_650)
 	extern int _WBArg;
-	extern char	**_WBArgv;
+	extern char **_WBArgv;
 	char __stdiowin[] = "con:0/12/640/200/TIN " VERSION;
 	char __stdiov37[] = "/AUTO/NOCLOSE";
 #else
@@ -74,7 +74,6 @@ static t_bool start_any_unread = FALSE;	
  * Local prototypes
  */
 static t_bool create_mail_save_dirs(void);
-static t_bool setup_private_overview(void);
 static void read_cmd_line_options(int argc, char *argv[]);
 static void show_intro_page(void);
 static void update_index_files(void);
@@ -200,32 +199,25 @@ main(
 	/*
 	 * Connect to nntp server?
 	 */
-	if (read_news_via_nntp) {
-		if (!read_saved_news) {
-			if (nntp_open())
-				giveup();
-		} else { /* set nntp_server if reading via -R as it's used in select.c */
-			if ((nntp_server = getserverbyfile(NNTP_SERVER_FILE)) == NULL)
-				nntp_server = my_strdup("reading saved news"); /* mem-leak on exit */
-		}
-	}
+	nntp_server = getserverbyfile(NNTP_SERVER_FILE);
+	if (read_news_via_nntp && !read_saved_news && nntp_open())
+		giveup();
+
+	read_server_config();
 
 	/*
 	 * exit early - unfortunately we can't do that in read_cmd_line_options()
-	 * as xover_supported is set in nntp_open()
+	 * as xover_cmd is set in nntp_open()
 	 */
-	if (update_index && read_news_via_nntp && xover_supported && !tinrc.cache_overview_files) {
+	if (update_index && xover_cmd && !tinrc.cache_overview_files) {
 		error_message(_(txt_batch_update_unavail), tin_progname);
 		giveup();
 	}
 
-	if (!setup_private_overview())		/* TODO: issue a warning if it fails */
-		fprintf(stderr, "Unable to setup local overview cache\n");
-
 	/*
 	 * Check if overview indexes contain Xref: lines
 	 */
-	if (xover_supported)
+	if (xover_cmd)
 		xref_supported = overview_xref_support();
 
 #ifdef DEBUG_NEWSRC
@@ -756,9 +748,9 @@ read_cmd_line_options(
 				"-HAVE_METAMAIL "
 #endif /* HAVE_METAMAIL */
 #ifdef HAVE_SUM
-				"+HAVE_SUM "
+				"+HAVE_SUM"
 #else
-				"-HAVE_SUM "
+				"-HAVE_SUM"
 #endif /* HAVE_SUM */
 				"\n\t"
 #ifdef HAVE_COLOR
@@ -777,9 +769,9 @@ read_cmd_line_options(
 				"-HAVE_PGPK "
 #endif /* HAVE_PGPK */
 #ifdef HAVE_GPG
-				"+HAVE_GPG "
+				"+HAVE_GPG"
 #else
-				"-HAVE_GPG "
+				"-HAVE_GPG"
 #endif /* HAVE_GPG */
 				"\n\t"
 #ifdef MIME_BREAK_LONG_LINES
@@ -793,15 +785,20 @@ read_cmd_line_options(
 				"-MIME_STRICT_CHARSET "
 #endif /* MIME_STRICT_CHARSET */
 #ifdef CHARSET_CONVERSION
-				"+CHARSET_CONVERSION "
+				"+CHARSET_CONVERSION"
 #else
-				"-CHARSET_CONVERSION "
+				"-CHARSET_CONVERSION"
 #endif /* CHARSET_CONVERSION */
 				"\n\t"
+#ifdef MULTIBYTE_ABLE
+				"+MULTIBYTE_ABLE "
+#else
+				"-MULTIBYTE_ABLE "
+#endif /* MULTIBYTE_ABLE */
 #ifdef NO_LOCALE
-				"+NO_LOCALE "
+				"+NO_LOCALE"
 #else
-				"-NO_LOCALE "
+				"-NO_LOCALE"
 #endif /* NO_LOCALE */
 				"\n\t"
 #ifdef USE_CANLOCK
@@ -1086,57 +1083,6 @@ read_cmd_line_groups(
 		}
 	}
 	return matched;
-}
-
-
-/*
- * If we're cacheing overview files and the user specified an NNTP server
- * with the '-g' option, make the directory name specific to the NNTP server
- * and make sure the directory exists.
- * Returns FALSE if we needed to set up the local cache dir but could not
- */
-static t_bool
-setup_private_overview(
-	void)
-{
-	struct stat sb;
-
-	if (read_news_via_nntp && xover_supported && !tinrc.cache_overview_files)
-		return TRUE;
-
-	/*
-	 * TODO: don't create cache dir if we are reading from local spool,
-	 *       the systems overview data is readable and
-	 *       !tinrc.cache_overview_files
-	 */
-
-	if (cmdline_nntpserver[0] != 0) {	/* this => read_news_via_nntp */
-		char *from;
-		char *to;
-		int c;
-
-		to = index_newsdir + strlen(index_newsdir);
-		*(to++) = '-';
-		for (from = cmdline_nntpserver; (c = *from) != 0; ++from)
-			*(to++) = tolower(c);
-		*to = '\0';
-	}
-
-#	ifdef DEBUG
-	debug_nntp("setup_private_overview", index_newsdir);
-#	endif /* DEBUG */
-
-	if (stat(index_newsdir, &sb) == -1) {
-		if (my_mkdir(index_newsdir, (mode_t) S_IRWXU))
-			return FALSE;
-	} else {
-		if (!S_ISDIR(sb.st_mode))
-			return FALSE;
-	}
-
-	/* TODO why is this only done here ? */
-	joinpath(local_newsgroups_file, index_newsdir, NEWSGROUPS_FILE);
-	return TRUE;
 }
 
 
diff -Nurp tin-1.5.18/src/misc.c tin-1.6.0/src/misc.c
--- tin-1.5.18/src/misc.c	Wed May 21 19:14:31 2003
+++ tin-1.6.0/src/misc.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : misc.c
  *  Author    : I. Lea & R. Skrenta
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-16
+ *  Updated   : 2003-06-17
  *  Notes     :
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>, Rich Skrenta <skrenta@pbm.com>
@@ -645,81 +645,6 @@ tin_done(
 }
 
 
-/*
- * strip_double_ngs()
- * Strip duplicate newsgroups from within a given list of comma
- * separated groups
- *
- * 14-Jun-'96 Sven Paulus <sven@oops.sub.de>
- *
- */
-void
-strip_double_ngs(
-	char *ngs_list)
-{
-	char *ptr;			/* start of next (outer) newsgroup */
-	char *ptr2;			/* temporary pointer */
-	char ngroup1[HEADER_LEN];	/* outer newsgroup to compare */
-	char ngroup2[HEADER_LEN];	/* inner newsgroup to compare */
-	char cmplist[HEADER_LEN];	/* last loops output */
-	char newlist[HEADER_LEN];	/* the newly generated list without */
-										/* any duplicates of the first nwsg */
-	int ncnt1;			/* counter for the first newsgroup */
-	int ncnt2;			/* counter for the second newsgroup */
-	t_bool over1;		/* TRUE when the outer loop is over */
-	t_bool over2;		/* TRUE when the inner loop is over */
-
-	/* shortcut, check if there is only 1 group */
-	if (strchr(ngs_list, ',') != NULL) {
-		over1 = FALSE;
-		ncnt1 = 0;
-		strcpy(newlist, ngs_list);		/* make a "working copy" */
-		ptr = newlist;						/* the next outer newsg. is the 1st */
-
-		while (!over1) {
-			ncnt1++;							/* inc. outer counter */
-			strcpy(cmplist, newlist);	/* duplicate groups for inner loop */
-			ptr2 = strchr(ptr, ',');	/* search "," ... */
-			if (ptr2 != NULL) {	/* if found ... */
-				*ptr2 = '\0';
-				strcpy(ngroup1, ptr);	/* chop off first outer newsgroup */
-				ptr = ptr2 + 1;			/* pointer points to next newsgr. */
-			} else {							/* ... if not: last group */
-				over1 = TRUE;				/* wow, everything is done after . */
-				strcpy(ngroup1, ptr);	/* ... this last outer newsgroup */
-			}
-
-			over2 = FALSE;
-			ncnt2 = 0;
-
-			/*
-			 * now compare with each inner newsgroup on the list,
-			 * which is behind the momentary outer newsgroup
-			 * if it is different from the outer newsgroup, append
-			 * to list, strip double-commas
-			 */
-
-			while (!over2) {
-				ncnt2++;
-				strcpy(ngroup2, cmplist);
-				ptr2 = strchr(ngroup2, ',');
-				if (ptr2 != NULL) {
-					strcpy(cmplist, ptr2 + 1);
-					*ptr2 = '\0';
-				} else
-					over2 = TRUE;
-
-				if ((ncnt2 > ncnt1) && (strcasecmp(ngroup1, ngroup2)) && (strlen(ngroup2) != 0)) {
-					strcat(newlist, ",");
-					strcat(newlist, ngroup2);
-				}
-			}
-		}
-		strcpy(ngs_list, newlist);	/* move string to its real location */
-	}
-}
-
-
 int
 my_mkdir(
 	char *path,
@@ -2127,12 +2052,14 @@ void
 cleanup_tmp_files(
 	void)
 {
+#if 0
 	char acNovFile[PATH_LEN];
 
-	if (read_news_via_nntp && xover_supported && !tinrc.cache_overview_files) {
+	if (xover_cmd && !tinrc.cache_overview_files) {
 		sprintf(acNovFile, "%s%d.idx", TMPDIR, (int) process_id);
 		unlink(acNovFile);
 	}
+#endif /* 0 */
 
 	if (!tinrc.cache_overview_files)
 		unlink(local_newsgroups_file);
@@ -2192,6 +2119,7 @@ file_mtime(
 /*
  * TODO: this seems to be unix specific, avoid !M_UNIX calls or
  *       add code for other OS
+ *       this feature also isn't documented anywhere
  */
 char *
 random_organization(
@@ -2459,10 +2387,13 @@ buffer_to_local(
 				char unknown_buf[4];
 				char *obuf, *outbuf;
 				char *tmpbuf, *tbuf;
+				ICONV_CONST char *cur_inbuf;
+				int used;
 				size_t inbytesleft;
 				size_t unknown_bytesleft;
 				size_t tmpbytesleft, tsize;
 				size_t outbytesleft, osize;
+				size_t cur_obl, cur_ibl;
 				size_t result;
 
 				inbytesleft = 1;
@@ -2514,6 +2445,15 @@ buffer_to_local(
 				outbuf = (char *) obuf;
 
 				do {
+					/*
+					 * save the parameters we need to redo the call of iconv
+					 * if we get into the E2BIG case
+					 */
+					cur_inbuf = inbuf;
+					cur_ibl = inbytesleft;
+					used = outbuf - obuf;
+					cur_obl = outbytesleft;
+
 					errno = 0;
 					result = iconv(cd2, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
 					if (result == (size_t) (-1)) {
@@ -2527,10 +2467,20 @@ buffer_to_local(
 								break;
 
 							case E2BIG:
-								obuf = my_realloc(obuf, osize * 2);
-								outbuf = (char *) (obuf + osize - outbytesleft);
-								outbytesleft += osize;
+								/*
+								 * outbuf was too small
+								 * As some input could be converted successfully
+								 * and we don`t know where the last complete char
+								 * ends, redo the last conversation completely.
+								 */
+								/* resize the output buffer */
+								obuf = my_realloc(obuf, osize * 2 + 1);
+								outbuf = obuf + used;
+								outbytesleft = cur_obl + osize;
 								osize <<= 1; /* double size */
+								/* reset the other params */
+								inbuf = cur_inbuf;
+								inbytesleft = cur_ibl;
 								break;
 
 							default:
diff -Nurp tin-1.5.18/src/newsrc.c tin-1.6.0/src/newsrc.c
--- tin-1.5.18/src/newsrc.c	Thu May 15 19:27:29 2003
+++ tin-1.6.0/src/newsrc.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : newsrc.c
  *  Author    : I. Lea & R. Skrenta
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-14
+ *  Updated   : 2003-06-29
  *  Notes     : ArtCount = (ArtMax - ArtMin) + 1  [could have holes]
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>, Rich Skrenta <skrenta@pbm.com>
@@ -41,6 +41,9 @@
 #ifndef TCURSES_H
 #	include "tcurses.h"
 #endif /* !TCURSES_H */
+#ifndef TNNTP_H
+#	include "tnntp.h"
+#endif /* TNNTP_H */
 
 #define BITS_TO_BYTES(n)	((size_t) ((n + NBITS - 1) / NBITS))
 
@@ -318,11 +321,28 @@ void
 backup_newsrc(
 	void)
 {
-	char buf[HEADER_LEN];
+	char dirbuf[PATH_LEN];
+	char filebuf[PATH_LEN];
+	struct stat statbuf;
+
+#ifdef NNTP_ABLE
+	if (read_news_via_nntp && !read_saved_news && nntp_tcp_port != IPPORT_NNTP)
+		snprintf(filebuf, sizeof(filebuf), "%s:%d", nntp_server, nntp_tcp_port);
+	else
+#endif /* NNTP_ABLE */
+	{
+		STRCPY(filebuf, nntp_server);
+	}
+	JOINPATH(dirbuf, rcdir, filebuf);
+	joinpath(filebuf, dirbuf, OLDNEWSRC_FILE);
 
-	joinpath(buf, homedir, OLDNEWSRC_FILE);
+	if (-1 == stat(dirbuf, &statbuf)) {
+		if (-1 == my_mkdir(dirbuf, (mode_t) (S_IRWXU)))
+			/* Can't create directory: Fall back on Homedir */
+			joinpath(filebuf, homedir, OLDNEWSRC_FILE);
+	}
 
-	if (!backup_file(newsrc, buf))
+	if (!backup_file(newsrc, filebuf))
 		error_message(_(txt_filesystem_full_backup), NEWSRC_FILE);
 }
 
@@ -692,9 +712,8 @@ parse_subseq(
 {
 	long bitmin;
 	long bitmax;
-	long last_high;
+	long last_high = *high;
 
-	last_high = *high;
 	seq = parse_get_seq(seq, low, high);
 
 	/*
@@ -767,7 +786,6 @@ parse_subseq(
 		 */
 		NSETRNG0(group->newsrc.xbitmap, bitmin, bitmax);
 	}
-
 	return seq;
 }
 
@@ -811,7 +829,7 @@ parse_unread_arts(
 	/*
 	 * TODO
 	 * what about group->newsrc.xmax > group->xmax?
-	 * that should indicate a artnum 'reset' on th server
+	 * that should indicate an artnum 'reset' on the server
 	 * (or using the "wrong" newsrc for that server)
 	 */
 
diff -Nurp tin-1.5.18/src/nntplib.c tin-1.6.0/src/nntplib.c
--- tin-1.5.18/src/nntplib.c	Thu May 15 19:26:59 2003
+++ tin-1.6.0/src/nntplib.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : nntplib.c
  *  Author    : S. Barber & I. Lea
  *  Created   : 1991-01-12
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-06-29
  *  Notes     : NNTP client routines taken from clientlib.c 1.5.11 (1991-02-10)
  *  Copyright : (c) Copyright 1991-99 by Stan Barber & Iain Lea
  *              Permission is hereby granted to copy, reproduce, redistribute
@@ -105,16 +105,25 @@ char *
 getserverbyfile(
 	const char *file)
 {
+	static char buf[256];
 #ifdef NNTP_ABLE
 	FILE *fp;
 	char *cp;
-	static char buf[256];
 #	if !defined(HAVE_SETENV) && defined(HAVE_PUTENV)
 	char tmpbuf[256];
 	char *new_env;
 	static char *old_env = NULL;
 #	endif /* !HAVE_SETENV && HAVE_PUTENV */
-
+#endif
+	if (!read_news_via_nntp) {
+		STRCPY(buf, "local");	/* what if a server is named "local"? */
+		return buf;
+	}
+	if (read_saved_news) {
+		STRCPY(buf, "reading saved news");
+		return buf;
+	}
+#ifdef NNTP_ABLE
 	if (cmdline_nntpserver[0] != '\0') {
 		get_nntpserver(buf, cmdline_nntpserver);
 #	ifdef HAVE_SETENV
diff -Nurp tin-1.5.18/src/open.c tin-1.6.0/src/open.c
--- tin-1.5.18/src/open.c	Wed May 21 19:14:31 2003
+++ tin-1.6.0/src/open.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : open.c
  *  Author    : I. Lea & R. Skrenta
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-06-29
  *  Notes     : Routines to make reading news locally (ie. /var/spool/news)
  *              or via NNTP transparent
  *
@@ -52,7 +52,8 @@
  */
 static int base_comp(t_comptype p1, t_comptype p2);
 #if 0 /* currently unused */
-	static FILE * open_xhdr_fp(char *header, long min, long max);
+	static FILE *open_xhdr_fp(char *header, long min, long max);
+	static t_bool stat_article(long art, const char *group_path);
 #endif /* 0 */
 
 
@@ -64,13 +65,12 @@ long head_next;
 	t_bool can_post = TRUE;
 #endif /* NO_POSTING */
 
-char *nntp_server = (char *) 0;
+char *nntp_server = NULL;
+char *xover_cmd = NULL;
 #ifdef NNTP_ABLE
-	static char txt_xover_string[] = "XOVER";
-	static char *txt_xover = txt_xover_string;
+	static char txt_xover_buff[] = "XOVER";
 #endif /* NNTP_ABLE */
 
-
 /*
  * Open a connection to the NNTP server. Authenticate if necessary or
  * desired, and test if the server supports XOVER.
@@ -85,8 +85,9 @@ nntp_open(
 #ifdef NNTP_ABLE
 	char *linep;
 	char line[NNTP_STRLEN];
-	int ret;
+	int i, ret;
 	t_bool sec = FALSE;
+	/* It appears that is_reconnect guards code that should be run only once */
 	static t_bool is_reconnect = FALSE;
 
 	if (!read_news_via_nntp)
@@ -96,10 +97,6 @@ nntp_open(
 	debug_nntp("nntp_open", "BEGIN");
 #	endif /* DEBUG */
 
-	/* do this only once at start-up */
-	if (!is_reconnect)
-		nntp_server = getserverbyfile(NNTP_SERVER_FILE);
-
 	if (nntp_server == NULL) {
 		error_message(_(txt_cannot_get_nntp_server_name));
 		error_message(_(txt_server_name_in_file_env_var), NNTP_SERVER_FILE);
@@ -324,25 +321,31 @@ nntp_open(
 	}
 
 	/*
-	 * Check if NNTP supports XOVER or OVER (successor of XOVER as of latest
-	 * NNTP Draft (Jan 2002) command; ie, we _don't_ get an ERR_COMMAND
+	 * Check if NNTP supports XOVER or OVER command (successor of XOVER as of
+	 * latest NNTP Draft (Jan 2002); ie, we _don't_ get an ERR_COMMAND
+	 * Could use (i=1;i>=0;i--) to give OVER higher priority than XOVER
 	 *
 	 * TODO: Don't try (X)OVER if listed in LIST EXTENSIONS.
 	 */
+	for (i = 0; i < 2; i++) {
+		xover_cmd = &txt_xover_buff[i];
+		if (!nntp_command(xover_cmd, ERR_COMMAND, NULL, 0))
+			break;
+	}
 
-	if (!nntp_command(txt_xover_string, ERR_COMMAND, NULL, 0)) {
-		xover_supported = TRUE;
-		txt_xover = txt_xover_string;
-		/* TODO: issue warning if old index files found? */
-	} else {
-		if (!nntp_command(&txt_xover_string[1], ERR_COMMAND, NULL, 0)) {
-			xover_supported = TRUE;
-			txt_xover = &txt_xover_string[1];
-			/* TODO: issue warning if old index files found? */
-		} else {
-			if (!is_reconnect && !batch_mode)
-				wait_message(2, _(txt_no_xover_support));
+	if (i == 2)	{	/* ie XOVER and OVER gave ERR_COMMAND */
+		xover_cmd = NULL;
+		if (!is_reconnect && !batch_mode) {
+			wait_message(2, _(txt_no_xover_support));
+
+			if (tinrc.cache_overview_files)
+				wait_message(2, _(txt_caching_on));
+			else
+				wait_message(2, _(txt_caching_off));
 		}
+	} else {
+		/* TODO: issue warning if old index files found? */
+		/*		 in index_newsdir ? */
 	}
 
 #	if 0 /* TODO: */
@@ -569,7 +572,7 @@ open_overview_fmt_fp(
 
 #ifdef NNTP_ABLE
 	if (read_news_via_nntp && !read_saved_news) {
-		if (!xover_supported)
+		if (!xover_cmd)
 			return (FILE *) 0;
 
 		sprintf(line, "LIST %s", OVERVIEW_FMT);
@@ -707,72 +710,6 @@ open_newsgroups_fp(
 
 
 /*
- * Open a group NOV/XOVER file
- */
-FILE *
-open_xover_fp(
-	struct t_group *group,
-	const char *mode,
-	long min,
-	long max)
-{
-#ifdef NNTP_ABLE
-	if (read_news_via_nntp && xover_supported && *mode == 'r' && group->type == GROUP_TYPE_NEWS) {
-		char line[NNTP_STRLEN];
-
-		sprintf(line, "%s %ld-%ld", txt_xover, min, max);
-		return (nntp_command(line, OK_XOVER, NULL, 0));
-	} else
-#endif /* NNTP_ABLE */
-	{
-		char *nov_file;
-
-		nov_file = find_nov_file(group, (*mode == 'r' ? R_OK : W_OK));
-#ifdef DEBUG
-		if (debug)
-			error_message("READ file=[%s]", nov_file);
-#endif /* DEBUG */
-		if (nov_file != NULL)
-			return fopen(nov_file, mode);
-
-		return (FILE *) 0;
-	}
-}
-
-
-#if 0
-/*
- * Stat a mail/news article to see if it still exists
- */
-t_bool
-stat_article(
-	long art,
-	const char *group_path)
-{
-	char buf[NNTP_STRLEN];
-	struct t_group currgrp;
-
-	currgrp = CURR_GROUP;
-
-#	ifdef NNTP_ABLE
-	if (read_news_via_nntp && currgrp.type == GROUP_TYPE_NEWS) {
-		sprintf(buf, "STAT %ld", art);
-		return (nntp_command(buf, OK_NOTEXT, NULL, 0) != NULL);
-	} else
-#	endif /* NNTP_ABLE */
-	{
-		struct stat sb;
-
-		joinpath(buf, currgrp.spooldir, group_path);
-		sprintf(&buf[strlen(buf)], "/%ld", art);
-
-		return (stat(buf, &sb) != -1);
-	}
-}
-#endif /* 0 */
-
-
-/*
  * Open an article for reading just the header
  */
 FILE *
@@ -925,7 +862,7 @@ setup_hard_base(
 			char *ptr;
 
 #	ifdef DEBUG
-			debug_nntp("setup_base", buf);
+			debug_nntp("setup_hard_base", buf);
 #	endif /* DEBUG */
 
 			while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) {
@@ -1137,6 +1074,38 @@ group_get_art_info(
 
 	return 0;
 }
+
+
+#if 0
+/*
+ * Stat a mail/news article to see if it still exists
+ */
+static t_bool
+stat_article(
+	long art,
+	const char *group_path)
+{
+	char buf[NNTP_STRLEN];
+	struct t_group currgrp;
+
+	currgrp = CURR_GROUP;
+
+#	ifdef NNTP_ABLE
+	if (read_news_via_nntp && currgrp.type == GROUP_TYPE_NEWS) {
+		sprintf(buf, "STAT %ld", art);
+		return (nntp_command(buf, OK_NOTEXT, NULL, 0) != NULL);
+	} else
+#	endif /* NNTP_ABLE */
+	{
+		struct stat sb;
+
+		joinpath(buf, currgrp.spooldir, group_path);
+		sprintf(&buf[strlen(buf)], "/%ld", art);
+
+		return (stat(buf, &sb) != -1);
+	}
+}
+#endif /* 0 */
 
 
 /* This will come in useful for filtering on non-overview hdr fields */
diff -Nurp tin-1.5.18/src/page.c tin-1.6.0/src/page.c
--- tin-1.5.18/src/page.c	Wed May 21 19:14:31 2003
+++ tin-1.6.0/src/page.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : page.c
  *  Author    : I. Lea & R. Skrenta
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-06-13
  *  Notes     :
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>, Rich Skrenta <skrenta@pbm.com>
@@ -1267,7 +1267,7 @@ draw_page_header(
 	const char *group)
 {
 	char buf[HEADER_LEN];
-	char tmp[LEN];
+	char tmp[LEN]; /* what if cCOLS is > LEN? */
 	int whichresp;
 	int x_resp;
 	int pos, i;
@@ -1340,11 +1340,11 @@ draw_page_header(
 #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)
 		if (mbstowcs(wtmp, tmp, ARRAY_SIZE(wtmp)) != (size_t) -1) {
 			wtmp[HEADER_LEN - 1] = (wchar_t) '\0';
-			wcspart(wbuf, wtmp, cCOLS - strlen(cCRLF), ARRAY_SIZE(wbuf), FALSE);
+			wcspart(wbuf, wtmp, cCOLS - 1, ARRAY_SIZE(wbuf), FALSE);
 			wcstombs(tmp, wbuf, sizeof(tmp));
 		} else
 #endif /* MULTIBYTE_ABLE && !NO_LOCALE */
-			tmp[cCOLS - strlen(cCRLF)] = '\0'; /* FIXME: see also note in signal.c:set_win_size() */
+			tmp[cCOLS - 1] = '\0'; /* FIXME: see also note in signal.c:set_win_size() */
 		strcat(tmp, cCRLF);
 		my_fputs(tmp, stdout);
 	}
@@ -1641,12 +1641,11 @@ process_search(
 	 * Reposition within article if needed, try to get matched line
 	 * in the middle of the screen
 	 */
-	if (i < (int) *lcurr_line || i >= (int) (*lcurr_line + screen_lines)) {
-		start = i - (screen_lines / 2);
-		if (start + screen_lines > message_lines)		/* Off the end */
+	if (i < *lcurr_line || i >= (int) (*lcurr_line + screen_lines)) {
+		*lcurr_line = i - (screen_lines / 2);
+		if (*lcurr_line + screen_lines > message_lines)	/* off the end */
 			*lcurr_line = message_lines - screen_lines;
-		else										/* Pos is just fine */
-			*lcurr_line = start;
+		/* else pos. is just fine */
 	}
 
 	switch (help_level) {
diff -Nurp tin-1.5.18/src/post.c tin-1.6.0/src/post.c
--- tin-1.5.18/src/post.c	Wed May 28 18:11:36 2003
+++ tin-1.6.0/src/post.c	Sat Jul 12 15:56:34 2003
@@ -3,7 +3,7 @@
  *  Module    : post.c
  *  Author    : I. Lea
  *  Created   : 1991-04-01
- *  Updated   : 2003-05-17
+ *  Updated   : 2003-06-18
  *  Notes     : mail/post/replyto/followup/repost & cancel articles
  *
  * Copyright (c) 1991-2003 Iain Lea <iain@bricbrac.de>
@@ -167,6 +167,7 @@ static void msg_init_headers(void);
 static void post_postponed_article(int ask, const char *subject, const char *newsgroups);
 static void postpone_article(const char *the_article);
 static void setup_check_article_screen(int *init);
+static void strip_double_ngs(char *ngs_list);
 static void update_active_after_posting(char *newsgroups);
 static void update_posted_info_file(const char *group, int action, const char *subj, const char *a_message_id);
 #ifdef FORGERY
@@ -781,7 +782,8 @@ check_article_to_be_posted(
 #ifdef CHARSET_CONVERSION
 		/* are all characters in article contained in network_charset? */
 		if (strcmp(tinrc.mm_local_charset, txt_mime_charsets[mmnwcharset]) && !charset_conversion_fails) { /* local_charset != network_charset */
-			cp = my_strdup(line);
+			cp = my_malloc(strlen(line) * 4);
+			strcpy(cp, line);
 			charset_conversion_fails = !buffer_to_network(cp, mmnwcharset);
 			free(cp);
 		}
@@ -1089,7 +1091,8 @@ check_article_to_be_posted(
 #ifdef CHARSET_CONVERSION
 		/* are all characters in article contained in network_charset? */
 		if (strcmp(tinrc.mm_local_charset, txt_mime_charsets[mmnwcharset]) && !charset_conversion_fails) { /* local_charset != network_charset */
-			cp = my_strdup(line);
+			cp = my_malloc(strlen(line) * 4);
+			strcpy(cp, line);
 			charset_conversion_fails = !buffer_to_network(cp, mmnwcharset);
 			free(cp);
 		}
@@ -1111,6 +1114,35 @@ check_article_to_be_posted(
 			got_long_line = TRUE;
 			warnings++;
 		}
+#if 0 /* disabled till 1.7.x */
+/*
+ * TODO: cleanup, test me, move to the right location (after testing the
+ *       whole body for 8bit chars), adjust and translate warings, ...
+ */
+		if (strlen(line) > 998 && strcasecmp(txt_mime_encodings[tinrc.post_mime_encoding], txt_base64)) {
+			setup_check_article_screen(&init);
+#	ifdef MIME_BREAK_LONG_LINES
+			if (contains_8bit) { /* we only know if the body contained 8bits till this line, that is not 100% correct */
+				if (strcasecmp(txt_mime_encodings[tinrc.post_mime_encoding], txt_quoted_printable)) {
+					my_fprintf(stderr, "Line %d is longer than 998 octets and should be folded, but\n", cnt);
+					my_fprintf(stderr, "encoding is neither set to %s nor to %s\n", txt_quoted_printable, txt_base64);
+				}
+			} else
+#	endif /* MIME_BREAK_LONG_LINES */
+			{
+				if (!strcasecmp(txt_mime_encodings[tinrc.post_mime_encoding], txt_quoted_printable)) {
+					my_fprintf(stderr, "Line %d is longer than 998 octets, and should be folded, but\n", cnt);
+					my_fprintf(stderr, "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n", txt_quoted_printable);
+					my_fprintf(stderr, "posting doesn't contain any 8bit chars and thus folding won't happen\n");
+				} else {
+					my_fprintf(stderr, "Line %d is longer than 998 octets, and should be folded, but\n", cnt);
+					my_fprintf(stderr, "encoding is not set to %s\n", txt_base64);
+				}
+			}
+		my_fflush(stderr);
+		warnings++;
+		}
+#endif /* 0 */
 	}
 
 	if (saw_sig_dashes > 1)
@@ -1443,8 +1475,13 @@ post_article_loop:
 
 			case iKeyQuit:
 			case iKeyAbort:
-				if (tinrc.unlink_article)
+				if (tinrc.unlink_article) {
+#if 0 /* usefull */
+					if (tinrc.keep_dead_articles)
+						 append_file(dead_articles, dead_article);
+#endif /* 0 */
 					unlink(article);
+				}
 				clear_message();
 				return ret_code;
 
@@ -2939,16 +2976,11 @@ mail_bug_report(
 #	ifdef _AIX
 	fprintf(fp, "BOX1 : %s %s.%s", system_info.sysname, system_info.version, system_info.release);
 #	else
-#		ifdef __mips__
-	/*
-	 * SEIUX (__mips__ only) needs special handling but hasn't any usefull
-	 * preprocessor macros
-	 */
-	if (!strcmp(system_info.version, "SEIUX"))
-		fprintf(fp, "BOX1 : %s %s", system_info.version, system_info.release);
-	else
-#		endif /* __mips__ */
+#		ifdef SEIUX
+	fprintf(fp, "BOX1 : %s %s", system_info.version, system_info.release);
+#		else
 	fprintf(fp, "BOX1 : %s %s (%s)", system_info.sysname, system_info.release, system_info.machine);
+#		endif /* SEIUX */
 #	endif /* _AIX */
 #else
 	fprintf(fp, "BOX1 : Please enter the following information: Machine+OS");
@@ -2982,7 +3014,7 @@ mail_bug_report(
 	fprintf(fp, "CFG2 : nntp=%s, nntp_only=%s, nntp_xover=%s\n",
 		bool_unparse(is_nntp),
 		bool_unparse(is_nntp_only),
-		bool_unparse(xover_supported));
+		bool_unparse(xover_cmd != NULL));
 	fprintf(fp, "CFG3 : debug=%d, threading=%d\n", debug, tinrc.thread_articles);
 	fprintf(fp, "CFG4 : domain=[%s]\n", BlankIfNull(domain));
 	start_line_offset += 6;
@@ -3330,7 +3362,6 @@ cancel_article(
 	 * remove duplicates from Newsgroups header
 	 */
 	strip_double_ngs(note_h.newsgroups);
-
 	msg_add_header("Newsgroups", note_h.newsgroups);
 	if (tinrc.prompt_followupto)
 		msg_add_header("Followup-To", "");
@@ -3636,6 +3667,7 @@ repost_article(
 		char buff[LEN];
 		char keyedit[MAXKEYLEN], keypost[MAXKEYLEN];
 		char keypostpone[MAXKEYLEN], keyquit[MAXKEYLEN];
+		char keymenu[MAXKEYLEN];
 #ifdef HAVE_ISPELL
 		char keyispell[MAXKEYLEN];
 #endif /* HAVE_ISPELL */
@@ -3652,6 +3684,7 @@ repost_article(
 #ifdef HAVE_PGP_GPG
 						printascii(keypgp, map_to_local(iKeyPostPGP, &menukeymap.post_post)),
 #endif /* HAVE_PGP_GPG */
+						printascii(keymenu, map_to_local(iKeyOptionMenu, &menukeymap.post_post)),
 						printascii(keypost, map_to_local(iKeyPostPost3, &menukeymap.post_post)),
 						printascii(keypostpone, map_to_local(iKeyPostPostpone, &menukeymap.post_post)));
 
@@ -3799,20 +3832,15 @@ checknadd_headers(
 						PRODUCT, VERSION, RELEASEDATE, RELEASENAME, OSNAME,
 						system_info.sysname, system_info.version, system_info.release);
 #	else
-#		ifdef __mips__
-					/*
-					 * SEIUX (__mips__ only) needs special handling but hasn't any usefull
-					 * preprocessor macros
-					 */
-					if (!strcmp(system_info.version, "SEIUX"))
+#		ifdef SEIUX
 						fprintf(fp_out, "User-Agent: %s/%s-%s (\"%s\") (%s) (%s/%s)\n",
 							PRODUCT, VERSION, RELEASEDATE, RELEASENAME, OSNAME,
 							system_info.version, system_info.release);
-					else
-#		endif /* __mips__ */
+#		else
 					fprintf(fp_out, "User-Agent: %s/%s-%s (\"%s\") (%s) (%s/%s (%s))\n",
 						PRODUCT, VERSION, RELEASEDATE, RELEASENAME, OSNAME,
 						system_info.sysname, system_info.release, system_info.machine);
+#		endif /* SEIUX */
 #	endif /* _AIX */
 #else
 					fprintf(fp_out, "User-Agent: %s/%s-%s (\"%s\") (%s)\n",
@@ -3826,25 +3854,22 @@ checknadd_headers(
 					strip_double_ngs(ptr);
 					strcpy(newsgroups, ptr);
 					sprintf(line, "Newsgroups: %s\n", newsgroups);
-				}
-
-				if ((ptr = parse_header(line, "Followup-To", FALSE, FALSE))) {
-					strip_double_ngs(ptr);
-					/*
-					 * Only write followup header if not blank, no newsgroups header or
-					 * followups != newsgroups
-					 */
-					if (*ptr && (/* (*newsgroups == '\0') ||*/ (strcasecmp(newsgroups, ptr))))
-						sprintf(line, "Followup-To: %s\n", ptr);
-					else
-						*line = '\0';
+				} else {
+					if ((ptr = parse_header(line, "Followup-To", FALSE, FALSE))) {
+						strip_double_ngs(ptr);
+						/*
+						 * Only write followup header if not blank or followups != newsgroups
+						 */
+						if (*ptr && strcasecmp(newsgroups, ptr))
+							sprintf(line, "Followup-To: %s\n", ptr);
+						else
+							*line = '\0';
+					}
 				}
 			}
 		}
-
 		fputs(line, fp_out);
 	}
-
 	fclose(fp_out);
 	fclose(fp_in);
 	rename_file(outfile, infile);
@@ -4690,3 +4715,74 @@ radix32(
 	return ++ptr;
 }
 #endif /* EVIL_INSIDE */
+
+
+/*
+ * Strip duplicate newsgroups from within a given list of comma separated
+ * groups
+ * 14-Jun-'96 Sven Paulus <sven@oops.sub.de>
+ */
+static void
+strip_double_ngs(
+	char *ngs_list)
+{
+	char *ptr;			/* start of next (outer) newsgroup */
+	char *ptr2;			/* temporary pointer */
+	char ngroup1[HEADER_LEN];	/* outer newsgroup to compare */
+	char ngroup2[HEADER_LEN];	/* inner newsgroup to compare */
+	char cmplist[HEADER_LEN];	/* last loops output */
+	char newlist[HEADER_LEN];	/* the newly generated list without */
+										/* any duplicates of the first nwsg */
+	int ncnt1;			/* counter for the first newsgroup */
+	int ncnt2;			/* counter for the second newsgroup */
+	t_bool over1;		/* TRUE when the outer loop is over */
+	t_bool over2;		/* TRUE when the inner loop is over */
+
+	/* shortcut, check if there is only 1 group */
+	if (strchr(ngs_list, ',') != NULL) {
+		over1 = FALSE;
+		ncnt1 = 0;
+		strcpy(newlist, ngs_list);		/* make a "working copy" */
+		ptr = newlist;						/* the next outer newsg. is the 1st */
+
+		while (!over1) {
+			ncnt1++;							/* inc. outer counter */
+			strcpy(cmplist, newlist);	/* duplicate groups for inner loop */
+			ptr2 = strchr(ptr, ',');	/* search "," ... */
+			if (ptr2 != NULL) {	/* if found ... */
+				*ptr2 = '\0';
+				strcpy(ngroup1, ptr);	/* chop off first outer newsgroup */
+				ptr = ptr2 + 1;			/* pointer points to next newsgr. */
+			} else {							/* ... if not: last group */
+				over1 = TRUE;				/* wow, everything is done after . */
+				strcpy(ngroup1, ptr);	/* ... this last outer newsgroup */
+			}
+
+			over2 = FALSE;
+			ncnt2 = 0;
+
+			/*
+			 * now compare with each inner newsgroup on the list,
+			 * which is behind the momentary outer newsgroup
+			 * if it is different from the outer newsgroup, append
+			 * to list, strip double-commas
+			 */
+			while (!over2) {
+				ncnt2++;
+				strcpy(ngroup2, cmplist);
+				ptr2 = strchr(ngroup2, ',');
+				if (ptr2 != NULL) {
+					strcpy(cmplist, ptr2 + 1);
+					*ptr2 = '\0';
+				} else
+					over2 = TRUE;
+
+				if ((ncnt2 > ncnt1) && (strcasecmp(ngroup1, ngroup2)) && (strlen(ngroup2) != 0)) {
+					strcat(newlist, ",");
+					strcat(newlist, ngroup2);
+				}
+			}
+		}
+		strcpy(ngs_list, newlist);	/* move string to its real location */
+	}
+}
diff -Nurp tin-1.5.18/src/refs.c tin-1.6.0/src/refs.c
--- tin-1.5.18/src/refs.c	Thu May  8 23:09:38 2003
+++ tin-1.6.0/src/refs.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : refs.c
  *  Author    : Jason Faultless <jason@altarstone.com>
  *  Created   : 1996-05-09
- *  Updated   : 2003-04-25
+ *  Updated   : 2003-06-06
  *  Notes     : Cacheing of message ids / References based threading
  *  Credits   : Richard Hodson <richard@macgyver.tele2.co.uk>
  *              hash_msgid, free_msgid
@@ -84,7 +84,7 @@ static t_bool sort_ascend;
 static struct t_msgid *msgids[MSGID_HASH_SIZE] = {0};
 
 /*
- * This part of the code deals with the cacheing and retrieval
+ * This part of the code deals with the caching and retrieval
  * of Message-ID and References headers
  *
  * Rationale:
@@ -93,7 +93,7 @@ static struct t_msgid *msgids[MSGID_HASH
  *    period increases, so does the redundancy of data.
  *    At the time of writing, comp.os.ms-windows.advocacy held ~850
  *    articles. The references fields contained 192k of text, of which
- *    169k was saved using the new cacheing.
+ *    169k was saved using the new caching.
  *
  *    When threading on Refs, a much better view of the original thread
  *    can be built up using this data, and threading is much faster
diff -Nurp tin-1.5.18/src/rfc2046.c tin-1.6.0/src/rfc2046.c
--- tin-1.5.18/src/rfc2046.c	Fri May 16 02:34:07 2003
+++ tin-1.6.0/src/rfc2046.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : rfc2046.c
  *  Author    : Jason Faultless <jason@altarstone.com>
  *  Created   : 2000-02-18
- *  Updated   : 2003-05-15
+ *  Updated   : 2003-06-09
  *  Notes     : RFC 2046 MIME article parsing
  *
  * Copyright (c) 2000-2003 Jason Faultless <jason@altarstone.com>
@@ -67,7 +67,7 @@ static void progress(int line_count);
  */
 static int art_lines = 0;		/* lines in art on spool */
 
-#define PARAM_SEP		"; \n"
+#define PARAM_SEP	"; \n"
 /* default parameters for Content-Type */
 #define CT_DEFPARMS	"charset=US-ASCII"
 
@@ -805,6 +805,7 @@ parse_multipart_article(
 				 * Keep headers that interest us
 				 */
 /*fprintf(stderr, "HDR:%s\n", line);*/
+				unfold_header(line);
 				if ((ptr = parse_header(line, "Content-Type", FALSE, FALSE))) {
 					parse_content_type(ptr, curr_part);
 
@@ -924,15 +925,15 @@ dump_art(
 
 	for (ptr = note_h.ext->next; ptr != NULL; ptr = ptr->next) {
 		fprintf(stderr, "Attachment:\n");
-		fprintf(stderr, "	Content-Type: %s/%s\n	Content-Transfer-Encoding: %s\n",
+		fprintf(stderr, "\tContent-Type: %s/%s\n\tContent-Transfer-Encoding: %s\n",
 			content_types[ptr->type], ptr->subtype,
 			content_encodings[ptr->encoding]);
 		if (ptr->description)
-			fprintf(stderr, "	Content-Description: %s\n", ptr->description);
-		fprintf(stderr, "	Offset: %ld\n	Lines: %d\n", ptr->offset, ptr->line_count);
-		fprintf(stderr, "	Depth: %d\n", ptr->depth);
+			fprintf(stderr, "\tContent-Description: %s\n", ptr->description);
+		fprintf(stderr, "\tOffset: %ld\n\tLines: %d\n", ptr->offset, ptr->line_count);
+		fprintf(stderr, "\tDepth: %d\n", ptr->depth);
 		for (pptr = ptr->params; pptr != NULL; pptr = pptr->next)
-			fprintf(stderr, "	P: %s = %s\n", pptr->name, pptr->value);
+			fprintf(stderr, "\tP: %s = %s\n", pptr->name, pptr->value);
 		dump_uue(ptr, art);
 		fseek(art->raw, ptr->offset, SEEK_SET);
 		fprintf(stderr, "[%s]\n\n", tin_fgets(art->raw, FALSE));
diff -Nurp tin-1.5.18/src/search.c tin-1.6.0/src/search.c
--- tin-1.5.18/src/search.c	Thu May 15 16:43:37 2003
+++ tin-1.6.0/src/search.c	Sat Jul 12 15:49:46 2003
@@ -156,7 +156,7 @@ search_config(
 			if (n > last)
 				n = 0;
 		}
-		if (REGEX_MATCH(option_table[n].txt->opt, buf, TRUE)) {
+		if (REGEX_MATCH(_(option_table[n].txt->opt), buf, TRUE)) {
 			result = n;
 			break;
 		}
diff -Nurp tin-1.5.18/src/tcurses.c tin-1.6.0/src/tcurses.c
--- tin-1.5.18/src/tcurses.c	Thu May  8 23:09:39 2003
+++ tin-1.6.0/src/tcurses.c	Sat Jul 12 15:49:46 2003
@@ -3,7 +3,7 @@
  *  Module    : tcurses.c
  *  Author    : Thomas Dickey <dickey@herndon4.his.com>
  *  Created   : 1997-03-02
- *  Updated   : 2003-02-19
+ *  Updated   : 2003-06-27
  *  Notes     : This is a set of wrapper functions adapting the termcap
  *	             interface of tin to use SVr4 curses (e.g., ncurses).
  *
@@ -54,6 +54,8 @@
 int cLINES;
 int cCOLS;
 
+static int my_innstr(char *str, int n);
+
 
 #	ifdef HAVE_XCURSES
 static int
@@ -764,7 +766,7 @@ my_retouch(
  * innstr can't read multibyte chars
  * we use innwstr (if avaible) and convert to multibyte chars
  */
-int
+static int
 my_innstr(
 	char *str,
 	int n)
diff -Nurp tin-1.5.18/src/trace.c tin-1.6.0/src/trace.c
--- tin-1.5.18/src/trace.c	Thu May  8 23:09:39 2003
+++ tin-1.6.0/src/trace.c	Sat Jul 12 15:49:46 2003
@@ -51,7 +51,7 @@ _tracef(
 	const char *fmt,
 	...)
 {
-	static	FILE	*fp;
+	static FILE *fp;
 	va_list ap;
 
 	if (!fp)
diff -Nurp tin-1.5.18/src/version.c tin-1.6.0/src/version.c
--- tin-1.5.18/src/version.c	Wed May 28 18:52:56 2003
+++ tin-1.6.0/src/version.c	Sat Jul 12 15:49:48 2003
@@ -3,7 +3,7 @@
  *  Module    : version.c
  *  Author    : U. Janssen
  *  Created   : 2003-05-11
- *  Updated   :
+ *  Updated   : 2003-06-27
  *  Notes     :
  *
  * Copyright (c) 2003 Urs Janssen <urs@tin.org>
@@ -107,6 +107,8 @@ upgrade_prompt_quit(
 		case RC_ERROR: /* can't parse internal version string, should not happen */
 			error_message(txt_warn_unrecognized_version);
 			giveup();
+			/* NOTREACHED */
+			break;
 
 		default:	/* should no happen */
 			return;
diff -Nurp tin-1.5.18/src/xface.c tin-1.6.0/src/xface.c
--- tin-1.5.18/src/xface.c	Wed May 21 19:14:31 2003
+++ tin-1.6.0/src/xface.c	Sat Jul 12 15:49:48 2003
@@ -3,7 +3,7 @@
  *  Module    : xface.c
  *  Author    : Joshua Crawford & Drazen Kacar
  *  Created   : 2003-04-27
- *  Updated   : 2003-05-07
+ *  Updated   : 2003-06-27
  *  Notes     :
  *
  * Copyright (c) Joshua Crawford <mortarn@softhome.net> & Drazen Kacar <dave@willfork.com>
@@ -139,9 +139,20 @@ slrnface_start(
 			break;
 
 		case 0:
+			/*
+			 * TODO: allow positioning, coloring, ...
+			 *       execlp("slrnface", "slrnface",
+			 *              "-xOffsetChar", tinrc.xfacex,
+			 *              "-yOffsetChar", tinrc.xfacey,
+			 *              "-ink", tinrc.xfacefg,
+			 *              "-paper", tinrc.xfacebg,
+			 *              fifo, (char *) 0);
+			 */
 			execlp("slrnface", "slrnface", fifo, (char *) 0);
 			/* This is child, exit on error. */
 			giveup();
+			/* NOTREACHED */
+			break;
 
 		default:
 			do {
diff -Nurp tin-1.5.18/tools/opt-case.pl tin-1.6.0/tools/opt-case.pl
--- tin-1.5.18/tools/opt-case.pl	Thu May  8 23:09:36 2003
+++ tin-1.6.0/tools/opt-case.pl	Sat Jul 12 15:49:45 2003
@@ -15,7 +15,7 @@
 #       filter via w2r.pl before
 
 # version number
-# $VERSION = "0.2.1";
+# $VERSION = "0.2.2";
 
 # perl 5 is needed for lookahead assertions and perl < 5.004 is know to be
 # buggy
@@ -74,7 +74,7 @@ opt-case.pl - Optimize case insensitive 
 
 =head1 SYNOPSIS
 
-B<opt-case.pl> < I<input> [> I<output>]
+B<opt-case.pl> E<lt> I<input> [E<gt> I<output>]
 
 =head1 DESCRIPTION
 
diff -Nurp tin-1.5.18/tools/tinews.pl tin-1.6.0/tools/tinews.pl
--- tin-1.5.18/tools/tinews.pl	Thu May 15 18:41:59 2003
+++ tin-1.6.0/tools/tinews.pl	Sat Jul 12 15:49:45 2003
@@ -39,7 +39,7 @@
 #       - check for ~/.newsauth and use username/password if found
 #
 # version Number
-my $version = "1.0.9";
+my $version = "1.1.0";
 
 # TODO: put into a "my %config('NNTPServer' => 'news', ... );" array
 my $NNTPServer	= 'news';		# your NNTP servers name
@@ -500,7 +500,7 @@ tinews.pl - Post and sign an article via
 
 =head1 SYNOPSIS
 
-B<tinews.pl> < I<input>
+B<tinews.pl> E<lt> I<input>
 
 =head1 DESCRIPTION
 
@@ -521,11 +521,11 @@ The following exit values are returned:
 
 =over 4
 
-=item 0
+=item S< 0> 
 
 Successful completion.
 
-=item >0
+=item S<!=0>
 
 An error occurred.
 
diff -Nurp tin-1.5.18/tools/w2r.pl tin-1.6.0/tools/w2r.pl
--- tin-1.5.18/tools/w2r.pl	Thu May  8 23:09:36 2003
+++ tin-1.6.0/tools/w2r.pl	Sat Jul 12 15:49:45 2003
@@ -18,7 +18,7 @@
 require 5.004;
 
 # version Number
-# $VERSION = "0.2.5";
+# $VERSION = "0.2.6";
 
 while (defined($line = <>)) {
 	chomp $line;
@@ -122,7 +122,7 @@ w2r.pl - Convert tin wildmat filters to 
 
 =head1 SYNOPSIS
 
-B<w2r.pl> < I<input> [> I<output>]
+B<w2r.pl> E<lt> I<input> [E<gt> I<output>]
 
 =head1 DESCRIPTION
 
