----------------------------------------------------------------------------- MANIFEST | 169 +- Makefile | 5 README.MAC | 15 aclocal.m4 | 231 +++- config.guess | 26 config.sub | 21 configure | 2561 +++++++++++++++++++++++++++------------------ configure.in | 59 - doc/CHANGES | 62 + doc/CREDITS | 64 + doc/INSTALL | 10 doc/TODO | 56 doc/WHATSNEW | 2 doc/art_handling.txt | 4 doc/filtering | 2 doc/good-netkeeping-seal | 35 doc/keymap.sample | 4 doc/tin.1 | 104 - doc/tin.5 | 28 doc/tinews.1 | 452 ++++--- doc/tools.txt | 24 doc/umlauts.txt | 4 include/autoconf.hin | 11 include/bool.h | 8 include/bugrep.h | 2 include/extern.h | 22 include/keymap.h | 2 include/menukeys.h | 2 include/newsrc.h | 2 include/nntplib.h | 2 include/oldconfig.h | 2 include/policy.h | 22 include/proto.h | 16 include/rfc2046.h | 2 include/stpwatch.h | 2 include/tcurses.h | 16 include/tin.h | 15 include/tinrc.h | 2 include/tnntp.h | 4 include/trace.h | 4 include/version.h | 8 intl/Makefile.in | 13 intl/dcigettext.c | 27 intl/gettextP.h | 8 intl/loadmsgcat.c | 46 intl/localealias.c | 40 pcre/Makefile.in | 78 - po/de.gmo |binary po/de.po | 2076 ++++++++++++++++++------------------ po/en_GB.gmo |binary po/en_GB.po | 2044 +++++++++++++++++------------------ po/et.gmo |binary po/et.po | 2075 ++++++++++++++++++------------------ po/fr.gmo |binary po/fr.po | 2148 +++++++++++++++++++------------------ po/messages |binary po/tin.pot | 2050 ++++++++++++++++++------------------ src/Makefile.in | 384 +++--- src/active.c | 2 src/art.c | 14 src/attrib.c | 2 src/auth.c | 2 src/charset.c | 2 src/color.c | 55 src/config.c | 6 src/cook.c | 2 src/debug.c | 2 src/envarg.c | 2 src/feed.c | 62 - src/filter.c | 110 + src/getline.c | 19 src/global.c | 2 src/group.c | 135 +- src/hashstr.c | 2 src/header.c | 2 src/help.c | 24 src/inews.c | 2 src/init.c | 18 src/joinpath.c | 4 src/keymap.c | 2 src/lang.c | 46 src/langinfo.c | 4 src/list.c | 2 src/lock.c | 2 src/mail.c | 2 src/main.c | 14 src/makecfg.c | 2 src/memory.c | 2 src/mimetypes.c | 2 src/misc.c | 25 src/my_tmpfile.c | 2 src/newsrc.c | 2 src/nntplib.c | 29 src/nrctbl.c | 2 src/page.c | 137 -- src/parsdate.y | 2 src/pgp.c | 6 src/post.c | 86 - src/prompt.c | 77 + src/read.c | 2 src/refs.c | 90 + src/regex.c | 2 src/rfc1524.c | 2 src/rfc2045.c | 2 src/rfc2046.c | 18 src/rfc2047.c | 2 src/save.c | 11 src/screen.c | 68 - src/search.c | 20 src/select.c | 31 src/sigfile.c | 2 src/signal.c | 28 src/strftime.c | 2 src/string.c | 35 src/tags.c | 12 src/tcurses.c | 67 - src/thread.c | 33 src/tincfg.tbl | 2 src/trace.c | 4 src/version.c | 12 src/wildmat.c | 4 src/xface.c | 2 src/xref.c | 21 tin.spec | 2 tools/tinews.pl | 478 +++++--- 125 files changed, 9220 insertions, 7718 deletions ----------------------------------------------------------------------------- diff -Nurp tin-1.7.3/MANIFEST tin-1.7.4/MANIFEST --- tin-1.7.3/MANIFEST Sat Dec 20 18:49:55 2003 +++ tin-1.7.4/MANIFEST Wed Feb 25 10:59:03 2004 @@ -1,36 +1,37 @@ -MANIFEST for tin-1.7.3 (Sat Dec 20 18:49:55 CET 2003) +MANIFEST for tin-1.7.4 (Wed Feb 25 10:59:03 CET 2004) ---------------------------------------------------- - 12887 ./Makefile - 7358 ./MANIFEST + 12908 ./Makefile + 7380 ./MANIFEST 1440 ./README - 313 ./README.MAC + 564 ./README.MAC 2209 ./README.VMS 1006 ./README.WIN - 133038 ./aclocal.m4 + 137915 ./aclocal.m4 882 ./conf-tin - 42865 ./config.guess - 30800 ./config.sub - 458258 ./configure - 30070 ./configure.in + 43357 ./config.guess + 31059 ./config.sub + 472592 ./configure + 30339 ./configure.in 7123 ./install.sh 777 ./mkdirs.sh 1505 ./tin.spec 18847 ./doc/ABOUT-NLS - 10052 ./doc/CHANGES + 12389 ./doc/CHANGES 226345 ./doc/CHANGES.old + 4600 ./doc/CREDITS 1469 ./doc/DEBUG_REFS - 29301 ./doc/INSTALL - 30210 ./doc/TODO - 698 ./doc/WHATSNEW - 2617 ./doc/art_handling.txt + 29542 ./doc/INSTALL + 29938 ./doc/TODO + 699 ./doc/WHATSNEW + 2618 ./doc/art_handling.txt 1700 ./doc/article.txt 3862 ./doc/auth.txt 5346 ./doc/config-anomalies 11237 ./doc/filtering - 35037 ./doc/good-netkeeping-seal + 35304 ./doc/good-netkeeping-seal 3803 ./doc/internals.txt 23621 ./doc/iso2asc.txt - 4048 ./doc/keymap.sample + 4042 ./doc/keymap.sample 660 ./doc/mailcap.sample 3365 ./doc/mime.types 1541 ./doc/nov_tests @@ -39,112 +40,112 @@ MANIFEST for tin-1.7.3 (Sat Dec 20 18:49 2711 ./doc/rcvars.txt 1525 ./doc/reading-mail.txt 4947 ./doc/umlaute.txt - 4245 ./doc/umlauts.txt + 4246 ./doc/umlauts.txt 4675 ./doc/tin.defaults - 7379 ./doc/tinews.1 - 1879 ./doc/tools.txt + 11541 ./doc/tinews.1 + 2237 ./doc/tools.txt 5870 ./doc/mbox.5 4168 ./doc/mmdf.5 2128 ./doc/newsoverview.5 6963 ./doc/plp_snprintf.3 - 121321 ./doc/tin.1 - 71189 ./doc/tin.5 + 117218 ./doc/tin.1 + 71250 ./doc/tin.5 4733 ./doc/w2r.1 2196 ./doc/wildmat.3 344 ./tools/expiretover 3815 ./tools/metamutt 2787 ./tools/opt-case.pl 1410 ./tools/tinlock - 17984 ./tools/tinews.pl + 24930 ./tools/tinews.pl 1561 ./tools/url_handler.sh 3172 ./tools/w2r.pl 1661 ./tools/expand_aliases.tgz - 2702 ./include/bool.h + 2778 ./include/bool.h 2039 ./include/bugrep.h 9502 ./include/oldconfig.h - 57932 ./include/extern.h + 57446 ./include/extern.h 11429 ./include/keymap.h 15886 ./include/menukeys.h 6340 ./include/newsrc.h 6507 ./include/nntplib.h 665 ./include/plp_snprintf.h - 12078 ./include/policy.h - 29639 ./include/proto.h + 12162 ./include/policy.h + 29681 ./include/proto.h 5047 ./include/rfc2046.h 3373 ./include/stpwatch.h - 5609 ./include/tcurses.h - 61820 ./include/tin.h + 5722 ./include/tcurses.h + 62075 ./include/tin.h 13059 ./include/tinrc.h - 5662 ./include/tnntp.h - 2256 ./include/trace.h - 2530 ./include/version.h + 5670 ./include/tnntp.h + 2264 ./include/trace.h + 2531 ./include/version.h 25935 ./src/active.c - 53602 ./src/art.c + 53864 ./src/art.c 31065 ./src/attrib.c 12365 ./src/auth.c 13846 ./src/charset.c - 5981 ./src/color.c - 89271 ./src/config.c + 7086 ./src/color.c + 89277 ./src/config.c 29572 ./src/cook.c 30644 ./src/curses.c 9791 ./src/debug.c 3414 ./src/envarg.c - 25671 ./src/feed.c - 54385 ./src/filter.c - 17968 ./src/getline.c + 26008 ./src/feed.c + 55175 ./src/filter.c + 18235 ./src/getline.c 7254 ./src/global.c - 45273 ./src/group.c + 45228 ./src/group.c 3906 ./src/hashstr.c 8775 ./src/header.c - 27952 ./src/help.c + 27937 ./src/help.c 13862 ./src/inews.c - 32656 ./src/init.c - 2208 ./src/joinpath.c + 32564 ./src/init.c + 2216 ./src/joinpath.c 38018 ./src/keymap.c - 114956 ./src/lang.c - 4474 ./src/langinfo.c + 114256 ./src/lang.c + 4486 ./src/langinfo.c 7033 ./src/list.c 6672 ./src/lock.c 13362 ./src/mail.c - 25758 ./src/main.c + 25885 ./src/main.c 10227 ./src/makecfg.c 12294 ./src/memory.c 5257 ./src/mimetypes.c - 84110 ./src/misc.c + 84456 ./src/misc.c 40354 ./src/newsrc.c - 37040 ./src/nntplib.c + 37162 ./src/nntplib.c 7291 ./src/nrctbl.c - 61961 ./src/page.c - 24132 ./src/parsdate.y + 61314 ./src/page.c + 24133 ./src/parsdate.y 16966 ./src/plp_snprintf.c - 12676 ./src/pgp.c - 132314 ./src/post.c - 14432 ./src/prompt.c + 12695 ./src/pgp.c + 132690 ./src/post.c + 15448 ./src/prompt.c 10680 ./src/read.c - 24980 ./src/refs.c + 25868 ./src/refs.c 5276 ./src/regex.c 14488 ./src/rfc1524.c 5553 ./src/rfc2045.c - 29413 ./src/rfc2046.c + 29612 ./src/rfc2046.c 23826 ./src/rfc2047.c - 37008 ./src/save.c - 10836 ./src/screen.c - 15429 ./src/search.c - 30631 ./src/select.c + 37040 ./src/save.c + 11460 ./src/screen.c + 15404 ./src/search.c + 30742 ./src/select.c 7590 ./src/sigfile.c - 12332 ./src/signal.c + 12594 ./src/signal.c 7215 ./src/strftime.c - 18744 ./src/string.c - 13831 ./src/tags.c - 16381 ./src/tcurses.c + 19287 ./src/string.c + 13875 ./src/tags.c + 17042 ./src/tcurses.c 3058 ./src/tmpfile.c 3376 ./src/my_tmpfile.c - 40222 ./src/thread.c - 2464 ./src/trace.c - 4109 ./src/version.c - 5489 ./src/wildmat.c - 7129 ./src/xface.c - 7637 ./src/xref.c + 40362 ./src/thread.c + 2472 ./src/trace.c + 4117 ./src/version.c + 5453 ./src/wildmat.c + 7139 ./src/xface.c + 7746 ./src/xref.c 3013 ./vms/dir.h 424 ./vms/filetypes.h 21451 ./vms/getopt.c @@ -172,7 +173,7 @@ MANIFEST for tin-1.7.3 (Sat Dec 20 18:49 64875 ./pcre/ChangeLog 8049 ./pcre/INSTALL 2218 ./pcre/LICENCE - 2404 ./pcre/Makefile.in + 2643 ./pcre/Makefile.in 12558 ./pcre/Makefile.in-old 6142 ./pcre/NEWS 5381 ./pcre/NON-UNIX-USE @@ -209,9 +210,9 @@ MANIFEST for tin-1.7.3 (Sat Dec 20 18:49 1528 ./pcre/testdata/testoutput3 14786 ./pcre/testdata/testoutput4 22706 ./pcre/testdata/testoutput5 - 19483 ./include/autoconf.hin + 19633 ./include/autoconf.hin 5800 ./pcre/pcre.mms - 20127 ./src/Makefile.in + 20816 ./src/Makefile.in 7493 ./src/tincfg.tbl 8747 ./src/descrip.mms 954 ./libcanlock/Build @@ -245,7 +246,7 @@ MANIFEST for tin-1.7.3 (Sat Dec 20 18:49 72 ./intl/ChangeLog 13325 ./intl/config.charset 1820 ./intl/dcgettext.c - 34038 ./intl/dcigettext.c + 34160 ./intl/dcigettext.c 1895 ./intl/dcngettext.c 1792 ./intl/dgettext.c 1927 ./intl/dngettext.c @@ -253,18 +254,18 @@ MANIFEST for tin-1.7.3 (Sat Dec 20 18:49 5736 ./intl/finddomain.c 1891 ./intl/gettext.c 3104 ./intl/gettext.h - 7678 ./intl/gettextP.h + 7686 ./intl/gettextP.h 1835 ./intl/hash-string.h 4763 ./intl/intl-compat.c 10480 ./intl/l10nflist.c 1932 ./intl/libgettext.h 4397 ./intl/libgnuintl.h 3380 ./intl/loadinfo.h - 14967 ./intl/loadmsgcat.c + 14865 ./intl/loadmsgcat.c 6905 ./intl/localcharset.c 2657 ./intl/locale.alias - 9450 ./intl/localealias.c - 9968 ./intl/Makefile.in + 9432 ./intl/localealias.c + 10014 ./intl/Makefile.in 2001 ./intl/ngettext.c 38981 ./intl/plural.c 8376 ./intl/plural.y @@ -274,13 +275,13 @@ MANIFEST for tin-1.7.3 (Sat Dec 20 18:49 41 ./intl/VERSION 4962 ./po/Makefile.inn 828 ./po/POTFILES.in - 118016 ./po/tin.pot - 160942 ./po/de.gmo - 191042 ./po/de.po + 117864 ./po/tin.pot + 160871 ./po/de.gmo + 190850 ./po/de.po 7027 ./po/en_GB.gmo - 120400 ./po/en_GB.po - 153415 ./po/et.gmo - 183024 ./po/et.po - 99634 ./po/fr.gmo - 160809 ./po/fr.po -5916829 total + 120248 ./po/en_GB.po + 153223 ./po/et.gmo + 182807 ./po/et.po + 103524 ./po/fr.gmo + 162772 ./po/fr.po +5964933 total diff -Nurp tin-1.7.3/Makefile tin-1.7.4/Makefile --- tin-1.7.3/Makefile Sat Dec 20 18:49:53 2003 +++ tin-1.7.4/Makefile Wed Feb 25 10:59:01 2004 @@ -7,9 +7,9 @@ PROJECT = tin LVER = 1 PVER = 7 -SVER = 3 +SVER = 4 VER = $(LVER).$(PVER).$(SVER) -DVER = 20031220 +DVER = 20040225 EXE = tin # directory structure @@ -143,6 +143,7 @@ DOC = \ $(DOCDIR)/ABOUT-NLS \ $(DOCDIR)/CHANGES \ $(DOCDIR)/CHANGES.old \ + $(DOCDIR)/CREDITS \ $(DOCDIR)/DEBUG_REFS \ $(DOCDIR)/INSTALL \ $(DOCDIR)/TODO \ diff -Nurp tin-1.7.3/README.MAC tin-1.7.4/README.MAC --- tin-1.7.3/README.MAC Sat Nov 29 22:30:21 2003 +++ tin-1.7.4/README.MAC Wed Jan 28 19:03:47 2004 @@ -1,11 +1,18 @@ Compiling tin for MacOS X: -First, you need the developer packages installed (CD 2). +First, you either need: +- the DevTools if you are running Mac OS X 10.2 (Darwin 6.x) or below +or +- the Xcode Tools if you are running Mac OS X 10.3 (Darwin 7.x.x) configure needs at least the argument: --with-domain-name= -Compile tin, install it and run in a ISO-8859-1 terminal. +Compile tin, install it and run in a ISO-8859-1(5) terminal. -Instead of using the shell-script url_handler.sh you might want -to use open(1) as URL-handler. +Here are two other ways to build and install tin: +- DarwinPorts +- Fink + +Instead of using the shell-script url_handler.sh you might want to use +open(1) as URL-handler. diff -Nurp tin-1.7.3/aclocal.m4 tin-1.7.4/aclocal.m4 --- tin-1.7.3/aclocal.m4 Sat Nov 29 22:30:21 2003 +++ tin-1.7.4/aclocal.m4 Tue Jan 20 15:20:58 2004 @@ -1,11 +1,11 @@ dnl Project : tin - a Usenet reader dnl Module : aclocal.m4 -dnl Author : Thomas E. Dickey +dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2003-09-13 +dnl Updated : 2004-01-19 dnl Notes : dnl -dnl Copyright (c) 1995-2003 Thomas E. Dickey +dnl Copyright (c) 1995-2004 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -269,9 +269,9 @@ AC_DEFUN([AM_LC_MESSAGES], fi fi])dnl dnl --------------------------------------------------------------------------- -dnl AM_MULTIBYTE_ABLE version: 5 updated: 2003/01/16 16:21:27 +dnl AM_MULTIBYTE_ABLE version: 6 updated: 2004/01/19 12:11:07 dnl ----------------- - +dnl dnl check for required multibyte/widechar functions dnl Urs Janssen 20021006 dnl Usage: AM_MULTIBYTE_ABLE @@ -333,16 +333,19 @@ AC_DEFUN([AM_MULTIBYTE_ABLE], mbstowcs(format, "%s", 2); swprintf(wcb, 5, format, "test"); wcsncat(wcb2, wcb, 5);], - [am_cv_multibyte_able=yes - AC_DEFINE(HAVE_LIBUTF8_H)], - [am_cv_multibyte_able=no - LIBS="$cf_save_LIBS"]) + [am_cv_multibyte_able=libutf8], + [am_cv_multibyte_able=no]) + LIBS="$cf_save_LIBS" ]) - if test $am_cv_multibyte_able = yes; then + ]) + if test "$am_cv_multibyte_able" != no; then + if test "$am_cv_multibyte_able" = libutf8; then + AC_DEFINE(HAVE_LIBUTF8_H) + LIBS="-lutf8 $LIBS" + fi AC_DEFINE(MULTIBYTE_ABLE, 1, [Define if you have swprintf() and co.]) fi - ]) ]) dnl --------------------------------------------------------------------------- dnl AM_PATH_PROG_WITH_TEST version: 5 updated: 2002/10/27 23:21:42 @@ -918,7 +921,58 @@ esac $3="$withval" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUNDLED_INTL version: 6 updated: 2003/06/06 00:48:41 +dnl CF_BUILD_CC version: 2 updated: 2004/01/19 16:20:54 +dnl ----------- +dnl If we're cross-compiling, allow the user to override the tools and their +dnl options. The configure script is oriented toward identifying the host +dnl compiler, etc., but we need a build compiler to generate parts of the +dnl source. +dnl +dnl $1 = default for $CPPFLAGS +dnl $2 = default for $LIBS +AC_DEFUN([CF_BUILD_CC],[ +if test "$cross_compiling" = yes ; then + : ${BUILD_CC:='$(CC)'} + : ${BUILD_CFLAGS:=''} + : ${BUILD_CPPFLAGS:='ifelse([$1],,,[$1])'} + : ${BUILD_LDFLAGS:=''} + : ${BUILD_LIBS:='ifelse([$2],,,[$2])'} + : ${BUILD_EXEEXT:='$x'} + AC_ARG_WITH(build-cc, + [ --with-build-cc=XXX the build C compiler ($BUILD_CC)], + [BUILD_CC="$withval"], + [AC_CHECK_PROGS(BUILD_CC, $CC gcc cc)]) + AC_ARG_WITH(build-cflags, + [ --with-build-cflags=XXX the build C compiler-flags], + [BUILD_CFLAGS="$withval"]) + AC_ARG_WITH(build-cppflags, + [ --with-build-cppflags=XXX the build C preprocessor-flags], + [BUILD_CPPFLAGS="$withval"]) + AC_ARG_WITH(build-ldflags, + [ --with-build-ldflags=XXX the build linker-flags], + [BUILD_LDFLAGS="$withval"]) + AC_ARG_WITH(build-libs, + [ --with-build-libs=XXX the build libraries], + [BUILD_LIBS="$withval"]) + BUILD_EXEEXT= +else + : ${BUILD_CC:='$(CC)'} + : ${BUILD_CFLAGS:='$(CFLAGS)'} + : ${BUILD_CPPFLAGS:='$(CPPFLAGS)'} + : ${BUILD_LDFLAGS:='$(LDFLAGS)'} + : ${BUILD_LIBS:='$(LIBS)'} + : ${BUILD_EXEEXT:='$x'} +fi + +AC_SUBST(BUILD_CC) +AC_SUBST(BUILD_CFLAGS) +AC_SUBST(BUILD_CPPFLAGS) +AC_SUBST(BUILD_LDFLAGS) +AC_SUBST(BUILD_LIBS) +AC_SUBST(BUILD_EXEEXT) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_BUNDLED_INTL version: 10 updated: 2003/09/14 18:49:13 dnl --------------- dnl Top-level macro for configuring an application with a bundled copy of dnl the intl and po directories for gettext. @@ -933,6 +987,11 @@ dnl SUB_MAKEFILE - list of makefiles in dnl Defines dnl HAVE_LIBGETTEXT_H if we're using ./intl dnl +dnl Environment: +dnl ALL_LINGUAS if set, lists the root names of the ".po" files. +dnl CONFIG_H assumed to be "config.h" +dnl VERSION may be set, otherwise extract from "VERSION" file. +dnl AC_DEFUN([CF_BUNDLED_INTL],[ cf_makefile=ifelse($1,,Makefile,$1) @@ -941,6 +1000,19 @@ dnl setting $LINGUAS overrides $ALL_LING 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/*//'` +# Allow override of "config.h" definition: +: ${CONFIG_H=config.h} +AC_SUBST(CONFIG_H) + +if test -z "$VERSION" ; then +if test -f $srcdir/VERSION ; then + VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1` +else + VERSION=unknown +fi +fi +AC_SUBST(VERSION) + AM_GNU_GETTEXT(,,,[$2]) INTLDIR_MAKE= @@ -952,14 +1024,23 @@ 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) + for cf_makefile in \ + $srcdir/intl/Makefile.in \ + $srcdir/intl/makefile.in + do + if test -f "$cf_makefile" ; then + SUB_MAKEFILE="$SUB_MAKEFILE `echo ${cf_makefile}|sed -e 's/\.in$//'`:${cf_makefile}" + break + fi + done fi else INTLDIR_MAKE="#" @@ -1451,12 +1532,13 @@ AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 22 updated: 2002/10/27 18:21:42 +dnl CF_CURSES_LIBS version: 23 updated: 2003/11/06 19:59:57 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. AC_DEFUN([CF_CURSES_LIBS],[ +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_MSG_CHECKING(if we have identified curses libraries) AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], [initscr(); tgoto("?", 0,0)], @@ -1634,7 +1716,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERM_H version: 4 updated: 2002/01/12 17:08:23 +dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57 dnl ---------------- dnl SVr4 curses should have term.h as well (where it puts the definitions of dnl the low-level interface). This may not be true in old/broken implementations, @@ -1643,15 +1725,20 @@ dnl running with Solaris 2.5.1). AC_DEFUN([CF_CURSES_TERM_H], [ AC_CACHE_CHECK(for term.h, cf_cv_term_header,[ + +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl +# If we found , look for , but always look +# for if we do not find the variant. for cf_header in \ - ncurses/term.h \ + `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ term.h do AC_TRY_COMPILE([ #include <${cf_cv_ncurses_header-curses.h}> #include <${cf_header}>], [WINDOW *x], - [cf_cv_term_header=$cf_header], + [cf_cv_term_header=$cf_header + break], [cf_cv_term_header=no]) done ]) @@ -1663,6 +1750,9 @@ term.h) #(vi ncurses/term.h) AC_DEFINE(HAVE_NCURSES_TERM_H) ;; +ncursesw/term.h) + AC_DEFINE(HAVE_NCURSESW_TERM_H) + ;; esac ])dnl dnl --------------------------------------------------------------------------- @@ -2229,7 +2319,7 @@ AC_MSG_RESULT($cf_cv_system_status) test $cf_cv_system_status = no && AC_DEFINE(USE_SYSTEM_STATUS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 2 updated: 2003/05/24 15:01:41 +dnl CF_GCC_VERSION version: 3 updated: 2003/09/06 19:16:57 dnl -------------- dnl Find version of gcc AC_DEFUN([CF_GCC_VERSION],[ @@ -2237,13 +2327,13 @@ 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.]].*//'`" + GCC_VERSION="`${CC} --version|sed -e '2,$d' -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 CF_GCC_WARNINGS version: 15 updated: 2003/07/05 18:42:30 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: @@ -2258,7 +2348,7 @@ dnl AC_DEFUN([CF_GCC_WARNINGS], [ AC_REQUIRE([CF_GCC_VERSION]) -if ( test "$GCC" = yes || test "$GXX" = yes ) +if test "$GCC" = yes then cat > conftest.$ac_ext <&AC_FD_MSG ])dnl dnl --------------------------------------------------------------------------- -dnl CF_OUR_MESSAGES version: 4 updated: 2003/06/06 00:48:41 +dnl CF_OUR_MESSAGES version: 6 updated: 2004/01/03 10:56:43 dnl --------------- dnl Check if we use the messages included with this program dnl @@ -2859,7 +2951,7 @@ 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], + [ --disable-included-msgs use included messages, for i18n support], [use_our_messages=$enableval], [use_our_messages=yes]) fi @@ -2869,7 +2961,7 @@ fi MSG_DIR_MAKE="#" if test "$use_our_messages" = yes then - SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:po/$cf_makefile.inn" + SUB_MAKEFILE="$SUB_MAKEFILE $srcdir/po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn" MSG_DIR_MAKE= fi @@ -3070,26 +3162,27 @@ test "$cf_cv_sigaction_funcs" = yes && A fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_EXT version: 8 updated: 2002/12/21 19:25:52 +dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18 dnl ----------- dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX. AC_DEFUN([CF_PROG_EXT], [ AC_REQUIRE([CF_CHECK_CACHE]) -PROG_EXT= case $cf_cv_system_name in os2*) - # We make sure -Zexe is not used -- it would interfere with @PROG_EXT@ CFLAGS="$CFLAGS -Zmt" CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" CXXFLAGS="$CXXFLAGS -Zmt" - LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed -e "s%-Zexe%%g"` - PROG_EXT=".exe" - ;; -cygwin*) - PROG_EXT=".exe" + # autoconf's macro sets -Zexe and suffix both, which conflict:w + LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" + ac_cv_exeext=.exe ;; esac + +AC_EXEEXT +AC_OBJEXT + +PROG_EXT="$EXEEXT" AC_SUBST(PROG_EXT) test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT") ])dnl @@ -3581,6 +3674,24 @@ test -d /usr && { } ])dnl dnl --------------------------------------------------------------------------- +dnl CF_SUBST version: 2 updated: 1997/09/06 23:41:28 +dnl -------- +dnl Shorthand macro for substituting things that the user may override +dnl with an environment variable. +dnl +dnl $1 = long/descriptive name +dnl $2 = environment variable +dnl $3 = default value +AC_DEFUN([CF_SUBST], +[AC_CACHE_VAL(cf_cv_subst_$2,[ +AC_MSG_CHECKING(for $1 (symbol $2)) +test -z "[$]$2" && $2=$3 +AC_MSG_RESULT([$]$2) +AC_SUBST($2) +cf_cv_subst_$2=[$]$2]) +$2=${cf_cv_subst_$2} +])dnl +dnl --------------------------------------------------------------------------- dnl CF_SYS_ERRLIST version: 6 updated: 2001/12/30 13:03:23 dnl -------------- dnl Check for declaration of sys_nerr and sys_errlist in one of stdio.h and @@ -3999,6 +4110,24 @@ AC_ARG_WITH(curses-dir, [cf_cv_curses_dir=no]) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_DBMALLOC version: 3 updated: 2004/01/19 13:06:01 +dnl ---------------- +dnl Configure-option for dbmalloc. The optional parameter is used to override +dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. +AC_DEFUN([CF_WITH_DBMALLOC],[ +AC_MSG_CHECKING(if you want to link with dbmalloc for testing) +AC_ARG_WITH(dbmalloc, + [ --with-dbmalloc use Conor Cahill's dbmalloc library], + [with_dbmalloc=$withval], + [with_dbmalloc=no]) +AC_MSG_RESULT($with_dbmalloc) +if test $with_dbmalloc = yes ; then + AC_CHECK_HEADER(dbmalloc.h, + [AC_CHECK_LIB(dbmalloc,debug_malloc + ifelse($1,,[],[,$1]))]) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_DFTENV version: 3 updated: 1998/04/01 11:39:13 dnl -------------- dnl Wrapper for AC_ARG_WITH to inherit/override an environment variable's @@ -4019,6 +4148,24 @@ $3="$withval" AC_DEFINE_UNQUOTED($3,"[$]$3")dnl ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_DMALLOC version: 3 updated: 2004/01/19 13:06:01 +dnl --------------- +dnl Configure-option for dmalloc. The optional parameter is used to override +dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. +AC_DEFUN([CF_WITH_DMALLOC],[ +AC_MSG_CHECKING(if you want to link with dmalloc for testing) +AC_ARG_WITH(dmalloc, + [ --with-dmalloc use Gray Watson's dmalloc library], + [with_dmalloc=$withval], + [with_dmalloc=no]) +AC_MSG_RESULT($with_dmalloc) +if test $with_dmalloc = yes ; then + AC_CHECK_HEADER(dmalloc.h, + [AC_CHECK_LIB(dmalloc,dmalloc_debug + ifelse($1,,[],[,$1]))]) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_PATH version: 6 updated: 1998/10/11 00:40:17 dnl ------------ dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just @@ -4089,23 +4236,31 @@ AC_DEFUN([CF_WITH_VALUE], AC_DEFINE_UNQUOTED($3,"$withval")dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_CURSES version: 6 updated: 2002/11/12 06:55:30 +dnl CF_XOPEN_CURSES version: 8 updated: 2003/11/07 19:47:46 dnl --------------- dnl Test if we should define X/Open source for curses, needed on Digital Unix dnl 4.x, to see the extended functions, but breaks on IRIX 6.x. +dnl +dnl The getbegyx() check is needed for HPUX, which omits legacy macros such +dnl as getbegy(). The latter is better design, but the former is standard. AC_DEFUN([CF_XOPEN_CURSES], [ +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[ AC_TRY_LINK([ #include #include <${cf_cv_ncurses_header-curses.h}>],[ - long x = winnstr(stdscr, "", 0)], + long x = winnstr(stdscr, "", 0); + int x1, y1; + getbegyx(stdscr, y1, x1)], [cf_cv_need_xopen_extension=no], [AC_TRY_LINK([ #define _XOPEN_SOURCE_EXTENDED #include #include <${cf_cv_ncurses_header-curses.h}>],[ - long x = winnstr(stdscr, "", 0)], + long x = winnstr(stdscr, "", 0); + int x1, y1; + getbegyx(stdscr, y1, x1)], [cf_cv_need_xopen_extension=yes], [cf_cv_need_xopen_extension=unknown])])]) test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" diff -Nurp tin-1.7.3/config.guess tin-1.7.4/config.guess --- tin-1.7.3/config.guess Sat Nov 29 22:30:21 2003 +++ tin-1.7.4/config.guess Wed Feb 18 00:47:10 2004 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-10-20' +timestamp='2004-02-16' # 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 @@ -197,12 +197,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; arc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -239,6 +245,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -405,6 +420,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -1186,7 +1204,7 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1230,8 +1248,8 @@ EOF SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; - *:DRAGONFLY:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; esac diff -Nurp tin-1.7.3/config.sub tin-1.7.4/config.sub --- tin-1.7.3/config.sub Sat Nov 29 22:30:21 2003 +++ tin-1.7.4/config.sub Mon Feb 23 21:57:09 2004 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-11-20' +timestamp='2004-02-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -363,6 +363,9 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -380,6 +383,9 @@ case $basic_machine in amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -439,12 +445,20 @@ case $basic_machine in basic_machine=j90-cray os=-unicos ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -1140,8 +1154,9 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ diff -Nurp tin-1.7.3/configure tin-1.7.4/configure --- tin-1.7.3/configure Sat Dec 20 18:49:55 2003 +++ tin-1.7.4/configure Wed Feb 25 10:59:03 2004 @@ -185,6 +185,11 @@ EOF cat < ASCII conversion (default: -1) --disable-locale disable locale support --disable-posting disable posting -EOF -cat <> confdefs.h <&6 -echo "configure:661: checking host system type" >&5 +echo "configure:668: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -753,7 +760,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:757: checking for $ac_word" >&5 +echo "configure:764: 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 @@ -803,7 +810,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:807: checking for $ac_word" >&5 +echo "configure:814: 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 @@ -833,7 +840,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:837: checking for $ac_word" >&5 +echo "configure:844: 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 @@ -884,7 +891,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:888: checking for $ac_word" >&5 +echo "configure:895: 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 @@ -916,7 +923,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:920: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:927: 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. @@ -927,12 +934,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 931 "configure" +#line 938 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:943: \"$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 @@ -958,12 +965,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:962: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:969: 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:967: checking whether we are using GNU C" >&5 +echo "configure:974: 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 @@ -972,7 +979,7 @@ else yes; #endif EOF -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 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:983: \"$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 @@ -991,7 +998,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:995: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1002: 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 @@ -1023,7 +1030,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1027: checking how to run the C preprocessor" >&5 +echo "configure:1034: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1038,13 +1045,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1055: \"$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 : @@ -1055,13 +1062,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1072: \"$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 : @@ -1072,13 +1079,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1089: \"$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 : @@ -1104,13 +1111,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:1108: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1115: 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 < Autoconf TIOCGETP @@ -1128,7 +1135,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1150,7 +1157,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:1154: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1161: 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 @@ -1188,7 +1195,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:1192: checking for a BSD compatible install" >&5 +echo "configure:1199: 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 @@ -1240,36 +1247,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# 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: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 - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - if eval "test \"`echo '$''{'cf_cv_prog_YACC'+set}'`\" = set"; then @@ -1295,14 +1272,14 @@ EOF do rm -f y.tab.ch echo $ac_n "checking for $cf_prog""... $ac_c" 1>&6 -echo "configure:1299: checking for $cf_prog" >&5 +echo "configure:1276: checking for $cf_prog" >&5 cf_command="$cf_prog conftest.y" cf_result=no - if { (eval echo configure:1302: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then + if { (eval echo configure:1279: \"$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:1306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then + if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then cf_result=yes fi else @@ -1326,7 +1303,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:1330: checking for $ac_word" >&5 +echo "configure:1307: 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 @@ -1357,13 +1334,13 @@ done echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1361: checking if we must define _GNU_SOURCE" >&5 +echo "configure:1338: 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 < int main() { @@ -1373,7 +1350,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1383,7 +1360,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1393,7 +1370,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1415,7 +1392,7 @@ test "$cf_cv_gnu_source" = yes && CPPFLA echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1419: checking for strerror in -lcposix" >&5 +echo "configure:1396: 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 @@ -1423,7 +1400,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1415: \"$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 @@ -1458,7 +1435,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1462: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1439: 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 @@ -1514,7 +1491,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1597,58 +1574,512 @@ You have the following choices: c. use a wrapper such as unproto" 1>&2; exit 1; } fi +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:1579: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:1612: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes -PROG_EXT= case $cf_cv_system_name in os2*) - # We make sure -Zexe is not used -- it would interfere with @PROG_EXT@ CFLAGS="$CFLAGS -Zmt" CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" CXXFLAGS="$CXXFLAGS -Zmt" - LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed -e "s%-Zexe%%g"` - PROG_EXT=".exe" - ;; -cygwin*) - PROG_EXT=".exe" + # autoconf's macro sets -Zexe and suffix both, which conflict:w + LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" + ac_cv_exeext=.exe ;; esac + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:1656: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + +echo $ac_n "checking for object suffix""... $ac_c" 1>&6 +echo "configure:1687: checking for object suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + rm -f conftest* +echo 'int i = 1;' > conftest.$ac_ext +if { (eval echo configure:1693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + for ac_file in conftest.*; do + case $ac_file in + *.c) ;; + *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; + esac + done +else + { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_objext" 1>&6 +OBJEXT=$ac_cv_objext +ac_objext=$ac_cv_objext + + +PROG_EXT="$EXEEXT" + test -n "$PROG_EXT" && cat >> confdefs.h <&6 +echo "configure:1728: 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 + rm -f conftestdata +if ln -s X conftestdata 2>/dev/null +then + rm -f conftestdata + ac_cv_prog_LN_S="ln -s" +else + ac_cv_prog_LN_S=ln +fi +fi +LN_S="$ac_cv_prog_LN_S" +if test "$ac_cv_prog_LN_S" = "ln -s"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + +if test "$cross_compiling" = yes ; then + : ${BUILD_CC:='$(CC)'} + : ${BUILD_CFLAGS:=''} + : ${BUILD_CPPFLAGS:='-I$(INCDIR)'} + : ${BUILD_LDFLAGS:=''} + : ${BUILD_LIBS:=''} + : ${BUILD_EXEEXT:='$x'} + +# Check whether --with-build-cc or --without-build-cc was given. +if test "${with_build_cc+set}" = set; then + withval="$with_build_cc" + BUILD_CC="$withval" +else + for ac_prog in $CC gcc cc +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:1768: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$BUILD_CC"; then + ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_BUILD_CC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +BUILD_CC="$ac_cv_prog_BUILD_CC" +if test -n "$BUILD_CC"; then + echo "$ac_t""$BUILD_CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$BUILD_CC" && break +done + +fi + + +# Check whether --with-build-cflags or --without-build-cflags was given. +if test "${with_build_cflags+set}" = set; then + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" +fi + + +# Check whether --with-build-cppflags or --without-build-cppflags was given. +if test "${with_build_cppflags+set}" = set; then + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" +fi + + +# Check whether --with-build-ldflags or --without-build-ldflags was given. +if test "${with_build_ldflags+set}" = set; then + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" +fi + + +# Check whether --with-build-libs or --without-build-libs was given. +if test "${with_build_libs+set}" = set; then + withval="$with_build_libs" + BUILD_LIBS="$withval" +fi + + BUILD_EXEEXT= +else + : ${BUILD_CC:='$(CC)'} + : ${BUILD_CFLAGS:='$(CFLAGS)'} + : ${BUILD_CPPFLAGS:='$(CPPFLAGS)'} + : ${BUILD_LDFLAGS:='$(LDFLAGS)'} + : ${BUILD_LIBS:='$(LIBS)'} + : ${BUILD_EXEEXT:='$x'} +fi + + + + + + + + + +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:1846: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + +if test $host != $build; then + ac_tool_prefix=${host_alias}- +else + ac_tool_prefix= +fi + +# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1872: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_RANLIB"; then +if test -n "$ac_tool_prefix"; then + # 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:1904: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB="':'" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + RANLIB="':'" +fi +fi + +# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. +set dummy ${ac_tool_prefix}ld; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1939: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LD="${ac_tool_prefix}ld" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +LD="$ac_cv_prog_LD" +if test -n "$LD"; then + echo "$ac_t""$LD" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_LD"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "ld", so it can be a program name with args. +set dummy ld; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1971: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LD="ld" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_LD" && ac_cv_prog_LD="ld" +fi +fi +LD="$ac_cv_prog_LD" +if test -n "$LD"; then + echo "$ac_t""$LD" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + LD="ld" +fi +fi + +# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2006: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1633: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then +if test -z "$ac_cv_prog_AR"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2038: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. else - ac_cv_prog_LN_S=ln + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="ar" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" fi fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 else echo "$ac_t""no" 1>&6 fi +else + AR="ar" +fi +fi + +if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 +echo "configure:2075: checking for archiver options (symbol AR_OPTS)" >&5 +test -z "$AR_OPTS" && AR_OPTS=rv +echo "$ac_t""$AR_OPTS" 1>&6 + +cf_cv_subst_AR_OPTS=$AR_OPTS +fi + +AR_OPTS=${cf_cv_subst_AR_OPTS} + case "$host_cpu:$host_vendor:$host_os" in # check for MacOS X, exclude Darwin on ix86 @@ -1686,7 +2117,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:1690: checking for ispell" >&5 +echo "configure:2121: checking for ispell" >&5 ac_cv_path_PATH_ISPELL="$withval" cat >> confdefs.h <&6 -echo "configure:1707: checking for $ac_word" >&5 +echo "configure:2138: 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 @@ -1760,7 +2191,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:1764: checking for metamail" >&5 +echo "configure:2195: checking for metamail" >&5 ac_cv_path_PATH_METAMAIL="$withval" cat >> confdefs.h <&6 -echo "configure:1781: checking for $ac_word" >&5 +echo "configure:2212: 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 @@ -1834,7 +2265,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:1838: checking for sum" >&5 +echo "configure:2269: checking for sum" >&5 ac_cv_path_PATH_SUM="$withval" cat >> confdefs.h <&6 -echo "configure:1855: checking for $ac_word" >&5 +echo "configure:2286: 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 @@ -1898,12 +2329,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:1902: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "configure:2333: 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:1907: \"$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:2338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then ac_cv_prog_sum_r=yes else @@ -1933,7 +2364,7 @@ fi echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:1937: checking for default editor" >&5 +echo "configure:2368: checking for default editor" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then @@ -1961,7 +2392,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:1965: checking for $ac_word" >&5 +echo "configure:2396: 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 @@ -2006,7 +2437,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:2010: checking for $ac_word" >&5 +echo "configure:2441: 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 @@ -2060,7 +2491,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:2064: checking for $ac_word" >&5 +echo "configure:2495: 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 @@ -2097,7 +2528,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:2101: checking for $ac_word" >&5 +echo "configure:2532: 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 @@ -2131,7 +2562,7 @@ fi fi echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:2135: checking for default mailer" >&5 +echo "configure:2566: checking for default mailer" >&5 if test -n "$DEFAULT_MAILER" ; then case $cf_cv_system_name in #(vi @@ -2158,7 +2589,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:2162: checking for incoming-mail directory" >&5 +echo "configure:2593: checking for incoming-mail directory" >&5 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then @@ -2204,7 +2635,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:2208: checking if you want PGP/GPG-Support" >&5 +echo "configure:2639: 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 @@ -2236,7 +2667,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:2240: checking for pgp" >&5 +echo "configure:2671: checking for pgp" >&5 ac_cv_path_PATH_PGP="$withval" cat >> confdefs.h <&6 -echo "configure:2257: checking for $ac_word" >&5 +echo "configure:2688: 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 @@ -2311,7 +2742,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:2315: checking for pgpk" >&5 +echo "configure:2746: checking for pgpk" >&5 ac_cv_path_PATH_PGPK="$withval" cat >> confdefs.h <&6 -echo "configure:2332: checking for $ac_word" >&5 +echo "configure:2763: 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 @@ -2386,7 +2817,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:2390: checking for gpg" >&5 +echo "configure:2821: checking for gpg" >&5 ac_cv_path_PATH_GPG="$withval" cat >> confdefs.h <&6 -echo "configure:2407: checking for $ac_word" >&5 +echo "configure:2838: 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 @@ -2460,13 +2891,13 @@ fi echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:2464: checking for the default shell program" >&5 +echo "configure:2895: 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 < @@ -2479,7 +2910,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -2489,11 +2920,11 @@ fi rm -f conftest* fi -echo "(line 2493) testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "(line 2924) 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 2497) testing /etc/shells ..." 1>&5 +echo "(line 2928) testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -2528,14 +2959,14 @@ echo "(line 2497) testing /etc/shells .. echo "$ac_t""$DEFAULT_SHELL" 1>&6 else -echo "(line 2532) testing $PATH ..." 1>&5 +echo "(line 2963) 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:2539: checking for $ac_word" >&5 +echo "configure:2970: 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 @@ -2588,7 +3019,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:2592: checking if NNTP-support will be used" >&5 +echo "configure:3023: checking if NNTP-support will be used" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then @@ -2610,7 +3041,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:2614: checking whether to be NNTP_ONLY" >&5 +echo "configure:3045: 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 @@ -2642,7 +3073,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:2646: checking if you want to compile-in debug support" >&5 +echo "configure:3077: 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 @@ -2669,7 +3100,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:2673: checking if you want to see long compiling messages" >&5 +echo "configure:3104: 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 @@ -2714,7 +3145,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:2718: checking if you want to compile with fallback prototypes" >&5 +echo "configure:3149: 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 @@ -2738,7 +3169,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:2742: checking if you want to turn on gcc warnings" >&5 +echo "configure:3173: 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 @@ -2764,22 +3195,22 @@ then 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.].*//'`" +echo "configure:3199: checking version of $CC" >&5 + GCC_VERSION="`${CC} --version|sed -e '2,$d' -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 ) +if test "$GCC" = yes then cat > conftest.$ac_ext <&6 -echo "configure:2783: checking for $CC warning options" >&5 +echo "configure:3214: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -2798,7 +3229,7 @@ echo "configure:2783: checking for $CC w Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:2802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3233: \"$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 @@ -2828,7 +3259,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:2832: checking for news-library path" >&5 +echo "configure:3263: checking for news-library path" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then @@ -2866,7 +3297,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:2870: checking for news spool-directory path" >&5 +echo "configure:3301: checking for news spool-directory path" >&5 # Check whether --with-spooldir or --without-spooldir was given. if test "${with_spooldir+set}" = set; then @@ -2904,7 +3335,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:2908: checking for news overview-directory path" >&5 +echo "configure:3339: 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 @@ -2942,7 +3373,7 @@ eval NOVROOTDIR="$withval" echo "$ac_t""$NOVROOTDIR" 1>&6 echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:2946: checking for overview filename" >&5 +echo "configure:3377: checking for overview filename" >&5 # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then @@ -2978,7 +3409,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:2982: checking for directory containing \"inews\"" >&5 +echo "configure:3413: 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 @@ -3019,7 +3450,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:3023: checking for $ac_word" >&5 +echo "configure:3454: 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 @@ -3076,7 +3507,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:3080: checking for optional INN-NNTP library" >&5 +echo "configure:3511: 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 @@ -3108,7 +3539,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:3112: checking if you want socks library" >&5 +echo "configure:3543: 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 @@ -3128,7 +3559,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:3132: checking if you want socks5 library" >&5 +echo "configure:3563: 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 @@ -3204,7 +3635,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext < @@ -3213,7 +3644,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:3217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -3227,7 +3658,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:3231: checking for network libraries" >&5 +echo "configure:3662: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3238,12 +3669,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3242: checking for $ac_func" >&5 +echo "configure:3673: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3701: \"$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 @@ -3289,7 +3720,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:3293: checking for gethostname in -lnsl" >&5 +echo "configure:3724: 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 @@ -3297,7 +3728,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3743: \"$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 @@ -3341,7 +3772,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:3345: checking for gethostname in -lsocket" >&5 +echo "configure:3776: 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 @@ -3349,7 +3780,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3795: \"$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 @@ -3405,7 +3836,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:3409: checking for main in -linet" >&5 +echo "configure:3840: 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 @@ -3413,14 +3844,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3855: \"$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 @@ -3445,12 +3876,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:3449: checking for $ac_func" >&5 +echo "configure:3880: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3908: \"$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 @@ -3496,7 +3927,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3500: checking for socket in -lsocket" >&5 +echo "configure:3931: 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 @@ -3504,7 +3935,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3950: \"$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 @@ -3548,7 +3979,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:3552: checking for socket in -lbsd" >&5 +echo "configure:3983: 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 @@ -3556,7 +3987,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4002: \"$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 @@ -3612,12 +4043,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3616: checking for $ac_func" >&5 +echo "configure:4047: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4075: \"$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 @@ -3663,7 +4094,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3667: checking for gethostbyname in -lnsl" >&5 +echo "configure:4098: 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 @@ -3671,7 +4102,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4117: \"$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 @@ -3723,12 +4154,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3727: checking for $ac_func" >&5 +echo "configure:4158: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4186: \"$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 @@ -3774,7 +4205,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:3778: checking for strcasecmp in -lresolv" >&5 +echo "configure:4209: 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 @@ -3782,7 +4213,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4228: \"$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 @@ -3865,10 +4296,10 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:3869: checking if the socks library uses socks4 prefix" >&5 +echo "configure:4300: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext < @@ -3877,7 +4308,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4312: \"$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 @@ -3889,14 +4320,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -3961,9 +4392,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:3965: checking if socks5p.h is available" >&5 +echo "configure:4396: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -3999,17 +4430,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:4003: checking for $ac_hdr" >&5 +echo "configure:4434: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4444: \"$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* @@ -4036,12 +4467,12 @@ fi done echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:4040: checking for fcntl" >&5 +echo "configure:4471: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4499: \"$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 @@ -4084,12 +4515,12 @@ else fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:4088: checking for lockf" >&5 +echo "configure:4519: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4547: \"$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 @@ -4132,12 +4563,12 @@ else fi echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:4136: checking for flock" >&5 +echo "configure:4567: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4595: \"$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 @@ -4181,7 +4612,7 @@ fi echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:4185: checking for file-locking functions" >&5 +echo "configure:4616: 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 @@ -4193,7 +4624,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se case $cf_lock in #(vi fcntl) #(vi cat > conftest.$ac_ext < @@ -4221,7 +4652,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4233,7 +4664,7 @@ rm -f conftest* ;; lockf) #(vi cat > conftest.$ac_ext < @@ -4253,7 +4684,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4265,7 +4696,7 @@ rm -f conftest* ;; flock) cat > conftest.$ac_ext < @@ -4288,7 +4719,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4309,7 +4740,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:4313: checking which locking method should be used" >&5 +echo "configure:4744: checking which locking method should be used" >&5 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -4378,7 +4809,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:4382: checking for screen type" >&5 +echo "configure:4813: checking for screen type" >&5 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -4394,7 +4825,7 @@ use_curses=no use_ncurses=no echo $ac_n "checking if you specified curses install-directory""... $ac_c" 1>&6 -echo "configure:4398: checking if you specified curses install-directory" >&5 +echo "configure:4829: checking if you specified curses install-directory" >&5 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -4451,7 +4882,7 @@ pdcurses) #(vi ;; none) echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:4455: checking if you want to use ncurses library" >&5 +echo "configure:4886: 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 @@ -4464,7 +4895,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:4468: checking if you want curses rather than termcap interface" >&5 +echo "configure:4899: 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 @@ -4501,7 +4932,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:4505: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:4936: 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 @@ -4512,7 +4943,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -4556,7 +4987,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:4560: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:4991: 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 @@ -4651,14 +5082,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:4662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4685,7 +5116,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -4753,14 +5184,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:4764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4815,7 +5246,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:4819: checking for ncurses version" >&5 +echo "configure:5250: 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 @@ -4841,7 +5272,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:4845: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:5276: \"$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" @@ -4850,7 +5281,7 @@ EOF else cat > conftest.$ac_ext < @@ -4874,7 +5305,7 @@ int main() exit(0); } EOF -if { (eval echo configure:4878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5309: \"$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` @@ -4905,7 +5336,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:4909: checking for Gpm_Open in -lgpm" >&5 +echo "configure:5340: 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 @@ -4913,7 +5344,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5359: \"$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 @@ -4940,7 +5371,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:4944: checking for initscr in -lgpm" >&5 +echo "configure:5375: 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 @@ -4948,7 +5379,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5394: \"$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 @@ -4990,7 +5421,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:4994: checking for tgoto in -lmytinfo" >&5 +echo "configure:5425: 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 @@ -4998,7 +5429,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5444: \"$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 @@ -5042,12 +5473,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:5046: checking for initscr" >&5 +echo "configure:5477: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5505: \"$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 @@ -5090,17 +5521,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:5094: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:5525: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:5104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5535: \"$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' @@ -5169,17 +5600,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:5173: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:5604: 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 < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:5183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5614: \"$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' @@ -5210,7 +5641,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:5214: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:5645: 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$%%"` @@ -5219,14 +5650,14 @@ echo "configure:5214: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:5230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5661: \"$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 @@ -5253,9 +5684,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:5257: checking for $cf_hdr" >&5 +echo "configure:5688: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -5263,7 +5694,7 @@ echo "configure:5257: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5698: \"$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* @@ -5290,12 +5721,12 @@ done echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:5294: checking for wide char and multibyte support" >&5 +echo "configure:5725: 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 < #ifdef HAVE_STDLIB_H @@ -5331,7 +5762,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:5335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -5341,7 +5772,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -5367,34 +5798,37 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5802: \"$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 -#define HAVE_LIBUTF8_H 1 -EOF - + am_cv_multibyte_able=libutf8 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* am_cv_multibyte_able=no - LIBS="$cf_save_LIBS" fi rm -f conftest* + LIBS="$cf_save_LIBS" fi rm -f conftest* - if test $am_cv_multibyte_able = yes; then + +fi + +echo "$ac_t""$am_cv_multibyte_able" 1>&6 + if test "$am_cv_multibyte_able" != no; then + if test "$am_cv_multibyte_able" = libutf8; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBUTF8_H 1 +EOF + + LIBS="-lutf8 $LIBS" + fi cat >> confdefs.h <<\EOF #define MULTIBYTE_ABLE 1 EOF fi - -fi - -echo "$ac_t""$am_cv_multibyte_able" 1>&6 @@ -5405,7 +5839,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:5409: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:5843: 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 @@ -5416,7 +5850,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -5468,7 +5902,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:5472: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:5906: 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 @@ -5563,14 +5997,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5597,7 +6031,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -5673,14 +6107,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5735,7 +6169,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:5739: 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 @@ -5761,7 +6195,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:5765: \"$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" @@ -5770,7 +6204,7 @@ EOF else cat > conftest.$ac_ext < @@ -5794,7 +6228,7 @@ int main() exit(0); } EOF -if { (eval echo configure:5798: \"$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` @@ -5825,7 +6259,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:5829: checking for Gpm_Open in -lgpm" >&5 +echo "configure:6263: 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 @@ -5833,7 +6267,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6282: \"$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 @@ -5860,7 +6294,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:5864: checking for initscr in -lgpm" >&5 +echo "configure:6298: 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 @@ -5868,7 +6302,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6317: \"$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 @@ -5910,7 +6344,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:5914: checking for tgoto in -lmytinfo" >&5 +echo "configure:6348: 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 @@ -5918,7 +6352,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6367: \"$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 @@ -5962,12 +6396,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:5966: checking for initscr" >&5 +echo "configure:6400: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6428: \"$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 @@ -6010,17 +6444,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:6014: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:6448: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6458: \"$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' @@ -6089,17 +6523,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:6093: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:6527: 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 < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6537: \"$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' @@ -6130,7 +6564,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:6134: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:6568: 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$%%"` @@ -6139,14 +6573,14 @@ echo "configure:6134: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:6150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6584: \"$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 @@ -6169,7 +6603,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6173: checking for ncurses version" >&5 +echo "configure:6607: 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 @@ -6195,7 +6629,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6199: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6633: \"$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" @@ -6204,7 +6638,7 @@ EOF else cat > conftest.$ac_ext < @@ -6228,7 +6662,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6666: \"$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` @@ -6251,23 +6685,25 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:6255: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:6689: 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 < #include <${cf_cv_ncurses_header-curses.h}> int main() { - long x = winnstr(stdscr, "", 0) + long x = winnstr(stdscr, "", 0); + int x1, y1; + getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:6271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6707: \"$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 @@ -6275,7 +6711,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { - long x = winnstr(stdscr, "", 0) + long x = winnstr(stdscr, "", 0); + int x1, y1; + getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:6290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6728: \"$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 @@ -6309,7 +6747,7 @@ test $cf_cv_need_xopen_extension = yes & echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:6313: checking for extra include directories" >&5 +echo "configure:6751: 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 @@ -6333,7 +6771,7 @@ echo "$ac_t""$cf_cv_curses_incdir" 1>&6 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:6337: checking if we have identified curses headers" >&5 +echo "configure:6775: 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 @@ -6346,14 +6784,14 @@ for cf_header in \ ncurses/ncurses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -6376,17 +6814,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:6380: checking for $ac_hdr" >&5 +echo "configure:6818: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6828: \"$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* @@ -6417,16 +6855,16 @@ done echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:6421: checking if we have identified curses libraries" >&5 +echo "configure:6859: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6442,7 +6880,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:6446: checking for tgoto in -lmytinfo" >&5 +echo "configure:6884: 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 @@ -6450,7 +6888,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6903: \"$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 @@ -6484,7 +6922,7 @@ fi ;; hpux10.*|hpux11.*) #(vi echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:6488: checking for initscr in -lcur_colr" >&5 +echo "configure:6926: 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 @@ -6492,7 +6930,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6945: \"$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 @@ -6526,7 +6964,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:6530: checking for initscr in -lHcurses" >&5 +echo "configure:6968: 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 @@ -6534,7 +6972,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6987: \"$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 @@ -6598,12 +7036,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:6602: checking for tgoto" >&5 +echo "configure:7040: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7068: \"$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 @@ -6647,7 +7085,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:6651: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:7089: 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 @@ -6655,7 +7093,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7108: \"$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 @@ -6696,7 +7134,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:6700: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:7138: 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 @@ -6704,7 +7142,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7157: \"$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 @@ -6741,16 +7179,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:6745: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:7183: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6766,16 +7204,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:6770: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:7208: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:6779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -6785,14 +7223,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6813,7 +7251,7 @@ fi echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6817: checking for ncurses version" >&5 +echo "configure:7255: 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 @@ -6839,7 +7277,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6843: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7281: \"$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" @@ -6848,7 +7286,7 @@ EOF else cat > conftest.$ac_ext < @@ -6872,7 +7310,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7314: \"$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` @@ -6895,23 +7333,25 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:6899: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:7337: 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 < #include <${cf_cv_ncurses_header-curses.h}> int main() { - long x = winnstr(stdscr, "", 0) + long x = winnstr(stdscr, "", 0); + int x1, y1; + getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:6915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7355: \"$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 @@ -6919,7 +7359,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { - long x = winnstr(stdscr, "", 0) + long x = winnstr(stdscr, "", 0); + int x1, y1; + getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:6934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7376: \"$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 @@ -6953,7 +7395,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:6957: checking if you want to use installed version of pcre" >&5 +echo "configure:7399: 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 @@ -7023,35 +7465,77 @@ if test "$PCRE_HOME" = "no" ; then fi ## debugging libraries (do this after other libraries) -echo $ac_n "checking if you want dbmalloc library""... $ac_c" 1>&6 -echo "configure:7028: checking if you want dbmalloc library" >&5 debug_malloc=none +echo $ac_n "checking if you want to link with dbmalloc for testing""... $ac_c" 1>&6 +echo "configure:7472: checking if you want to link with dbmalloc for testing" >&5 + # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then withval="$with_dbmalloc" + with_dbmalloc=$withval +else + with_dbmalloc=no +fi + +echo "$ac_t""$with_dbmalloc" 1>&6 +if test $with_dbmalloc = yes ; then + ac_safe=`echo "dbmalloc.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for dbmalloc.h""... $ac_c" 1>&6 +echo "configure:7486: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:7496: \"$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 - echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6 -echo "configure:7036: checking for debug_malloc in -ldbmalloc" >&5 -ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'` + echo $ac_n "checking for debug_malloc + in -ldbmalloc""... $ac_c" 1>&6 +echo "configure:7514: checking for debug_malloc + in -ldbmalloc" >&5 + , not + s +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 else ac_save_LIBS="$LIBS" LIBS="-ldbmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7539: \"$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 @@ -7066,19 +7550,44 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 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:7072: checking for dbmalloc.h" >&5 + debug_malloc=DBMALLOC +else + echo "$ac_t""no" 1>&6 +fi + +else + echo "$ac_t""no" 1>&6 +fi + +fi + + +echo $ac_n "checking if you want to link with dmalloc for testing""... $ac_c" 1>&6 +echo "configure:7567: checking if you want to link with dmalloc for testing" >&5 + +# Check whether --with-dmalloc or --without-dmalloc was given. +if test "${with_dmalloc+set}" = set; then + withval="$with_dmalloc" + with_dmalloc=$withval +else + with_dmalloc=no +fi + +echo "$ac_t""$with_dmalloc" 1>&6 +if test $with_dmalloc = yes ; then + ac_safe=`echo "dmalloc.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for dmalloc.h""... $ac_c" 1>&6 +echo "configure:7581: 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 < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7591: \"$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* @@ -7094,48 +7603,34 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - debug_malloc=DBMALLOC -else - echo "$ac_t""no" 1>&6 -fi - -else - echo "$ac_t""no" 1>&6 -fi - -else - echo "$ac_t""no" 1>&6 -fi - - -echo $ac_n "checking if you want dmalloc library""... $ac_c" 1>&6 -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:7120: checking for dmalloc_debug in -ldmalloc" >&5 -ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dmalloc_debug + in -ldmalloc""... $ac_c" 1>&6 +echo "configure:7609: checking for dmalloc_debug + in -ldmalloc" >&5 + , not + s +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 else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7634: \"$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 @@ -7150,34 +7645,6 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 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: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 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (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* - 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 debug_malloc=DMALLOC else echo "$ac_t""no" 1>&6 @@ -7187,13 +7654,11 @@ else echo "$ac_t""no" 1>&6 fi -else - echo "$ac_t""no" 1>&6 fi echo $ac_n "checking if you want debugging-trace""... $ac_c" 1>&6 -echo "configure:7197: checking if you want debugging-trace" >&5 +echo "configure:7662: checking if you want debugging-trace" >&5 # Check whether --with-trace or --without-trace was given. if test "${with_trace+set}" = set; then @@ -7211,12 +7676,12 @@ EOF EXTRAOBJS="$EXTRAOBJS trace.o" echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:7215: checking for _tracef" >&5 +echo "configure:7680: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7708: \"$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 @@ -7261,7 +7726,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:7265: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo "configure:7730: 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 @@ -7269,7 +7734,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${cf_with_screen}_g $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7749: \"$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 @@ -7312,7 +7777,7 @@ fi ## options for miscellaneous definitions echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:7316: checking for domain-name" >&5 +echo "configure:7781: checking for domain-name" >&5 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then @@ -7341,7 +7806,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:7345: checking for NNTP default-server" >&5 +echo "configure:7810: 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 @@ -7407,7 +7872,7 @@ EOF ## optional features echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6 -echo "configure:7411: checking whether to use MH style mail handling for mailgroups" >&5 +echo "configure:7876: 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 @@ -7426,7 +7891,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:7430: checking whether to enable 8-bit keycodes" >&5 +echo "configure:7895: 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 @@ -7452,7 +7917,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:7456: checking whether to enable ANSI-color" >&5 +echo "configure:7921: checking whether to enable ANSI-color" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then @@ -7469,7 +7934,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:7473: checking whether to enable posting-etiquette" >&5 +echo "configure:7938: checking whether to enable posting-etiquette" >&5 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then @@ -7488,7 +7953,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:7492: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "configure:7957: 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 @@ -7507,7 +7972,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:7511: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "configure:7976: 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 @@ -7533,7 +7998,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:7537: checking for MIME character-set" >&5 +echo "configure:8002: 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 @@ -7555,7 +8020,7 @@ EOF echo "$ac_t""$MM_CHARSET" 1>&6 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:7559: checking for default ISO/ASCII table" >&5 +echo "configure:8024: 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 @@ -7577,7 +8042,7 @@ EOF echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:7581: checking whether to enable locale support" >&5 +echo "configure:8046: checking whether to enable locale support" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then @@ -7596,7 +8061,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:7600: checking whether to enable posting" >&5 +echo "configure:8065: checking whether to enable posting" >&5 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then @@ -7615,7 +8080,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:7619: checking whether to enable shell escape" >&5 +echo "configure:8084: 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 @@ -7634,7 +8099,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:7638: checking whether to have fascist newsadmin" >&5 +echo "configure:8103: 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 @@ -7653,7 +8118,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:7657: checking whether to enable inverse video and highlighting" >&5 +echo "configure:8122: 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 @@ -7672,7 +8137,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:7676: checking whether to enable piping support" >&5 +echo "configure:8141: checking whether to enable piping support" >&5 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then @@ -7691,7 +8156,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:7695: checking whether to enable printer support" >&5 +echo "configure:8160: checking whether to enable printer support" >&5 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then @@ -7710,7 +8175,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:7714: checking whether to unique tmp-files by appending .pid" >&5 +echo "configure:8179: 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 @@ -7736,7 +8201,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:7740: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "configure:8205: 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 @@ -7763,7 +8228,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:7767: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "configure:8232: 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 @@ -7783,7 +8248,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:7787: checking for directory containing tin.defaults file" >&5 +echo "configure:8252: 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 @@ -7826,7 +8291,7 @@ EOF ### check for ipv6 support echo $ac_n "checking whether to enable IPv6""... $ac_c" 1>&6 -echo "configure:7830: checking whether to enable IPv6" >&5 +echo "configure:8295: checking whether to enable IPv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -7847,7 +8312,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:7851: checking ipv6 stack type" >&5 +echo "configure:8316: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7867,7 +8332,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext < @@ -7885,7 +8350,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext < @@ -7903,7 +8368,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext < @@ -7930,7 +8395,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext < @@ -7948,7 +8413,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext < @@ -7966,7 +8431,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext < @@ -7999,7 +8464,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:8003: checking for IPv6 library if required" >&5 +echo "configure:8468: checking for IPv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -8033,7 +8498,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext < @@ -8044,7 +8509,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -8141,12 +8606,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:8145: checking for getaddrinfo" >&5 +echo "configure:8610: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8638: \"$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 @@ -8189,10 +8654,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:8193: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:8658: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext < @@ -8203,7 +8668,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8672: \"$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' @@ -8272,10 +8737,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:8276: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:8741: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext < @@ -8286,7 +8751,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8755: \"$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' @@ -8319,7 +8784,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:8323: checking working getaddrinfo" >&5 +echo "configure:8788: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8328,7 +8793,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext < @@ -8407,7 +8872,7 @@ int main() } EOF -if { (eval echo configure:8411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8876: \"$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 @@ -8451,12 +8916,12 @@ fi for ac_func in getaddrinfo getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8455: checking for $ac_func" >&5 +echo "configure:8920: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8948: \"$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 @@ -8508,7 +8973,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:8512: checking whether to make a coffee while compiling" >&5 +echo "configure:8977: 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 @@ -8533,7 +8998,7 @@ fi ### checks for compiler characteristics echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:8537: checking for makeflags variable" >&5 +echo "configure:9002: checking for makeflags variable" >&5 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8578,12 +9043,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:8582: checking for working const" >&5 +echo "configure:9047: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -8653,21 +9118,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8657: checking for inline" >&5 +echo "configure:9122: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -8694,13 +9159,13 @@ esac echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6 -echo "configure:8698: checking for ansi token expansion/substitution" >&5 +echo "configure:9163: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_expands=yes else @@ -8729,13 +9194,13 @@ EOF echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:8733: checking for ansi token concatenation" >&5 +echo "configure:9198: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_concats=yes else @@ -8764,20 +9229,20 @@ EOF echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:8768: checking if nested parameters work" >&5 +echo "configure:9233: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_nested_params=yes else @@ -8803,19 +9268,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:8807: checking for working alloca.h" >&5 +echo "configure:9272: 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 < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:8819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9284: \"$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 @@ -8836,12 +9301,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:8840: checking for alloca" >&5 +echo "configure:9305: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9338: \"$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 @@ -8901,12 +9366,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:8905: checking whether alloca needs Cray hooks" >&5 +echo "configure:9370: 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 <&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:8935: checking for $ac_func" >&5 +echo "configure:9400: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9428: \"$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 @@ -8986,7 +9451,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:8990: checking stack direction for C alloca" >&5 +echo "configure:9455: 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 @@ -8994,7 +9459,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9482: \"$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 @@ -9043,12 +9508,12 @@ esac ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:9047: checking for ANSI C header files" >&5 +echo "configure:9512: 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 < #include @@ -9056,7 +9521,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9525: \"$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* @@ -9073,7 +9538,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 @@ -9091,7 +9556,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 @@ -9112,7 +9577,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -9123,7 +9588,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:9127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9151,12 +9616,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:9155: checking for $ac_hdr that defines DIR" >&5 +echo "configure:9620: 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 < #include <$ac_hdr> @@ -9164,7 +9629,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:9168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -9189,7 +9654,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:9193: checking for opendir in -ldir" >&5 +echo "configure:9658: 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 @@ -9197,7 +9662,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9677: \"$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 @@ -9230,7 +9695,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:9234: checking for opendir in -lx" >&5 +echo "configure:9699: 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 @@ -9238,7 +9703,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9718: \"$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 @@ -9272,12 +9737,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:9276: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:9741: 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 < #include @@ -9286,7 +9751,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:9290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -9307,12 +9772,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:9311: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:9776: 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 < #include @@ -9328,7 +9793,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:9332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -9407,9 +9872,9 @@ for cf_hdr in \ do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:9411: checking for $cf_hdr" >&5 +echo "configure:9876: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -9417,7 +9882,7 @@ echo "configure:9411: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9886: \"$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* @@ -9453,17 +9918,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:9457: checking for $ac_hdr" >&5 +echo "configure:9922: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9932: \"$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* @@ -9494,17 +9959,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:9498: checking for $ac_hdr" >&5 +echo "configure:9963: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9973: \"$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* @@ -9539,16 +10004,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:9543: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:10008: checking whether termios.h needs _POSIX_SOURCE" >&5 cat > conftest.$ac_ext < int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:9552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -9557,7 +10022,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -9589,7 +10054,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:9593: checking declaration of size-change" >&5 +echo "configure:10058: 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 @@ -9603,7 +10068,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext < #ifdef HAVE_TERMIOS_H @@ -9642,7 +10107,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -9681,7 +10146,7 @@ fi echo $ac_n "checking if sys/time.h conflicts with sys/select.h""... $ac_c" 1>&6 -echo "configure:9685: checking if sys/time.h conflicts with sys/select.h" >&5 +echo "configure:10150: 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 @@ -9689,7 +10154,7 @@ else for cf_opts in no yes do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_select_timeval=$cf_opts break @@ -9741,12 +10206,12 @@ EOF ### Checks for Datatypes. echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:9745: checking for gid_t" >&5 +echo "configure:10210: 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 < #if STDC_HEADERS @@ -9774,12 +10239,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:9778: checking for mode_t" >&5 +echo "configure:10243: 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 < #if STDC_HEADERS @@ -9807,12 +10272,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:9811: checking for off_t" >&5 +echo "configure:10276: 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 < #if STDC_HEADERS @@ -9840,12 +10305,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:9844: checking for pid_t" >&5 +echo "configure:10309: 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 < #if STDC_HEADERS @@ -9873,12 +10338,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:9877: checking for size_t" >&5 +echo "configure:10342: 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 < #if STDC_HEADERS @@ -9906,12 +10371,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:9910: checking for ssize_t" >&5 +echo "configure:10375: 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 < #if STDC_HEADERS @@ -9939,12 +10404,12 @@ EOF fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:9943: checking for time_t" >&5 +echo "configure:10408: 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 < #if STDC_HEADERS @@ -9972,12 +10437,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:9976: checking for uid_t in sys/types.h" >&5 +echo "configure:10441: 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 @@ -10007,9 +10472,9 @@ fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:10011: checking for quad_t" >&5 +echo "configure:10476: checking for quad_t" >&5 cat > conftest.$ac_ext < @@ -10022,7 +10487,7 @@ int main() { quad_t x; x = 0 ; return 0; } EOF -if { (eval echo configure:10026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_quad_t=yes else @@ -10041,9 +10506,9 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:10045: checking for long long" >&5 +echo "configure:10510: checking for long long" >&5 cat > conftest.$ac_ext < @@ -10052,7 +10517,7 @@ int main() { long long x; x = 0 ; return 0; } EOF -if { (eval echo configure:10056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_long_long=yes else @@ -10071,9 +10536,9 @@ EOF fi echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:10075: checking for nl_item" >&5 +echo "configure:10540: checking for nl_item" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_nl_item=yes else @@ -10110,7 +10575,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:10114: checking for UUInitialize in -luu" >&5 +echo "configure:10579: 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 @@ -10118,7 +10583,7 @@ else ac_save_LIBS="$LIBS" LIBS="-luu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10598: \"$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 @@ -10146,17 +10611,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:10150: checking for uudeview.h" >&5 +echo "configure:10615: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10625: \"$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* @@ -10194,7 +10659,7 @@ fi # libidn - Internationalized Domain Names echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:10198: checking for stringprep_check_version in -lidn" >&5 +echo "configure:10663: checking for stringprep_check_version in -lidn" >&5 ac_lib_var=`echo idn'_'stringprep_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10202,7 +10667,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10682: \"$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 @@ -10230,17 +10695,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "stringprep.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stringprep.h""... $ac_c" 1>&6 -echo "configure:10234: checking for stringprep.h" >&5 +echo "configure:10699: checking for stringprep.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10709: \"$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* @@ -10263,17 +10728,17 @@ EOF ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:10267: checking for idna.h" >&5 +echo "configure:10732: checking for idna.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10742: \"$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* @@ -10295,7 +10760,7 @@ if eval "test \"`echo '$ac_cv_header_'$a EOF echo $ac_n "checking for idna_to_unicode_lzlz in -lidn""... $ac_c" 1>&6 -echo "configure:10299: checking for idna_to_unicode_lzlz in -lidn" >&5 +echo "configure:10764: checking for idna_to_unicode_lzlz in -lidn" >&5 ac_lib_var=`echo idn'_'idna_to_unicode_lzlz | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10303,7 +10768,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10783: \"$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 @@ -10335,9 +10800,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l EOF echo $ac_n "checking for IDNA_USE_STD3_ASCII_RULES""... $ac_c" 1>&6 -echo "configure:10339: checking for IDNA_USE_STD3_ASCII_RULES" >&5 +echo "configure:10804: checking for IDNA_USE_STD3_ASCII_RULES" >&5 cat > conftest.$ac_ext < EOF @@ -10386,17 +10851,17 @@ fi # ICU - International Components for Unicode ac_safe=`echo "unicode/unorm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/unorm.h""... $ac_c" 1>&6 -echo "configure:10390: checking for unicode/unorm.h" >&5 +echo "configure:10855: checking for unicode/unorm.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10865: \"$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* @@ -10415,17 +10880,17 @@ if eval "test \"`echo '$ac_cv_header_'$a ac_safe=`echo "unicode/ustring.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ustring.h""... $ac_c" 1>&6 -echo "configure:10419: checking for unicode/ustring.h" >&5 +echo "configure:10884: checking for unicode/ustring.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10894: \"$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* @@ -10451,12 +10916,12 @@ EOF EOF echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:10455: checking for unorm_normalize in libicuuc" >&5 +echo "configure:10920: checking for unorm_normalize in libicuuc" >&5 cf_save_LIBS="$LIBS" cf_try_icuuc="no" LIBS="$LIBS -licuuc" cat > conftest.$ac_ext < int main() { @@ -10466,7 +10931,7 @@ int main() { needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); ; return 0; } EOF -if { (eval echo configure:10470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -10504,24 +10969,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -10550,16 +11015,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:10554: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:11019: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -10586,7 +11051,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:10590: checking for initscr in -lcurses" >&5 +echo "configure:11055: 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 @@ -10594,7 +11059,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11074: \"$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 @@ -10626,7 +11091,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10630: checking for tgoto in -ltermcap" >&5 +echo "configure:11095: 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 @@ -10634,7 +11099,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11114: \"$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 @@ -10678,11 +11143,11 @@ fi # terminfo-based termcap interfaces may be prototyped in , # which may/may not be compatible with echo $ac_n "checking if we should include termcap.h""... $ac_c" 1>&6 -echo "configure:10682: checking if we should include termcap.h" >&5 +echo "configure:11147: checking if we should include termcap.h" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$srcdir/include" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -10713,17 +11178,20 @@ EOF echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:10717: checking for term.h" >&5 +echo "configure:11182: 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 + +# If we found , look for , but always look +# for if we do not find the variant. for cf_header in \ - ncurses/term.h \ + `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ term.h do cat > conftest.$ac_ext < @@ -10732,9 +11200,10 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:10736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -10761,12 +11230,18 @@ ncurses/term.h) EOF ;; +ncursesw/term.h) + cat >> confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF + + ;; esac echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:10770: checking if we should include curses.h or termcap.h" >&5 +echo "configure:11245: 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 @@ -10784,7 +11259,7 @@ do test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11271: \"$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 @@ -10805,7 +11280,7 @@ else rm -rf conftest* echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11292: \"$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 @@ -10889,7 +11364,7 @@ esac echo $ac_n "checking declaration of tputs 3rd param""... $ac_c" 1>&6 -echo "configure:10893: checking declaration of tputs 3rd param" >&5 +echo "configure:11368: 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 @@ -10905,10 +11380,10 @@ for Q in int void; do for R in int char; do for S in "" const; do -echo "(line 10909) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "(line 11384) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -10972,14 +11447,14 @@ EOF elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11458: \"$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 @@ -10998,13 +11473,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:11002: checking if external errno is declared" >&5 +echo "configure:11477: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -11045,13 +11520,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:11049: checking if external errno exists" >&5 +echo "configure:11524: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_errno=yes else @@ -11093,12 +11568,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11097: checking for $ac_func" >&5 +echo "configure:11572: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11600: \"$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 @@ -11148,13 +11623,13 @@ else echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:11152: checking if external sys_nerr is declared" >&5 +echo "configure:11627: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -11195,13 +11670,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:11199: checking if external sys_nerr exists" >&5 +echo "configure:11674: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11690: \"$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 @@ -11240,13 +11715,13 @@ fi echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:11244: checking if external sys_errlist is declared" >&5 +echo "configure:11719: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -11287,13 +11762,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:11291: checking if external sys_errlist exists" >&5 +echo "configure:11766: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11782: \"$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 @@ -11391,17 +11866,18 @@ for ac_func in \ unlink \ use_default_colors \ usleep \ + vasprintf \ vsnprintf \ waitpid \ $cf_tc_funcs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11400: checking for $ac_func" >&5 +echo "configure:11876: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11904: \"$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 @@ -11450,12 +11926,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:11454: checking for flock" >&5 +echo "configure:11930: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11958: \"$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 @@ -11500,7 +11976,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:11504: checking for flock in -lbsd" >&5 +echo "configure:11980: 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 @@ -11508,7 +11984,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11999: \"$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 @@ -11548,12 +12024,12 @@ fi echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:11552: checking for wide char and multibyte support" >&5 +echo "configure:12028: 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 < #ifdef HAVE_STDLIB_H @@ -11589,7 +12065,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:11593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -11599,7 +12075,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -11625,44 +12101,79 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:11629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12105: \"$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 -#define HAVE_LIBUTF8_H 1 -EOF - + am_cv_multibyte_able=libutf8 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* am_cv_multibyte_able=no - LIBS="$cf_save_LIBS" fi rm -f conftest* + LIBS="$cf_save_LIBS" fi rm -f conftest* - if test $am_cv_multibyte_able = yes; then + +fi + +echo "$ac_t""$am_cv_multibyte_able" 1>&6 + if test "$am_cv_multibyte_able" != no; then + if test "$am_cv_multibyte_able" = libutf8; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBUTF8_H 1 +EOF + + LIBS="-lutf8 $LIBS" + fi cat >> confdefs.h <<\EOF #define MULTIBYTE_ABLE 1 EOF fi - -fi -echo "$ac_t""$am_cv_multibyte_able" 1>&6 +echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 +echo "configure:12139: checking if gettimeofday takes two arguments" >&5 +cat > conftest.$ac_ext < +#endif +int main() { +struct timeval *tv; +struct timezone *tz; +gettimeofday(tv, tz); +; return 0; } +EOF +if { (eval echo configure:12153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_func_gettimeofday_2args=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_gettimeofday_2args=no +fi +rm -f conftest* +echo "$ac_t""$ac_cv_func_gettimeofday_2args" 1>&6 +if test $ac_cv_func_gettimeofday_2args = yes; then + cat >> confdefs.h <<\EOF +#define GETTIMEOFDAY_2ARGS 1 +EOF +fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:11661: checking return type of signal handlers" >&5 +echo "configure:12172: 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 < #include @@ -11679,7 +12190,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:11683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -11699,7 +12210,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:11703: checking declaration of signal arguments" >&5 +echo "configure:12214: 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 @@ -11708,7 +12219,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -11716,7 +12227,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:11720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -11742,13 +12253,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:11746: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:12257: 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 < @@ -11757,7 +12268,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:11761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -11778,13 +12289,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:11782: checking if we have sigaction/related functions" >&5 +echo "configure:12293: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_sigaction_funcs=yes else @@ -11824,7 +12335,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:11828: checking for fork" >&5 +echo "configure:12339: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11833,7 +12344,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_fork=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12358: \"$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 @@ -11865,12 +12376,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:11869: checking for memmove" >&5 +echo "configure:12380: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12408: \"$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 @@ -11912,12 +12423,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:11916: checking for bcopy" >&5 +echo "configure:12427: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12455: \"$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 @@ -11956,7 +12467,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:11960: checking if bcopy does overlapping moves" >&5 +echo "configure:12471: 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 @@ -11965,7 +12476,7 @@ else cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12493: \"$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 @@ -12016,9 +12527,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:12020: checking if select expects int * arguments" >&5 +echo "configure:12531: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -12038,7 +12549,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:12042: checking whether closedir returns void" >&5 +echo "configure:12553: 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 @@ -12046,13 +12557,13 @@ else ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:12056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12567: \"$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 @@ -12074,9 +12585,11 @@ EOF fi -## AC_FUNC_SETPGRP -echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:12080: checking whether setvbuf arguments are reversed" >&5 + +# autoconf 2.5x assumes setvbuf is not reversed when cross-compiling +if test "$cross_compiling" != yes ; then + echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 +echo "configure:12593: 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 @@ -12084,7 +12597,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -12098,7 +12611,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:12102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12615: \"$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 @@ -12121,6 +12634,7 @@ EOF fi +fi ### Checks for network library functions. for ac_func in \ @@ -12135,12 +12649,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12139: checking for $ac_func" >&5 +echo "configure:12653: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12681: \"$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 @@ -12190,13 +12704,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:12194: checking for type sigaction_t" >&5 +echo "configure:12708: 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 < @@ -12204,7 +12718,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:12208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -12224,13 +12738,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:12228: checking for nonconflicting termios.h" >&5 +echo "configure:12742: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12770: \"$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 @@ -12283,13 +12797,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:12287: checking for passwd.pw_gecos" >&5 +echo "configure:12801: 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 < @@ -12300,7 +12814,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:12304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -12320,13 +12834,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:12324: checking for tm.tm_gmtoff" >&5 +echo "configure:12838: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -12366,7 +12880,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:12370: checking for long file names" >&5 +echo "configure:12884: 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 @@ -12414,17 +12928,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:12418: checking for $ac_hdr" >&5 +echo "configure:12932: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12942: \"$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* @@ -12461,17 +12975,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:12465: checking for $ac_hdr" >&5 +echo "configure:12979: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12989: \"$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* @@ -12501,17 +13015,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:12505: checking for $ac_hdr" >&5 +echo "configure:13019: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13029: \"$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* @@ -12552,13 +13066,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:12556: checking for union wait" >&5 +echo "configure:13070: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13087: \"$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 @@ -12580,7 +13094,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13113: \"$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 @@ -12620,7 +13134,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:12624: checking if the system function returns usable child-status" >&5 +echo "configure:13138: 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 @@ -12629,7 +13143,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -12662,7 +13176,7 @@ int main() } EOF -if { (eval echo configure:12666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13180: \"$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 @@ -12673,11 +13187,11 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13195: \"$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 @@ -12720,13 +13234,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:12724: checking for obsolete/broken version of ncurses" >&5 +echo "configure:13238: 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 < @@ -12740,7 +13254,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -12765,13 +13279,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:12769: checking if curses supports color attributes" >&5 +echo "configure:13283: 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 < @@ -12786,7 +13300,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:12790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -12837,7 +13351,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:12841: checking for redefinable signal constants" >&5 +echo "configure:13355: 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 @@ -12849,7 +13363,7 @@ if test -n "$cf_cv_sig_args"; then cf_cv_sig_const=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13394: \"$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 @@ -12902,13 +13416,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:12906: checking for ANSI qsort" >&5 +echo "configure:13420: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -12948,7 +13462,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:12952: checking if application can dump core" >&5 +echo "configure:13466: 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 @@ -12957,7 +13471,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -12998,7 +13512,7 @@ int main() #endif } EOF -if { (eval echo configure:13002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13516: \"$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 @@ -13044,18 +13558,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:13048: checking for missing "${ac_func}" extern" >&5 +echo "configure:13562: 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 13054) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13568) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13587: \"$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 @@ -13077,7 +13591,7 @@ if { (eval echo configure:13073: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13136,18 +13650,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:13140: checking for missing "${ac_func}" extern" >&5 +echo "configure:13654: 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 13146) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13660) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13679: \"$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 @@ -13169,7 +13683,7 @@ if { (eval echo configure:13165: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13226,18 +13740,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:13230: checking for missing "${ac_func}" extern" >&5 +echo "configure:13744: 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 13236) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13750) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13769: \"$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 @@ -13259,7 +13773,7 @@ if { (eval echo configure:13255: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13367,18 +13881,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:13371: checking for missing "${ac_func}" extern" >&5 +echo "configure:13885: 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 13377) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13891) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13910: \"$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 @@ -13400,7 +13914,7 @@ if { (eval echo configure:13396: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13454,18 +13968,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:13458: checking for missing "${ac_func}" extern" >&5 +echo "configure:13972: 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 13464) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13978) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13997: \"$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 @@ -13487,7 +14001,7 @@ if { (eval echo configure:13483: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13544,18 +14058,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:13548: checking for missing "${ac_func}" extern" >&5 +echo "configure:14062: 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 13554) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14068) testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14087: \"$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 @@ -13577,7 +14091,7 @@ if { (eval echo configure:13573: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13625,7 +14139,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:13629: checking for working TIOCGWINSZ" >&5 +echo "configure:14143: 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 @@ -13636,7 +14150,7 @@ else cf_cv_use_tiocgwinsz=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14179: \"$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 @@ -13705,21 +14219,51 @@ esac ### Use gettext ### this also calls AM_LANGINFO_CODESET and AM_ICONV ### so we don't need to do the tests ourselves. +# 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:14226: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + 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:13713: checking for $ac_hdr" >&5 +echo "configure:14257: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14267: \"$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* @@ -13748,12 +14292,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13752: checking for $ac_func" >&5 +echo "configure:14296: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14324: \"$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 @@ -13801,7 +14345,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13805: checking for working mmap" >&5 +echo "configure:14349: 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 @@ -13809,7 +14353,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14497: \"$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 @@ -13973,12 +14517,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:13977: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:14521: 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 < @@ -14021,23 +14565,36 @@ 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/*//'` +# Allow override of "config.h" definition: +: ${CONFIG_H=config.h} + + +if test -z "$VERSION" ; then +if test -f $srcdir/VERSION ; then + VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1` +else + VERSION=unknown +fi +fi + + 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:14031: checking for $ac_hdr" >&5 +echo "configure:14588: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14598: \"$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* @@ -14068,12 +14625,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:14072: checking for $ac_func" >&5 +echo "configure:14629: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14657: \"$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 @@ -14137,7 +14694,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:14141: checking for iconv" >&5 +echo "configure:14698: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14145,7 +14702,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -14155,7 +14712,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:14159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -14167,7 +14724,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -14177,7 +14734,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:14181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14738: \"$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 @@ -14198,13 +14755,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:14202: checking for iconv declaration" >&5 +echo "configure:14759: 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 < @@ -14223,7 +14780,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -14252,19 +14809,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:14256: checking for nl_langinfo and CODESET" >&5 +echo "configure:14813: 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 < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:14268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -14287,19 +14844,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:14291: checking for LC_MESSAGES" >&5 +echo "configure:14848: 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 < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:14303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14860: \"$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 @@ -14320,7 +14877,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:14324: checking whether NLS is requested" >&5 +echo "configure:14881: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -14344,7 +14901,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:14348: checking whether included gettext is requested" >&5 +echo "configure:14905: 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 @@ -14365,17 +14922,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:14369: checking for libintl.h" >&5 +echo "configure:14926: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14936: \"$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* @@ -14392,12 +14949,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:14396: checking for GNU gettext in libc" >&5 +echo "configure:14953: 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 < extern int _nl_msg_cat_cntr; @@ -14406,7 +14963,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:14410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14967: \"$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 @@ -14422,14 +14979,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:14426: checking for GNU gettext in libintl" >&5 +echo "configure:14983: 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 < extern int _nl_msg_cat_cntr; @@ -14438,7 +14995,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:14442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14999: \"$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 @@ -14471,12 +15028,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14475: checking for $ac_func" >&5 +echo "configure:15032: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15060: \"$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 @@ -14529,7 +15086,7 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14533: checking for $ac_word" >&5 +echo "configure:15090: 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 @@ -14563,7 +15120,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:14567: checking for $ac_word" >&5 +echo "configure:15124: 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 @@ -14601,7 +15158,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14605: checking for $ac_word" >&5 +echo "configure:15162: 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 @@ -14652,7 +15209,7 @@ fi set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14656: checking for $ac_word" >&5 +echo "configure:15213: 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 @@ -14686,7 +15243,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:14690: checking for $ac_word" >&5 +echo "configure:15247: 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 @@ -14723,7 +15280,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14727: checking for $ac_word" >&5 +echo "configure:15284: 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 @@ -14795,7 +15352,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:14799: checking for $ac_word" >&5 +echo "configure:15356: 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 @@ -14828,7 +15385,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:14832: checking version of bison" >&5 +echo "configure:15389: 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;; @@ -14875,7 +15432,7 @@ echo "configure:14832: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:14879: checking for catalogs to be installed" >&5 +echo "configure:15436: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -14926,7 +15483,7 @@ 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:14930: checking if we should use included message-library" >&5 +echo "configure:15487: 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 @@ -14943,7 +15500,7 @@ fi MSG_DIR_MAKE="#" if test "$use_our_messages" = yes then - SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:po/$cf_makefile.inn" + SUB_MAKEFILE="$SUB_MAKEFILE $srcdir/po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn" MSG_DIR_MAKE= fi @@ -14953,9 +15510,9 @@ fi 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 @@ -14964,6 +15521,15 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; #define HAVE_LIBGETTEXT_H 1 EOF + for cf_makefile in \ + $srcdir/intl/Makefile.in \ + $srcdir/intl/makefile.in + do + if test -f "$cf_makefile" ; then + SUB_MAKEFILE="$SUB_MAKEFILE `echo ${cf_makefile}|sed -e 's/\.in$//'`:${cf_makefile}" + break + fi + done fi else INTLDIR_MAKE="#" @@ -14972,17 +15538,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14976: checking for $ac_hdr" >&5 +echo "configure:15542: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15552: \"$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* @@ -15055,9 +15621,9 @@ LIBS="$LIBS $LIBICONV" for cf_hdr in iconv.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:15059: checking for $cf_hdr" >&5 +echo "configure:15625: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -15065,7 +15631,7 @@ echo "configure:15059: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15635: \"$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* @@ -15091,13 +15657,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:15095: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:15661: checking for iconv_open() //TRANSLIT extension" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""unknown" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15684: \"$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 @@ -15142,7 +15708,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:15146: checking for X" >&5 +echo "configure:15712: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -15205,12 +15771,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15780: \"$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* @@ -15279,14 +15845,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15856: \"$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. @@ -15386,7 +15952,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:15390: checking for open in -lc_s" >&5 +echo "configure:15956: 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 @@ -15394,7 +15960,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15975: \"$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 @@ -15422,7 +15988,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:15426: checking for gethostname in -lbsd" >&5 +echo "configure:15992: 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 @@ -15430,7 +15996,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16011: \"$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 @@ -15458,7 +16024,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:15462: checking for gethostname in -lnsl_s" >&5 +echo "configure:16028: 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 @@ -15466,7 +16032,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16047: \"$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 @@ -15494,7 +16060,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:15498: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:16064: 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 @@ -15502,7 +16068,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16083: \"$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 @@ -15530,7 +16096,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:15534: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:16100: 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 @@ -15538,7 +16104,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16119: \"$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 @@ -15590,7 +16156,7 @@ fi ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:15594: checking for socket in -lsocket" >&5 +echo "configure:16160: 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 @@ -15598,7 +16164,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16179: \"$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 @@ -15637,7 +16203,7 @@ else fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:15641: checking for gethostname in -lnsl" >&5 +echo "configure:16207: 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 @@ -15645,7 +16211,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16226: \"$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 @@ -15707,17 +16273,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:15711: checking whether -R must be followed by a space" >&5 +echo "configure:16277: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -15733,14 +16299,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -15772,7 +16338,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:15776: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:16342: 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 @@ -15780,7 +16346,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16361: \"$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 @@ -15813,7 +16379,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:15817: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:16383: 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 @@ -15821,7 +16387,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16402: \"$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 @@ -15861,12 +16427,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:15865: checking for gethostbyname" >&5 +echo "configure:16431: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16459: \"$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 @@ -15910,7 +16476,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:15914: checking for gethostbyname in -lnsl" >&5 +echo "configure:16480: 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 @@ -15918,7 +16484,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16499: \"$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 @@ -15959,12 +16525,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:15963: checking for connect" >&5 +echo "configure:16529: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16557: \"$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 @@ -16008,7 +16574,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:16012: checking for connect in -lsocket" >&5 +echo "configure:16578: 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 @@ -16016,7 +16582,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16597: \"$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 @@ -16051,12 +16617,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:16055: checking for remove" >&5 +echo "configure:16621: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16649: \"$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 @@ -16100,7 +16666,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:16104: checking for remove in -lposix" >&5 +echo "configure:16670: 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 @@ -16108,7 +16674,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16689: \"$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 @@ -16143,12 +16709,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:16147: checking for shmat" >&5 +echo "configure:16713: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16741: \"$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 @@ -16192,7 +16758,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:16196: checking for shmat in -lipc" >&5 +echo "configure:16762: 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 @@ -16200,7 +16766,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16781: \"$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 @@ -16244,7 +16810,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:16248: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:16814: 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 @@ -16252,7 +16818,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16833: \"$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 @@ -16329,14 +16895,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:16340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -16354,7 +16920,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:16358: checking for XOpenDisplay in -lX11" >&5 +echo "configure:16924: 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 @@ -16362,7 +16928,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16943: \"$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 @@ -16394,7 +16960,7 @@ else fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:16398: checking for XtAppInitialize in -lXt" >&5 +echo "configure:16964: 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 @@ -16402,7 +16968,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16983: \"$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 @@ -16481,14 +17047,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:16492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -16541,7 +17107,7 @@ fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:16545: checking for XextCreateExtension in -lXext" >&5 +echo "configure:17111: 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 @@ -16549,7 +17115,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17130: \"$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 @@ -16599,13 +17165,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:16603: checking for $cf_test in $cf_path" >&5 +echo "configure:17169: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:16606: checking for $cf_test" >&5 +echo "configure:17172: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -16614,7 +17180,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -16661,23 +17227,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:16665: checking for $cf_lib in $cf_path" >&5 +echo "configure:17231: 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:16669: checking for $cf_test in $cf_lib" >&5 +echo "configure:17235: checking for $cf_test in $cf_lib" >&5 fi cf_SAVE="$LIBS" LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -16756,14 +17322,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:16767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -16781,7 +17347,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:16785: checking for XOpenDisplay in -lX11" >&5 +echo "configure:17351: 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 @@ -16789,7 +17355,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17370: \"$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 @@ -16821,14 +17387,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:16825: checking for XCurses library" >&5 +echo "configure:17391: 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 < @@ -16838,7 +17404,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:16842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else @@ -17085,12 +17651,28 @@ s%@SET_MAKE@%$SET_MAKE%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@RANLIB@%$RANLIB%g s%@YACC@%$YACC%g s%@LINT@%$LINT%g +s%@EXEEXT@%$EXEEXT%g +s%@OBJEXT@%$OBJEXT%g s%@PROG_EXT@%$PROG_EXT%g s%@LIB_PREFIX@%$LIB_PREFIX%g s%@LN_S@%$LN_S%g +s%@BUILD_CC@%$BUILD_CC%g +s%@BUILD_CFLAGS@%$BUILD_CFLAGS%g +s%@BUILD_CPPFLAGS@%$BUILD_CPPFLAGS%g +s%@BUILD_LDFLAGS@%$BUILD_LDFLAGS%g +s%@BUILD_LIBS@%$BUILD_LIBS%g +s%@BUILD_EXEEXT@%$BUILD_EXEEXT%g +s%@build@%$build%g +s%@build_alias@%$build_alias%g +s%@build_cpu@%$build_cpu%g +s%@build_vendor@%$build_vendor%g +s%@build_os@%$build_os%g +s%@RANLIB@%$RANLIB%g +s%@LD@%$LD%g +s%@AR@%$AR%g +s%@AR_OPTS@%$AR_OPTS%g s%@PATH_ISPELL@%$PATH_ISPELL%g s%@PATH_METAMAIL@%$PATH_METAMAIL%g s%@PATH_SUM@%$PATH_SUM%g @@ -17125,6 +17707,7 @@ s%@TIN_DEFAULTS_DIR@%$TIN_DEFAULTS_DIR%g s%@LIBOBJS@%$LIBOBJS%g s%@cf_cv_makeflags@%$cf_cv_makeflags%g s%@ALLOCA@%$ALLOCA%g +s%@CONFIG_H@%$CONFIG_H%g s%@GLIBC21@%$GLIBC21%g s%@LIBICONV@%$LIBICONV%g s%@USE_NLS@%$USE_NLS%g diff -Nurp tin-1.7.3/configure.in tin-1.7.4/configure.in --- tin-1.7.3/configure.in Sat Dec 20 18:49:53 2003 +++ tin-1.7.4/configure.in Wed Feb 25 10:59:01 2004 @@ -1,11 +1,11 @@ dnl Project : tin - a Usenet reader dnl Module : configure.in -dnl Author : Thomas E. Dickey +dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2003-12-08 +dnl Updated : 2004-02-09 dnl Notes : dnl -dnl Copyright (c) 1995-2003 Thomas E. Dickey +dnl Copyright (c) 1995-2004 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=1.7.3 +VERSION=1.7.4 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -84,7 +84,6 @@ AC_PROG_CC AC_PROG_GCC_TRADITIONAL AC_PROG_MAKE_SET AC_PROG_INSTALL -AC_PROG_RANLIB CF_PROG_YACC AC_CHECK_PROGS(LINT, lint alint lclint tdlint splint, []) CF_GNU_SOURCE @@ -94,6 +93,14 @@ CF_PROG_EXT CF_LIB_PREFIX(LIB_PREFIX) AC_PROG_LN_S +CF_BUILD_CC([-I$(INCDIR)],[]) + +dnl These are standard among *NIX systems, but not when cross-compiling +AC_CHECK_TOOL(RANLIB, ranlib, ':') +AC_CHECK_TOOL(LD, ld, ld) +AC_CHECK_TOOL(AR, ar, ar) +CF_SUBST(archiver options,AR_OPTS,rv) + case "$host_cpu:$host_vendor:$host_os" in # check for MacOS X, exclude Darwin on ix86 powerpc:apple:darwin*) # @@ -283,14 +290,14 @@ AC_SUBST(INN_NNTPLIB) ### are used in a lot of places. AC_CACHE_CHECK(if you want socks library,cf_cv_use_libsocks,[ AC_ARG_WITH(socks, - [ --with-socks[=path] link with socks library if available], + [ --with-socks[=path] link with socks library if available], [cf_cv_use_libsocks=$withval], [cf_cv_use_libsocks=no]) ]) AC_CACHE_CHECK(if you want socks5 library,cf_cv_use_libsocks5,[ AC_ARG_WITH(socks5, - [ --with-socks5[=path] link with socks5 library if available], + [ --with-socks5[=path] link with socks5 library if available], [cf_cv_use_libsocks5=$withval], [cf_cv_use_libsocks5=no]) ]) @@ -432,22 +439,9 @@ if test "$PCRE_HOME" = "no" ; then fi ## debugging libraries (do this after other libraries) -AC_MSG_CHECKING(if you want dbmalloc library) debug_malloc=none -AC_ARG_WITH(dbmalloc, - [ --with-dbmalloc use Conor Cahill's dbmalloc library], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB(dbmalloc,debug_malloc, - AC_CHECK_HEADER(dbmalloc.h,debug_malloc=DBMALLOC))], - AC_MSG_RESULT(no)) - -AC_MSG_CHECKING(if you want dmalloc library) -AC_ARG_WITH(dmalloc, - [ --with-dmalloc use Gray Watson's dmalloc library], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB(dmalloc,dmalloc_debug, - AC_CHECK_HEADER(dmalloc.h,debug_malloc=DMALLOC))], - AC_MSG_RESULT(no)) +CF_WITH_DBMALLOC(debug_malloc=DBMALLOC) +CF_WITH_DMALLOC(debug_malloc=DMALLOC) AC_MSG_CHECKING(if you want debugging-trace) AC_ARG_WITH(trace, @@ -954,6 +948,7 @@ AC_CHECK_FUNCS(\ unlink \ use_default_colors \ usleep \ + vasprintf \ vsnprintf \ waitpid \ $cf_tc_funcs ) @@ -966,6 +961,19 @@ AC_CHECK_FUNC(flock, AM_MULTIBYTE_ABLE +AC_MSG_CHECKING(if gettimeofday takes two arguments) +AC_TRY_COMPILE([ +#if HAVE_SYS_TIME_H +#include +#endif], +[struct timeval *tv; +struct timezone *tz; +gettimeofday(tv, tz);], +ac_cv_func_gettimeofday_2args=yes, ac_cv_func_gettimeofday_2args=no) +AC_MSG_RESULT($ac_cv_func_gettimeofday_2args) +if test $ac_cv_func_gettimeofday_2args = yes; then + AC_DEFINE(GETTIMEOFDAY_2ARGS) +fi CF_POSIX_JC CF_FUNC_FORK @@ -978,8 +986,11 @@ AC_EGREP_HEADER([select\(.*, *int *\*,], ) AC_FUNC_CLOSEDIR_VOID -## AC_FUNC_SETPGRP -AC_FUNC_SETVBUF_REVERSED + +# autoconf 2.5x assumes setvbuf is not reversed when cross-compiling +if test "$cross_compiling" != yes ; then + AC_FUNC_SETVBUF_REVERSED +fi ### Checks for network library functions. AC_CHECK_FUNCS(\ diff -Nurp tin-1.7.3/doc/CHANGES tin-1.7.4/doc/CHANGES --- tin-1.7.3/doc/CHANGES Sat Dec 20 17:50:24 2003 +++ tin-1.7.4/doc/CHANGES Wed Feb 25 10:51:32 2004 @@ -1,3 +1,55 @@ +-- 1.7.4 release 20040225 "Benbecula" -- + +U022) Lech Szychowski + BUG. didn't check if message-ids taken from the References:-header are + valid before using them for threading. + FIX. refs.c + +U021) Matt Anton + ADD. added a few missing french translations + FIX. fr.po + +U020) Thomas E. Dickey + ADD. allow cross-compiling + FIX. aclocal.m4, configure[.in], autoconf.hin, proto.h, tcurses.h, tin.h + Makefile.in, config.c, langinfo.c, pcre/Makefile.in + intl/Makefile.in, intl/dcigettext.c, intl/gettextP.h + intl/loadmsgcat.c, intl/localealias.c + + 021) Urs Janssen + BUG. did allow unused .eh and .kp TLDs + BUG. still used some old keynames in keymap.sample + ADD. mention supersede possibility in manpage/online help + FIX. policy.h, lang.c, tin.1, de.po, keymap.sample + +U019) Michael Bienia + BUG. error_message() clobbers global var mesg + BUG. didn't catch KEY_RESIZE in USE_CURSES wide-char mode thus a + windows-resize was taken a keypress + ADD. several checks for valid utf-8 data + ADD. display non-printable characters as octals in raw-mode + ADD, redraw tin_getline()-prompt after window-resizing + ADD. minor code cleanup cleanup + FIX. extern.h, proto.h, tin.h, art.c, color.c, feed.c, filter.c + getline.c, group.c, help.c, lang.c, misc.c, page.c, post.c + prompt.c, rfc2046.c, screen.c, search.c, select.c, signal.c + string.c, tags.c, tcurses.c, thread.c, wildmat.c, xref.c + configure[.in], autoconf.h[in] + +U018) Urs Janssen + ADD. allow standalone -c cmd-line flag. + ADD. config.guess, config.sub update + ADD. increase MAXREFSIZE to 998 + ADD. minor manpage update + ADD. don't read keymapfile when using -o cmd-line flag + ADD. [un]install_helpers includes tinews.pl + ADD. configure test if gettimeofday() takes two arguments + BUG. didn't compile on !CHARSET_CONVERSION systems + REM. some unused vars + FIX. Makefile[.in], configure[.in], autoconf.h[in], extern.h, tin.h + filter.c, group.c, init.c, main.c, nntplib.c, post.c, pgp.c, save.c + tin.1, tin.5, config.guess, config.sub + -- 1.7.3 release 20031220 "Taransay" -- U017) Martin Treusch von Buttlar @@ -12,7 +64,7 @@ U016) Piotr Kucharski U015) Michael Bienia BUG. didn't search first article line and rest of the line after a match - BUG. option and filter menus werent multibyte safe + BUG. option and filter menus weren't multibyte safe BUG. in REGEX-mode a iKeyGroupSelPattern of "*" wasn't transformed into a valid regex ADD. search again wraps around if no more matches are found @@ -114,7 +166,7 @@ U006) Urs Janssen ADD. a few missing german translations ADD. config.guess, config.sub update BUG. fixed a small memleak when using Fcc: - BUG. fixed possible use of unitialized attributes data + BUG. fixed possible use of uninitialized attributes data FIX. Makefile, bugrep.h, extern.h, nntplib.h, proto.h, tin.h, tnntp.h version.h, active.c, config.c, curses.c, hashstr.c, header.c, init.c joinpath.c, lang.c, mail.c, main.c, memory.c, misc.c, newsrc.c @@ -204,7 +256,7 @@ U001) Dirk Nimmich tincfg.tbl, tin.1, tin.5 005) Dirk Nimmich - BUG. make install_sysdefs didn't honor $DESTDIR + BUG. make install_sysdefs didn't honour $DESTDIR BUG. filter on References didn't work on deep threads BUG. upgrading from use_metamail=ON could lead to metamail_prog=--internal @@ -222,8 +274,8 @@ U001) Dirk Nimmich save.c, tin.1, tin.spec, Makefile, src/Makefile.in, umlaut[es].txt 004) Michael Velten - BUG. some info messages about (un)tagging wern't displayed - BUG. strip_blanks wasn't always honored + BUG. some info messages about (un)tagging weren't displayed + BUG. strip_blanks wasn't always honoured BUG. in some cases body-search couldn't be aborted ADD. avoid some useless screen redraws FIX. extern.h, cook.c, feed.c, group.c, lang.c, page.c, tags.c, thread.c diff -Nurp tin-1.7.3/doc/CREDITS tin-1.7.4/doc/CREDITS --- tin-1.7.3/doc/CREDITS Thu Jan 1 01:00:00 1970 +++ tin-1.7.4/doc/CREDITS Sun Feb 15 02:05:15 2004 @@ -0,0 +1,64 @@ +I wish to thank the following people for supplying patches: + +David Abbott, Earle Ake, Russ Allbery, Matt Anton, Orbby S. Arka, Joachim +Astel, Anton Aylward, Mark Ayzenshteyn, Jens Chr. Bachem, George Baltz, +Dieter Baron, Volker Barthelmann, Kirk Bauer, Paul Bauwens, Dieter Becker, +Wolfgang Behrens, Fabrice Bellet, Greg Berigan, Enrik Berkhan, Juergen +Bernau, Dan Berry, Michael Bienia, David Binderman, Andrey Blochintsev, +Chris Blum, Fokke de Boer, Andreas Borchert, Sebastian Bork, Mark Boucher, +Robert Brady, Bill Brolik, Herman ten Brugge, Martin Buck, Jeremy Buhler, +Leila Burrell-Davis, Sean Casey, Peter Castro, Troy Cauble, Andrey A. +Chernov, Albert Chin-A-Young, Park Chong-Dae, Tan Kwee Chuan, Boleslaw +Ciesielski, Robert Claeson, Steven Cogswell, Don Costello, Joshua Crawford, +Bryan Curnutt, Ned Danieley, Lars Dannenberg, Chris Davies, John Davis, +Borislav Deianov, Thomas E. Dickey, Martin Dickopp, Olaf Dietrich, Herbert +Martin Dietze, Theo Van Dinter, Ralf Doeblitz, Bryan Dongray, Michael +Douglass, Nickolay Dudorov, Craig Durland, Bernd Eckenfels, Phil Edge, Kirk +Edson, Nick Efthymiou, Stefan Elf, Nigel Ellis, L. Scott Emmons, Rob Engle, +Olle Eriksson, Brent Ermlick, Bernd Ernesti, Ragnar Hojland Espinosa, Jason +Faultless, Michael Faurot, Werner Fleck, John M. Flinchbaugh, Andy Gabor, +Christian Garbs, Torsten Gesang, Ruediger Geys, Callum Gibson, Mike +Glendinning, Igor Goryachev, Philippe Goujard, Dan Greenspan, Karlo Gross, +Carl Hage, Piers Haken, Paul Halsema, Ed Hanway, Scott Hauck, Christian +Haul, James Hawtin, Per Headland, Arnold Hendriks, Daniel Hermans, Jose +Herrero, Dave Hill, Tom Hite, Torsten Homeyer, Ulli Horlacher, Keith Howell, +Tommy Hsieh, Shih-Kun Huang, Steve Hunt, Jeff Hurwitt, Jeon Hyoung-Jo, +Pieter Immelman, Jarkko Isokungas, Patrick St. Jean, Hal Jespersen, Park +Sang Jin, Robbin Johnson, Jarkko Jormanainen, Yury July, Nelson Kading, +Geoffrey Keating, Karsten Keil, Charles S. Kerr, Fritz Kleeman, Andreas +Kies, Janne Kiviluoto, Tomasz Kloczko, Dwarven Knight, Thomas Koenig, +Karl-Koenig Koenigsson, Martin Kraemer, Gerald Krause, Thomas Kroener, Piotr +Kucharski, Florian Kuehnert, Bernd Kuemmerlen, Kris Kugel, Stephan Kulow, +Manoj Kumar, Dawid Kuroczko, Yuri Kuzmenko, Olivier Lacroix, Geoff Lane, +Alex Lange, Alain Lasserre, Stanislav Latishko, Hannu Laurila, Yen-Ming Lee, +Vincent Lefevre, Alexander Lehmann, Marty Leisner, Thomas Leitner, Hakan +Lennestal, Kevin Lentin, Chua Choon Leong, Chris Lewis, Andreas Ley, +David-Michael Lincke, Otto Lind, Richard Lloyd, Florian Lohoff, Reinhard +Luebke, Clifford Luke, Michael Lupp, David MacKenzie, Hugh Mahon, Giuseppe +De Marco, Scott Marovich, Dmitri A. Martynoff, Kazushi Marukawa, Timur +Maryin, William McBrine, Geoff McCaughan, Owen Medd, Philipp Mergenthaler, +Andreas Metzler, Arkadiusz Miskiewicz, Soren Moller, Bruce Momjian, Sergio +Morales, Michael Morrell, Klaus Mueller, Mike Muise, Udo Munk, John R. +Myers, Daniel Naber, Torsten Neumann, Dirk Nimmich, James Nugen, David E. +O'Brien, Michael O'Reilly, Oleg Ohotnikov, Ronald Orr, Julien Oster, Guido +Ostkamp, Philip Paeps, Jeb Palmer, Neil Parker, Joseph Parmelee, Tom Parry, +Jim Patterson, Sven Paulus, Walter Pelissero, Cameron Perkins, Colin +Perkins, Eric Peterson, Tim Pierce, Bill Poitras, Scott W. Powers, Wolfgang +Prediger, Marc Prud'hommeaux, GianPiero Puccioni, Thomas Quinot, Stefan +Rapp, Martin Reising, Kyle Rhorer, Ted Richards, Steve Robbins, Ollivier +Robert, Branden Robinson, Jim Robinson, Thomas Roessler, Erik van Roode, +Meelis Roos, Stephen Roseman, Roland Rosenfeld, Peter Van Rossem, Clifton +Royston, Juergen Salk, Rich Salz, Gary Sanders, Nickolay Saukh, John Sauter, +Christopher Sawtell, Holger Schif, Volker Schmidt, John Schmitz, Torsten +Schneider, Stefan Scholl, Rainer Scholz, Juergen Schroeder, Larry Schwimmer, +Randy Scott, Bart Sears, Karl-Olav Serrander, Doug Sewell, Philip Shearer, +Jungshik Shin, Sergey Shkonda, Andreas Siegert, Mark Smith, Toomas Soome, +Steve Spearman, Helmut Springer, Cliff Stanford, Steve Starck, Jason +Steiner, Ralf Stephan, Michael Stenns, Helmrich Streitmatter, Hans Werner +Strube, Dieter Stueken, Ed Sznyter, Lech Szychowski, Dean Takemori, Darrell +Tangman, Derek Terveer, Carsten Theis, Julian Thompson, David Tiller, Andry +Timonin, Mark Tomlin, Mark Tomlinson, Michael Traub, Martin Treusch von +Buttlar, Mark Trumbull, Alex Vasylenko, Michael Velten, Adri Verhoef, Paul +Vickers, Corinna Vinschen, Oliver B. Warzecha, Jason Wessel, Cary Whitney, +Henrik Wist, Greg Woods, Andreas Wrede, Lloyd Wright, Jens Wuepper, Billy +Y., Hideaki Yoshfuji, Nickolai Zeldovich, Zbigniew Zych diff -Nurp tin-1.7.3/doc/INSTALL tin-1.7.4/doc/INSTALL --- tin-1.7.3/doc/INSTALL Tue Dec 9 15:29:48 2003 +++ tin-1.7.4/doc/INSTALL Sun Jan 25 14:07:06 2004 @@ -79,6 +79,10 @@ System related: --libexecdir --sysconfdir --with-x --with-Xaw3d --with-neXtaw --with-XawPlus + --with-build-cc --with-build-cflags + --with-build-cppflags --with-build-ldflags + --with-build-libs --build + --host --target News machine names ------------------ @@ -499,7 +503,7 @@ within tin). See doc/reading-mail.txt fo --enable-nls (default: on) The --enable-nls option enables Native Language Support (NLS), which allows -tin to run in languages other than American English. Native Language +tin to run in languages other than American English. Native Language Support is enabled by default, the --disable-nls option disables NLS. --with-included-gettext (default:off) @@ -634,5 +638,5 @@ Compiled & installed -------------------- Tin was successfully built and installed on a variety of platforms including Linux, FreeBSD, OpenBSD, NetBSD, BSDi, Darwin, Solaris, IRIX, HP-UX, Ultrix, -Tru64, AIX, SINIX, UXP/V, QNX, GNU Hurd, DG/UX, SEIUX and Cygwin. -For a detailed list see +Tru64, AIX, SINIX, UXP/V, SUPER-UX, QNX, GNU Hurd, DG/UX, SEIUX, MiNT and +Cygwin. For a detailed list see diff -Nurp tin-1.7.3/doc/TODO tin-1.7.4/doc/TODO --- tin-1.7.3/doc/TODO Wed Dec 10 15:37:37 2003 +++ tin-1.7.4/doc/TODO Mon Feb 23 10:58:49 2004 @@ -4,16 +4,12 @@ not read only ,-). Bugs ---- -!o ReadCh()/ReadWch() need to be KEY_RESIZE safe otherwise one might lose -! his article -! see - o AFAICS change_config_file() currently has a static return value, but some callers do check the return value and in case we did change something we should update (global) attributes accordingly. [20030511 Urs Janssen ] -o Changes to int/bool tinrc variables in the Option Menu don't propogate +o Changes to int/bool tinrc variables in the Option Menu don't propagate back to the attributes, not even groups with global attributes. This is because the Option-Menu in {group,page}.c doesn't reread the attributes, whereas select.c does. Fix the problem properly in config.c by @@ -40,8 +36,10 @@ o batch mode has several bugs (filters each group several times, ~25 times slower as without a cmd-line group) and the cmd-line group is not displayed in the statistics nor taken into account for the 'any unread news' status. - - -cZ does not perform catchup, feature or bug? - - shall we allow stand alone -c? + - -vc could be more verbose (like -vcZ is) + - -cZ has an unclear return value (shall we return 0 or 2 if there + was unread news before -c marked it as read?) + - -o currently is not a 'batch_mode' option [Urs Janssen ] o '-s' cmd-line switch implicitly changes 'savedir' in tinrc @@ -88,8 +86,6 @@ o iso2asc conversion is missing for 'in Pager Problems -------------- -o raw mode loses (illegal) chars in multibyte based groups - [20021006 Michael Bienia ] Posting Problems ---------------- @@ -139,7 +135,7 @@ o add bold-italic, bold-underline, ital [20020721 Urs Janssen ] o allow bold, underline, italic, ... as colour substitution for - monochrom terminals (map green=underline, italic=yellow) + monochrome terminals (map green=underline, italic=yellow) (see also <20020416202232.A4575@bloatware.reston01.va.comcast.net>) [20030218 Serge Matveev ] @@ -165,7 +161,7 @@ o should the postponed 'file' (and post o add maildir support (besides MBOX{O,RD} and MMDF}, MH (not only reading but also writing), mailstore, BABYL, Kendra (MMDF - like with 20*CTRL-A as sep.) and add man-pages for the varius formats. + like with 20*CTRL-A as sep.) and add man-pages for the various formats. (see for BABYL, for maildir, for MBOXCL and MBOXCL2) @@ -182,6 +178,9 @@ o add xxencode (] +o add "Face:" (incompatible "X-Face:"-replacement) support? + [20040107 Urs Janssen ] + o turn CA_ERROR_SPACE_IN_NEWSGROUPS, CA_ERROR_NEWLINE_IN_NEWSGROUPS, CA_ERROR_SPACE_IN_FOLLOWUP_TO, CA_ERROR_NEWLINE_IN_FOLLOWUP_TO into CA_WARNING_s (see draft-ietf-usefor-article-06.txt 5.5) and mark them @@ -238,7 +237,7 @@ o attributes (still) needs some work, s on a per group basis but others would (e.g. Reply-To) once we have a 'attributes-menu' we could remove most of the global 'attributes' set in tinrc and move them to a scope=* - in attibutes (e.g. From) + in attributes (e.g. From) [Urs Janssen ] o add post_8bit_header, mail_8bit_header, post_mime_encoding, @@ -270,7 +269,7 @@ o check if server supports 'LIST MOTD' 'LIST DISTRIB.PATS' and if it does parse the output so it can be shown to the user. (e.g. when posting to a moderated group, show the moderators mail-address, but still leave the mailing to the server; if - the group has limitied distribution inform the user, ...) + the group has limited distribution inform the user, ...) o if using "-n" commandline switch you can't subscribe to newsgroups not present in your newsrc - a simple check against the server @@ -344,7 +343,7 @@ o A system-wide tinrc configuration fil Maybe a second file which could be used to force settings (eg inews & mailer) (tin.defaults [--with-defaults-dir] is a start) -o (g)oto group is case sensitive (nate that MH mailgroups might +o (g)oto group is case sensitive (note that MH mailgroups might contain uppercase chars) also newsgroup names in the command-line are case sensitive better would be: check if they exist and if not ask if you would @@ -385,7 +384,7 @@ o add check for GPGME (] -o the varius filter keys are named a bit inconsistent, currently we have +o the various filter keys are named a bit inconsistent, currently we have iKeyGroupQuickAutoSel, iKeyGroupQuickKill, iKeyPageQuickAutoSel, iKeyPageQuickKill and iKeyGroupKill, iKeyGroupAutoSel, iKeyPageAutoKill, iKeyPageAutoSel. in actual fact iKeyPageAutoKill is a misnomer and @@ -487,19 +486,11 @@ o the varius filter keys are named a bi the filter/scoring menu. It would be nice if the name would express that. e.g. rename them to something like *QuickFilter{Kill,Select} and *MenuFilter{Kill,Select}. and as the default values for those - keys arn't used anywhere else we could drop theier scope prefix which + keys arn't used anywhere else we could drop their scope prefix which would lead us to something like iKeyQuickFilter{Kill,Select} and iKeyMenuFilter{Kill,Select} [20030303 Urs Janssen ] -o reduce the number of dublicated strings in lang.c - txt_help_select_goto_group, txt_help_group_goto_group; - txt_help_group_toggle_subj_display, txt_help_thread_toggle_subj_display; - txt_help_article_prev_unread, txt_help_group_prev_unread_art; - txt_help_article_repost, txt_help_group_repost; - txt_help_article_next_unread, txt_help_article_read_next_unread, - txt_help_group_next_unread_art, txt_help_group_next_unread_article - o in page level Up2 ('k') does the same as PageNextUnreadArt ('N'), but Up ('^P') behaves different. shouldn't 'k' be named PageNextUnreadArt2 here? @@ -622,7 +613,7 @@ o make mm_network_charset an "option_li o add IDNA support (RFC 3490ff.) ( might be usefull) - (added minmalistic IDNA decoding support if a recent libidn is found, urs) + (added minimalistic IDNA decoding support if a recent libidn is found, urs) [20030917 Urs Janssen ] o add normalization @@ -631,11 +622,12 @@ o add normalization (done for search strings) [20031209 Michael Bienia ] - Docs/online help ---------------- o add installation guide (in html) +o add cross-compilation hints + o better document keymap feature o man page always needs work and proof reading @@ -646,6 +638,11 @@ o tin.defaults could use more documenta Not yet classified ------------------ +o trn uses ~/.nntpauth (format is "^server\s+user\s+password"), + shall we also try ~/.nntpauth if we can't find a matching entry + in ~/.newsauth? + [20040128 Urs Janssen ] + o what todo if in a CTE: x-uue the CD: filename differs from the one given in the begin line? IMHO we should use the one from the begin line for saving and in the overview in the pager. @@ -661,7 +658,7 @@ o move tinrc.defaults for certain coman (if so, also move i_key_search_last there) [Jason Faultless] -o what about -a cmd-line flag? is this really neaded? IMHO this can be +o what about -a cmd-line flag? is this really needed? IMHO this can be dropped, '&' can be used for runtime color toggling. [20021106 Urs Janssen ] @@ -676,7 +673,7 @@ o commas in real-name might cause probl [20021007 Urs Janssen ] o what is with FOPEN_OPTS (VMS)? is it missing from ~50% of all - fopen()-calls or can it be droped entirely? + fopen()-calls or can it be dropped entirely? [20020821 Urs Janssen ] o setting TIN_HOMEDIR to a non-existent dir gives a "Filesystem full" diff -Nurp tin-1.7.3/doc/WHATSNEW tin-1.7.4/doc/WHATSNEW --- tin-1.7.3/doc/WHATSNEW Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/doc/WHATSNEW Sun Jan 18 12:38:36 2004 @@ -14,7 +14,7 @@ New features . You can now specify a mailbox folder to save your sent mails so you possibly don't need auto_cc or auto_bcc anymore. See tin(5). -. x_headers can take a commad which generates the header(s). See tin(5). +. x_headers can take a command which generates the header(s). See tin(5). Retired Features ---------------- diff -Nurp tin-1.7.3/doc/art_handling.txt tin-1.7.4/doc/art_handling.txt --- tin-1.7.3/doc/art_handling.txt Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/doc/art_handling.txt Sun Jan 18 13:00:21 2004 @@ -7,7 +7,7 @@ art_close() is not implied anywhere - yo t_openartinfo ------------- This is basically an 'open article context'. You can pass these around or do -anything with them independantly of the rest of the program. +anything with them independently of the rest of the program. This structure contains open file pointers, one to the raw article, the other to the cooked article. There is no file related to these streams. @@ -48,7 +48,7 @@ Content-* headers if present will then s The other fields are: params A linked list of parameters associated with the Content-Type and Content-Disposition headers -offset The byte offset of this attachent. The offset of header->ext is +offset The byte offset of this attachment. The offset of header->ext is the offset of the 822 body lines The number of lines of raw text in this attachment. The number of lines in header->ext is the total number of lines in the article diff -Nurp tin-1.7.3/doc/filtering tin-1.7.4/doc/filtering --- tin-1.7.3/doc/filtering Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/doc/filtering Sun Jan 18 12:56:04 2004 @@ -300,7 +300,7 @@ msgid_only=doeblitz\.ts\.rz\.tu-bs\.de comment= kill all articles which do not have your message-id -comment= as last refenrece _if_ article has any references +comment= as last reference _if_ article has any references group=de.newusers.questions case=1 score=-100 diff -Nurp tin-1.7.3/doc/good-netkeeping-seal tin-1.7.4/doc/good-netkeeping-seal --- tin-1.7.3/doc/good-netkeeping-seal Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/doc/good-netkeeping-seal Wed Oct 29 08:31:57 2003 @@ -1,6 +1,7 @@ From: Jeroen Scheerder Newsgroups: news.software.readers,comp.os.msdos.mail-news,comp.os.os2.mail-news,comp.sys.mac.comm,comp.os.ms-windows.apps.comm,comp.os.ms-windows.apps.winsock.news,alt.usenet.offline-reader,alt.answers,comp.answers,news.answers Subject: Good Net-Keeping Seal of Approval 2.0 (GNKSA 2.0) for Usenet Software +Approved: news-answers-request@MIT.EDU Followup-To: news.software.readers Summary: Guidelines for writers of Usenet reading and posting programs. If you follow these guidelines, you'll make your users and the rest @@ -9,11 +10,12 @@ X-Note: This is an updated and revised d Archive-name: usenet/software/good-netkeeping-seal Posting-Frequency: monthly (first Sunday) -Last-modified: Apr 23 2001 -X-Version: 2.08 ($Id: gnksa.hdr,v 1.5 2001/04/23 09:36:42 js Exp $) -URL: -Maintainer: Jeroen Scheerder +Last-modified: Oct 29 2003 +X-Version: 2.09 ($Id: gnksa.hdr,v 1.8 2003/10/29 07:31:42 js Exp $) +URL: +Maintainer: Jeroen Scheerder +-----BEGIN PGP SIGNED MESSAGE----- GNKSA * The Good Net-Keeping Seal of Approval ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -35,10 +37,9 @@ Online or Delphi. I believe most of this anger is misdirected. The new users aren't really that different from the old-timers. What _is_ different is that many of the old-timers are using relatively well-behaved software, -typically `rn' or one of its offspring, while many of the newbies are -using `tin', `uqwk', `AOL', or various PC newsreaders. Unfortunately, -these programs frequently violate assumptions that come naturally to -people used to well-behaved readers: +while many of the newbies are using various PC newsreaders that frequently +violate assumptions that come naturally to people used to well-behaved +readers: - The user can see the essential header fields, including "Newsgroups" and "Followup-To". @@ -222,9 +223,9 @@ as an editable field in a form will meet Rationale: Topics drift as a discussion progresses, and users need the ability to change the Subject header to reflect the drift. Similarly, a user may determine that the discussion no longer belongs in some of the -places that it started, or that its continuation needs to go elsewhere. +places that it started, or that its continuation needs to go elsewhere. The software must not impede the user's ability to make these -judgments, possibly during the composition of her followup article. +judgments, possibly during the composition of her followup article. It's not acceptable to have users who respond to "Please direct followups appropriately" with "I can't; the software won't let me." @@ -253,7 +254,7 @@ software by replacing non-standard prefi prefix "Re: ". Rationale: These things should be obvious, but many authors of news -software don't seem to understand the relevant sections of RFC 1036. +software don't seem to understand the relevant sections of RFC 1036. Truncated "Subject: " headers, especially when gratuitous non-ASCII characters are also thrown in, are a major annoyance for users and can make threading difficult or impossible. @@ -470,7 +471,7 @@ such as "delete". Similarly, in English supersede command SHOULD include the word "supersede". Rationale: People make mistakes and need the ability to revoke or -correct them; both `cancel' and `supersede' exist for good reasons. +correct them; both `cancel' and `supersede' exist for good reasons. However, software should not encourage users to abuse the net, either intentionally or accidentally, by sending unauthorized (`rogue') cancels or supersedes. The supersede option is essential: due (a.o.) to @@ -753,3 +754,13 @@ reading programs. The kind folks of news.software.readers (you know who you are) that have helped discussing the issues that pertain to the GNSKA cause. + +-----BEGIN PGP SIGNATURE----- +Version: PGP 6.5.8 + +iQCVAwUBP59sFihIY6bIQPMpAQGv2QQAhD1M2vo6ASncrrVitDfVuyLY4WuFc607 +24G73/uxY41/6PdzLkTe3+9Lb8RUjHhgNZvMJDc42H3veV177jHkOMOnkAHL3Nvl +936CzXPxAsnn3YSmrCFT+cRrepvdYVoxPKu3wbhpJNTDcoyI5OcUFyOYhwKRpg31 +sVBe/csBC9g= +=Typt +-----END PGP SIGNATURE----- diff -Nurp tin-1.7.3/doc/keymap.sample tin-1.7.4/doc/keymap.sample --- tin-1.7.3/doc/keymap.sample Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/doc/keymap.sample Wed Feb 4 09:40:41 2004 @@ -213,9 +213,9 @@ SaveOverwriteFile o ##### +PProcNo n PProcShar s -PProcUUDecode u -PProcNone n +PProcYes y ##### diff -Nurp tin-1.7.3/doc/tin.1 tin-1.7.4/doc/tin.1 --- tin-1.7.3/doc/tin.1 Fri Dec 19 15:33:54 2003 +++ tin-1.7.4/doc/tin.1 Sun Feb 15 02:04:01 2004 @@ -3,13 +3,13 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2003-12-19 +.\" Updated : 2004-02-15 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature .\" .\" -.TH tin 1 "December 19th, 2003" "1.7.3" "A Usenet newsreader" +.TH tin 1 "February 15th, 2003" "1.7.4" "A Usenet newsreader" .\" .\" .SH NAME @@ -1113,8 +1113,9 @@ Mark the rest of the current thread as r the next thread with unread articles. .TP .B PageCancel 'D' -Cancel the current article. It must have been posted by the same user. The -cancel message can be seen in the newsgroup 'control' or 'control.cancel'. +Cancel (delete) or supersede (overwrite) the current article. It must +have been posted by the same user. The cancel message can be seen in +the newsgroup 'control' or 'control.cancel'. .TP .B PageEditArticle 'e' Edit the current article. This is restricted to mailgroups and saved news. @@ -1863,13 +1864,15 @@ 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 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 so that you need to check the -convention adopted in the local hierarchy of your interest to -determine what to do with this and \fBpost_mime_encoding\fP. +Allows 8bit characters unencoded in the header of a news article, if +set this also disables the generation of MIME-headers when they are +usualy required. 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 so that you need to check the convention adopted in the +local hierarchy of your interest to determine what to do with this +and \fBpost_mime_encoding\fP. .TP .B MIME encoding in news messages (post_mime_encoding) MIME encoding of the body in news message, if necessary. (8bit, @@ -3165,6 +3168,13 @@ ftp://ftp.csx.cam.ac.uk/pub/software/pro trouble with any of the mentioned servers define NUM_SIMULTANEOUS_GROUP_COMMAND to 1 in active.c and recompile. See also the TODO-file which comes with the source. +.br +Before mailing a bug-report to please check if you +are using the latest (stable) release, and if not, please upgrade +first! Have a look a the doc/TODO file for known bugs. If you still +think you've found a bug, please use the \fB*BugReport\fP ('\fBR\fP') +function and write in English. Please do NOT enclose a core-file in +your bugreport until we request it. .\" .\" .SH HISTORY @@ -3219,78 +3229,6 @@ and fallbacks. .IP "Andrew Greer" for originally porting \fBtin\fP to the VAX/VMS operating system. -.PP -I wish to thank the following people for supplying patches: -.PP -David Abbott, Earle Ake, Russ Allbery, Matt Anton, Orbby S. Arka, -Joachim Astel, Anton Aylward, Mark Ayzenshteyn, Jens Chr. Bachem, -George Baltz, Dieter Baron, Volker Barthelmann, Kirk Bauer, Paul -Bauwens, Dieter Becker, Wolfgang Behrens, Fabrice Bellet, Greg -Berigan, Enrik Berkhan, Juergen Bernau, Dan Berry, Michael Bienia, -David Binderman, Andrey Blochintsev, Chris Blum, Fokke de Boer, -Andreas Borchert, Sebastian Bork, Mark Boucher, Robert Brady, Bill -Brolik, Herman ten Brugge, Martin Buck, Jeremy Buhler, Leila -Burrell-Davis, Sean Casey, Peter Castro, Troy Cauble, Andrey A. -Chernov, Albert Chin-A-Young, Park Chong-Dae, Tan Kwee Chuan, -Boleslaw Ciesielski, Robert Claeson, Steven Cogswell, Don Costello, -Joshua Crawford, Bryan Curnutt, Ned Danieley, Lars Dannenberg, Chris -Davies, John Davis, Borislav Deianov, Thomas E. Dickey, Martin -Dickopp, Olaf Dietrich, Herbert Martin Dietze, Theo Van Dinter, Ralf -Doeblitz, Bryan Dongray, Michael Douglass, Nickolay Dudorov, Craig -Durland, Bernd Eckenfels, Phil Edge, Kirk Edson, Nick Efthymiou, -Stefan Elf, Nigel Ellis, L. Scott Emmons, Rob Engle, Olle Eriksson, -Brent Ermlick, Bernd Ernesti, Ragnar Hojland Espinosa, Jason -Faultless, Michael Faurot, Werner Fleck, John M. Flinchbaugh, Andy -Gabor, Christian Garbs, Torsten Gesang, Ruediger Geys, Callum Gibson, -Mike Glendinning, Igor Goryachev, Philippe Goujard, Dan Greenspan, -Karlo Gross, Carl Hage, Piers Haken, Paul Halsema, Ed Hanway, Scott -Hauck, Christian Haul, James Hawtin, Per Headland, Arnold Hendriks, -Daniel Hermans, Jose Herrero, Dave Hill, Tom Hite, Torsten Homeyer, -Ulli Horlacher, Keith Howell, Tommy Hsieh, Shih-Kun Huang, Steve -Hunt, Jeff Hurwitt, Jeon Hyoung-Jo, Pieter Immelman, Jarkko -Isokungas, Patrick St. Jean, Hal Jespersen, Park Sang Jin, Robbin -Johnson, Jarkko Jormanainen, Yury July, Nelson Kading, Geoffrey -Keating, Karsten Keil, Charles S. Kerr, Fritz Kleeman, Andreas Kies, -Janne Kiviluoto, Tomasz Kloczko, Dwarven Knight, Thomas Koenig, -Karl-Koenig Koenigsson, Martin Kraemer, Gerald Krause, Thomas -Kroener, Piotr Kucharski, Florian Kuehnert, Bernd Kuemmerlen, Kris -Kugel, Stephan Kulow, Manoj Kumar, Dawid Kuroczko, Yuri Kuzmenko, -Olivier Lacroix, Geoff Lane, Alex Lange, Alain Lasserre, Stanislav -Latishko, Hannu Laurila, Yen-Ming Lee, Vincent Lefevre, Alexander -Lehmann, Marty Leisner, Thomas Leitner, Hakan Lennestal, Kevin -Lentin, Chua Choon Leong, Chris Lewis, Andreas Ley, David-Michael -Lincke, Otto Lind, Richard Lloyd, Florian Lohoff, Reinhard Luebke, -Clifford Luke, Michael Lupp, David MacKenzie, Hugh Mahon, Giuseppe De -Marco, Scott Marovich, Dmitri A. Martynoff, Kazushi Marukawa, Timur -Maryin, William McBrine, Geoff McCaughan, Owen Medd, Philipp -Mergenthaler, Andreas Metzler, Arkadiusz Miskiewicz, Soren Moller, -Bruce Momjian, Sergio Morales, Michael Morrell, Klaus Mueller, Mike -Muise, Udo Munk, John R. Myers, Daniel Naber, Torsten Neumann, Dirk -Nimmich, James Nugen, David E. O'Brien, Michael O'Reilly, Oleg -Ohotnikov, Ronald Orr, Julien Oster, Guido Ostkamp, Philip Paeps, Jeb -Palmer, Neil Parker, Joseph Parmelee, Tom Parry, Jim Patterson, Sven -Paulus, Walter Pelissero, Cameron Perkins, Colin Perkins, Eric -Peterson, Tim Pierce, Bill Poitras, Scott W. Powers, Wolfgang -Prediger, Marc Prud'hommeaux, GianPiero Puccioni, Thomas Quinot, -Stefan Rapp, Martin Reising, Kyle Rhorer, Ted Richards, Steve -Robbins, Ollivier Robert, Branden Robinson, Jim Robinson, Thomas -Roessler, Erik van Roode, Meelis Roos, Stephen Roseman, Roland -Rosenfeld, Peter Van Rossem, Clifton Royston, Juergen Salk, Rich -Salz, Gary Sanders, Nickolay Saukh, John Sauter, Christopher Sawtell, -Holger Schif, Volker Schmidt, John Schmitz, Torsten Schneider, Stefan -Scholl, Rainer Scholz, Juergen Schroeder, Larry Schwimmer, Randy -Scott, Bart Sears, Karl-Olav Serrander, Doug Sewell, Philip Shearer, -Jungshik Shin, Sergey Shkonda, Andreas Siegert, Mark Smith, Toomas -Soome, Steve Spearman, Helmut Springer, Cliff Stanford, Steve Starck, -Jason Steiner, Ralf Stephan, Michael Stenns, Helmrich Streitmatter, -Hans Werner Strube, Dieter Stueken, Ed Sznyter, Lech Szychowski, Dean -Takemori, Darrell Tangman, Derek Terveer, Carsten Theis, Julian -Thompson, David Tiller, Andry Timonin, Mark Tomlin, Mark Tomlinson, -Michael Traub, Martin Treusch von Buttlar, Mark Trumbull, Alex -Vasylenko, Michael Velten, Adri Verhoef, Paul Vickers, Corinna -Vinschen, Oliver B. Warzecha, Jason Wessel, Cary Whitney, Henrik -Wist, Greg Woods, Andreas Wrede, Lloyd Wright, Jens Wuepper, Billy -Y., Hideaki Yoshfuji, Nickolai Zeldovich, Zbigniew Zych .\" .\" .SH AUTHOR diff -Nurp tin-1.7.3/doc/tin.5 tin-1.7.4/doc/tin.5 --- tin-1.7.3/doc/tin.5 Fri Dec 19 15:34:04 2003 +++ tin-1.7.4/doc/tin.5 Wed Feb 4 11:42:12 2004 @@ -2,10 +2,10 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2003-12-19 +.\" Updated : 2003-01-12 .\" Notes : needs a some work .\" -.TH tin 5 "December 19th, 2003" "1.7.3" "A Usenet newsreader" +.TH tin 5 "January 12th, 2004" "1.7.4" "A Usenet newsreader" .SH NAME tin, rtin \- related files @@ -211,9 +211,9 @@ needsterminal .sp .RS default NNTP-server to read news from if not reading from the local spool. -\&'\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. +\&'\fB-g\fP \fIserver\fR', $\fBNNTPSERVER\fP have higher priority (in +that order), the default server given at compile time has lower +priority. .RE .PP @@ -1327,7 +1327,7 @@ used for mailing articles to other peopl different command line parameters to be used such as 'elm -s "%S" "%T" < "%F"' (e.g., elm -s "subject" "iain" < .article) or 'sendmail -oem -t < %F' (e.g. sendmail -oem -t < .article). -.\" TODO: document %S, %T, %M, %F... +.\" TODO: document %S, %T, %M, %F, %U ... .TP .B default_move_group .TP @@ -1626,13 +1626,15 @@ If ON put cursor at first unread article Default is ON. .TP .B post_8bit_header -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 -so that you need to check the convention adopted in the local hierarchy of -your interest to determine what to do with this and -\fBpost_mime_encoding\fP. +Allows 8bit characters unencoded in the header of a news article, if +set this also disables the generation of MIME-headers when they are +usualy required. 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 so that you need to check the convention adopted in the +local hierarchy of your interest to determine what to do with this +and \fBpost_mime_encoding\fP. .TP .B post_mime_encoding MIME encoding of the body in news message, if necessary. (8bit, base64, diff -Nurp tin-1.7.3/doc/tinews.1 tin-1.7.4/doc/tinews.1 --- tin-1.7.3/doc/tinews.1 Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/doc/tinews.1 Fri Jan 30 13:27:04 2004 @@ -1,9 +1,8 @@ -.rn '' }` -''' $RCSfile$$Revision$$Date$ -''' -''' $Log$ -''' -.de Sh +.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.13 +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sh \" Subsection heading .br .if t .Sp .ne 5 @@ -11,150 +10,98 @@ \fB\\$1\fR .PP .. -.de Sp +.de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. -.de Ip -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.de Vb +.de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. -.de Ve +.de Ve \" End verbatim text .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. -''' +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. | will give a +.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to +.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' +.\" expand to `' in nroff, nothing in troff, for use with C<>. .tr \(*W-|\(bv\*(Tr +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .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' ' +. 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" "" +. ds C` "" +. ds C' "" '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 +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' '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" +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. -.nr % 0 -.rr F +. 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 +.\" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.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 +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff .if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP +. 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 #] \& +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& .\} -. \" simple accents for nroff and troff +. \" simple accents for nroff and troff .if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds ? ? -. ds ! ! -. ds / -. ds q +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / .\} .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' +. 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 / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' .\} -. \" troff and (daisy-wheel) nroff accents +. \" 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' @@ -162,141 +109,200 @@ .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 +. \" 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) +. \" 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 +. ds : e +. ds 8 ss +. 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 .\} .rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "TINEWS 1" +.TH TINEWS 1 "January 30th, 2004" "1.1.6" "Post and sign an article via NNTP" .SH "NAME" tinews.pl \- Post and sign an article via NNTP .SH "SYNOPSIS" -\fBtinews.pl\fR < \fIinput\fR +.IX Header "SYNOPSIS" +\&\fBtinews.pl\fR [\fB\s-1OPTIONS\s0\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. +.IX Header "DESCRIPTION" +\&\fBtinews.pl\fR reads an article on \s-1STDIN\s0, 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. +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. +.IX Header "OPTIONS" +.ie n .IP "\-\fBa\fR ""Approved""\fR | \-\-\fBapproved\fR \f(CW""Approved""" 4 +.el .IP "\-\fBa\fR \f(CWApproved\fR | \-\-\fBapproved\fR \f(CWApproved\fR" 4 +.IX Item "-a Approved | --approved Approved" +Set the article header field Approved: to the given value. +.ie n .IP "\-\fBc\fR ""Control""\fR | \-\-\fBcontrol\fR \f(CW""Control""" 4 +.el .IP "\-\fBc\fR \f(CWControl\fR | \-\-\fBcontrol\fR \f(CWControl\fR" 4 +.IX Item "-c Control | --control Control" +Set the article header field Control: to the given value. +.ie n .IP "\-\fBd\fR ""Distribution""\fR | \-\-\fBdistribution\fR \f(CW""Distribution""" 4 +.el .IP "\-\fBd\fR \f(CWDistribution\fR | \-\-\fBdistribution\fR \f(CWDistribution\fR" 4 +.IX Item "-d Distribution | --distribution Distribution" +Set the article header field Distribution: to the given value. +.ie n .IP "\-\fBe\fR ""Expires""\fR | \-\-\fBexpires\fR \f(CW""Expires""" 4 +.el .IP "\-\fBe\fR \f(CWExpires\fR | \-\-\fBexpires\fR \f(CWExpires\fR" 4 +.IX Item "-e Expires | --expires Expires" +Set the article header field Expires: to the given value. +.ie n .IP "\-\fBf\fR ""From""\fR | \-\-\fBfrom\fR \f(CW""From""" 4 +.el .IP "\-\fBf\fR \f(CWFrom\fR | \-\-\fBfrom\fR \f(CWFrom\fR" 4 +.IX Item "-f From | --from From" +Set the article header field From: to the given value. +.ie n .IP "\-\fBn\fR ""Newsgroups""\fR | \-\-\fBnewsgroups\fR \f(CW""Newsgroups""" 4 +.el .IP "\-\fBn\fR \f(CWNewsgroups\fR | \-\-\fBnewsgroups\fR \f(CWNewsgroups\fR" 4 +.IX Item "-n Newsgroups | --newsgroups Newsgroups" +Set the article header field Newsgroups: to the given value. +.ie n .IP "\-\fBo\fR ""Organization""\fR | \-\-\fBorganization\fR \f(CW""Organization""" 4 +.el .IP "\-\fBo\fR \f(CWOrganization\fR | \-\-\fBorganization\fR \f(CWOrganization\fR" 4 +.IX Item "-o Organization | --organization Organization" +Set the article header field Organization: to the given value. +.ie n .IP "\-\fBp\fR ""port""\fR | \-\-\fBport\fR \f(CW""port""" 4 +.el .IP "\-\fBp\fR \f(CWport\fR | \-\-\fBport\fR \f(CWport\fR" 4 +.IX Item "-p port | --port port" +use \f(CW\*(C`port\*(C'\fR as NNTP-port +.ie n .IP "\-\fBr\fR ""Reply\-To""\fR | \-\-\fBreplyto\fR \f(CW""Reply\-To""" 4 +.el .IP "\-\fBr\fR \f(CWReply\-To\fR | \-\-\fBreplyto\fR \f(CWReply\-To\fR" 4 +.IX Item "-r Reply-To | --replyto Reply-To" +Set the article header field Reply\-To: to the given value. +.ie n .IP "\-\fBt\fR ""Subject""\fR | \-\-\fBsubject\fR \f(CW""Subject""" 4 +.el .IP "\-\fBt\fR \f(CWSubject\fR | \-\-\fBsubject\fR \f(CWSubject\fR" 4 +.IX Item "-t Subject | --subject Subject" +Set the article header field Subject: to the given value. +.ie n .IP "\-\fBw\fR ""Followup\-To""\fR | \-\-\fBfollowupto\fR \f(CW""Followup\-To""" 4 +.el .IP "\-\fBw\fR \f(CWFollowup\-To\fR | \-\-\fBfollowupto\fR \f(CWFollowup\-To\fR" 4 +.IX Item "-w Followup-To | --followupto Followup-To" +Set the article header field Followup\-To: to the given value. +.ie n .IP "\-\fBx\fR ""Path""\fR | \-\-\fBpath\fR \f(CW""Path""" 4 +.el .IP "\-\fBx\fR \f(CWPath\fR | \-\-\fBpath\fR \f(CWPath\fR" 4 +.IX Item "-x Path | --path Path" +Set the article header field Path: to the given value. +.IP "\-\fBH\fR | \-\-\fBhelp\fR" 4 +.IX Item "-H | --help" +Show help\-page. +.IP "\-\fBR\fR | \-\-\fBno-control\fR" 4 +.IX Item "-R | --no-control" +Restricted mode, disallow control\-messages. +.IP "\-\fBS\fR | \-\-\fBno-signature\fR" 4 +.IX Item "-S | --no-signature" +Do not append \fI$HOME/.signature\fR +.IP "\-\fBX\fR | \-\-\fBno-sign\fR" 4 +.IX Item "-X | --no-sign" +Do not sign the article. +.IP "\-\fBA\fR \-\fBV\fR \-\fBW\fR" 4 +.IX Item "-A -V -W" +These options are accepted for compatibility reasons but ignored. +.IP "\-\fBh\fR | \-\-\fBheaders\fR" 4 +.IX Item "-h | --headers" +These options are accepted for compatibility reasons but ignored. +.IP "\-\fBO\fR | \-\-\fBno-organization\fR" 4 +.IX Item "-O | --no-organization" +These options are accepted for compatibility reasons but ignored. +.IP "\-\fBD\fR | \-\fBN\fR | \-\-\fBdebug\fR" 4 +.IX Item "-D | -N | --debug" +These options are accepted but do not have any functionality yet. .SH "EXIT STATUS" +.IX Header "EXIT STATUS" The following exit values are returned: -.Ip "\ 0 " 4 +.RS 4 +.IP "\ 0" 4 +.IX Item "0" Successful completion. -.Ip "!=0" 4 +.IP "!=0" 4 +.IX Item "!=0" An error occurred. +.RE +.RS 4 .SH "ENVIRONMENT" -.Ip "\fB$\s-1NNTPSERVER\s0\fR" 4 +.IX Header "ENVIRONMENT" +.IP "\fB$NNTPSERVER\fR" 4 +.IX Item "$NNTPSERVER" Set to override the \s-1NNTP\s0 server configured in the source. -.Ip "\fB$\s-1PGPPASS\s0\fR" 4 +.IP "\fB$NNTPPORT\fR" 4 +.IX Item "$NNTPPORT" +The \s-1NNTP\s0 TCP-port to post news to. This variable only needs to be set if the +TCP-port is not 119 (the default). The '\-\fBp\fR' command-line option overrides +\&\fB$NNTPPORT\fR. +.IP "\fB$PGPPASS\fR" 4 +.IX Item "$PGPPASS" Set to override the passphrase configured in the source (used for -\fBpgp\fR(1)\-2.6.3). -.Ip "\fB$\s-1PGPPASSFILE\s0\fR" 4 +\&\fBpgp\fR(1)\-2.6.3). +.IP "\fB$PGPPASSFILE\fR" 4 +.IX Item "$PGPPASSFILE" Passphrase file used for \fBpgp\fR(1) or \fBgpg\fR(1). -.Ip "\fB$\s-1SIGNER\s0\fR" 4 +.IP "\fB$SIGNER\fR" 4 +.IX Item "$SIGNER" 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 +neither set \fB$SIGNER\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 already a Reply-To: header in the article. -.Ip "\fB$\s-1ORGANIZATION\s0\fR" 4 +.IP "\fB$REPLYTO\fR" 4 +.IX Item "$REPLYTO" +Set the article header field Reply\-To: to the return address specified by +the variable if there isn't already a Reply\-To: header in the article. +The '\-\fBr\fR' command-line option overrides \fB$REPLYTO\fR. +.IP "\fB$ORGANIZATION\fR" 4 +.IX Item "$ORGANIZATION" Set the article header field Organization: to the contents of the variable -if there isn't already a Organization: header in the article. +if there isn't already a Organization: header in the article. The '\-\fBo\fR' +command-line option overrides \fB$ORGANIZATION\fR. +.IP "\fB$DISTRIBUTION\fR" 4 +.IX Item "$DISTRIBUTION" +Set the article header field Distribution: to the contents of the variable +if there isn't already a Distribution: header in the article. The '\-\fBd\fR' +command-line option overrides \fB$DISTRIBUTION\fR. +.RE +.RS 4 .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 +.IX Header "FILES" +.IP "\fIpgptmp.txt\fR" 4 +.IX Item "pgptmp.txt" +Temporary file used to store the reformatted article +.IP "\fIpgptmp.txt.asc\fR" 4 +.IX Item "pgptmp.txt.asc" +Temporary file used to store the reformatted and signed article +.IP "\fI$PGPPASSFILE\fR" 4 +.IX Item "$PGPPASSFILE" The passphrase file to be used for \fBpgp\fR(1) or \fBgpg\fR(1). +.IP "\fI$HOME/.signature\fR" 4 +.IX Item "$HOME/.signature" +Signature-file which will be automatically included. +.RE +.RS 4 .SH "SECURITY" -If interactive usage is configured and \fBtinews.pl\fR prompts for the -NNTP\-password the input is echoed to the terminal. -.PP +.IX Header "SECURITY" 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). +.IX Header "NOTES" +\&\fBtinews.pl\fR is designed to be used with \fBpgp\fR(1)\-2.6.3, +\&\fBpgp\fR(1)\-5 and \fBgpg\fR(1). +.Sp +\&\fBtinews.pl\fR requires the following standard modules to be installed: +\&\fBGetopt::Long\fR(3pm), \fBNet::NNTP\fR(3pm), \fBTime::Local\fR(3pm) and +\&\fBTerm::Readline\fR(3pm). .SH "AUTHOR" +.IX Header "AUTHOR" Urs Janssen , Marc Brockschmidt .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" - +\&\fBpgp\fR(1), \fBgpg\fR(1), \fBpgps\fR(1), \fBGetopt::Long\fR(3pm), \fBNet::NNTP\fR(3pm), +\&\fBTime::Local\fR(3pm), \fBTerm::Readline\fR(3pm) diff -Nurp tin-1.7.3/doc/tools.txt tin-1.7.4/doc/tools.txt --- tin-1.7.3/doc/tools.txt Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/doc/tools.txt Sun Jan 25 14:20:06 2004 @@ -1,5 +1,12 @@ short descriptions of files in the tools-directory +tinews.pl + a perl script that can be used as a inews replacement if posting via + NNTP. the main purpose of this script is to automatically sign + posted/mailed articles via pgp or gpg. besides the autosigning + feature it takes care about Cc: and Bcc: lines in news-postings + and adds a Posted-And-Mailed: header if necessary. + w2r.pl is a small perl script that turns a wildmat filter file into a regexp filter file (don't forget to set wildmat= in tinrc @@ -25,16 +32,17 @@ tinlock tinlock [tin-cmdline-args] metamutt - is a small shell script to replace metamail, set METAMAIL=metamutt - before starting tin and till will pass multipart MIME-articles to - metamutt instead of metamail. metamutt will pass the article to mutt - (a mail client with an excellent MIME-parser). this might become - obsolete as tin now has a small (and unfinished) built in - MIME-parser, set METAMAIL=(internal) to use the built in version. + is a small shell script to replace metamail, set + metamail_prog=metamutt in tin and till will pass multipart + MIME-articles to metamutt instead of metamail. metamutt will pass + the article to mutt (a mail client with an excellent MIME-parser). + this might become obsolete as tin now has a small (and unfinished) + built in MIME-parser, set metamail_prog=--internal to use the built + in version. url_handler.sh is a shell script (need to be placed in /usr/local/bin/) which - passes the URL selected by the 'U' command into a related + passes the URL selected by the 'U' command to a related viewer/application. this one is very basic. expand_aliases.tgz @@ -45,5 +53,5 @@ expand_aliases.tgz expiretover is a small shell script to expire old tin overview files. if you use cache_overview_files=ON in your tinrc you might want to run this - script reguarly (i.e. once a day from cron) to purge old overview + script regularly (e.g. once a day from cron) to purge old overview files. diff -Nurp tin-1.7.3/doc/umlauts.txt tin-1.7.4/doc/umlauts.txt --- tin-1.7.3/doc/umlauts.txt Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/doc/umlauts.txt Sun Jan 18 12:53:21 2004 @@ -5,7 +5,7 @@ Umlauts when reading -------------------- After reading a posting from the newsserver tin checks if a charset has been -declared in the header. If not, tin assumes the appropiate entry of a +declared in the header. If not, tin assumes the appropriate entry of a corresponding undeclared_charset variable in the attributes file. If there still is no match, tin assumes US-ASCII as the charset for this posting. @@ -63,7 +63,7 @@ scope=* undeclared_charset=Windows-1252 This tells tin to assume the Windows-1252 charset. Since most people use -Windows nowadays and this charset is default for North Amerika and Western +Windows nowadays and this charset is default for North America and Western Europe, and this charset is mostly compatible with the widespread ISO 8859-1 charset, this should cover many postings. For special newsgroups this configuration should be improved by setting up another charset in a diff -Nurp tin-1.7.3/include/autoconf.hin tin-1.7.4/include/autoconf.hin --- tin-1.7.3/include/autoconf.hin Tue Dec 9 09:20:19 2003 +++ tin-1.7.4/include/autoconf.hin Mon Feb 9 15:42:48 2004 @@ -3,10 +3,10 @@ * Module : autoconf.hin * Author : Thomas Dickey * Created : 1995-08-24 - * Updated : 2003-12-09 + * Updated : 2004-02-09 * Notes : #include files, #defines & struct's * - * Copyright (c) 1995-2003 Thomas Dickey + * Copyright (c) 1995-2004 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -169,6 +169,7 @@ # undef HAVE_LOCALE_H # undef HAVE_MALLOC_H # undef HAVE_NCURSESW_NCURSES_H +# undef HAVE_NCURSESW_TERM_H # undef HAVE_NCURSES_H /* obsolete versions of ncurses */ # undef HAVE_NCURSES_NCURSES_H # undef HAVE_NCURSES_TERM_H @@ -294,6 +295,7 @@ # undef HAVE_UNLINK # undef HAVE_USE_DEFAULT_COLORS # undef HAVE_USLEEP +# undef HAVE_VASPRINTF # undef HAVE_VSNPRINTF # undef HAVE_WAITPID # undef HAVE__TRACEF @@ -581,6 +583,11 @@ * define if closedir() does not return a status */ # undef CLOSEDIR_VOID + +/* + * define if gettimeofday() takes the timezone as 2nd argument + */ +# undef GETTIMEOFDAY_2ARGS /* * define if your NNTP server needs an extra GROUP command before diff -Nurp tin-1.7.3/include/bool.h tin-1.7.4/include/bool.h --- tin-1.7.3/include/bool.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/bool.h Sun Jan 11 17:12:38 2004 @@ -6,7 +6,7 @@ * Updated : 2003-05-16 * Notes : * - * Copyright (c) 1997-2003 Urs Janssen + * Copyright (c) 1997-2004 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,11 @@ #ifndef BOOL_H # define BOOL_H 1 -# if 0 /* TODO: test me */ +# if 0 +/* + * This is the correct way, but causes problems on some systems + * e.g. SuSE-7.3 (IA-32) + */ # ifndef __cplusplus # ifdef HAVE_STDBOOL_H # include diff -Nurp tin-1.7.3/include/bugrep.h tin-1.7.4/include/bugrep.h --- tin-1.7.3/include/bugrep.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/bugrep.h Sun Dec 28 15:27:10 2003 @@ -6,7 +6,7 @@ * Updated : 2003-09-19 * Notes : * - * Copyright (c) 1997-2003 Urs Janssen + * Copyright (c) 1997-2004 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/extern.h tin-1.7.4/include/extern.h --- tin-1.7.3/include/extern.h Tue Dec 9 09:44:26 2003 +++ tin-1.7.4/include/extern.h Mon Feb 23 11:45:21 2004 @@ -3,10 +3,10 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-12-09 + * Updated : 2004-02-23 * Notes : * - * Copyright (c) 1997-2003 Iain Lea + * Copyright (c) 1997-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -352,14 +352,13 @@ extern char local_input_history_file[PAT extern char local_newsgroups_file[PATH_LEN]; extern char local_newsrctable_file[PATH_LEN]; extern char lock_file[PATH_LEN]; -extern char mail_active_file[PATH_LEN]; extern char mail_news_user[LEN]; extern char mailbox[PATH_LEN]; extern char mailer[PATH_LEN]; #ifdef HAVE_MH_MAIL_HANDLING + extern char mail_active_file[PATH_LEN]; extern char mailgroups_file[PATH_LEN]; #endif /* HAVE_MH_MAIL_HANDLING */ -extern char mesg[LEN]; extern char newnewsrc[PATH_LEN]; extern char news_active_file[PATH_LEN]; extern char newsgroups_file[PATH_LEN]; @@ -380,7 +379,6 @@ extern char txt_help_bug_report[LEN]; extern char userid[PATH_LEN]; extern char domain_name[]; -extern char host_name[]; extern const char base64_alphabet[64]; @@ -669,7 +667,6 @@ extern constext txt_help_article_prev_un extern constext txt_help_article_quick_kill[]; extern constext txt_help_article_quick_select[]; extern constext txt_help_article_quit_to_select_level[]; -extern constext txt_help_article_read_next_unread[]; extern constext txt_help_article_reply[]; extern constext txt_help_article_reply_no_quote[]; extern constext txt_help_article_reply_with_header[]; @@ -736,11 +733,11 @@ extern constext txt_help_global_tag[]; extern constext txt_help_global_toggle_info_line[]; extern constext txt_help_global_toggle_inverse_video[]; extern constext txt_help_global_toggle_mini_help[]; +extern constext txt_help_global_toggle_subj_display[]; extern constext txt_help_global_version[]; extern constext txt_help_group_catchup[]; extern constext txt_help_group_catchup_next[]; extern constext txt_help_group_first_thread[]; -extern constext txt_help_group_goto_group[]; extern constext txt_help_group_last_thread[]; extern constext txt_help_group_list_thread[]; extern constext txt_help_group_mark_article_unread[]; @@ -748,12 +745,7 @@ extern constext txt_help_group_mark_thre extern constext txt_help_group_mark_thread_unread[]; extern constext txt_help_group_mark_unsel_art_read[]; extern constext txt_help_group_next[]; -extern constext txt_help_group_next_unread_art[]; -extern constext txt_help_group_next_unread_article[]; extern constext txt_help_group_prev[]; -extern constext txt_help_group_prev_unread_art[]; -extern constext txt_help_group_read_article[]; -extern constext txt_help_group_repost[]; extern constext txt_help_group_reverse_thread_selection[]; extern constext txt_help_group_select_all[]; extern constext txt_help_group_select_thread[]; @@ -763,7 +755,6 @@ extern constext txt_help_group_tag_parts extern constext txt_help_group_thread_by_num[]; extern constext txt_help_group_toggle_getart_limit[]; extern constext txt_help_group_toggle_read_articles[]; -extern constext txt_help_group_toggle_subj_display[]; extern constext txt_help_group_toggle_thread_selection[]; extern constext txt_help_group_toggle_threading[]; extern constext txt_help_group_undo_thread_selection[]; @@ -803,7 +794,6 @@ extern constext txt_help_thread_first_ar extern constext txt_help_thread_last_article[]; extern constext txt_help_thread_mark_article_read[]; extern constext txt_help_thread_read_article[]; -extern constext txt_help_thread_toggle_subj_display[]; extern constext txt_help_title_disp[]; extern constext txt_help_title_misc[]; extern constext txt_help_title_navi[]; @@ -1202,7 +1192,6 @@ extern constext txt_uu_success[]; #endif /* !NO_SHELL_ESCAPE */ extern int *my_group; -extern int MORE_POS; extern int NOTESLINES; extern int _hp_glitch; extern int cCOLS; @@ -1211,6 +1200,7 @@ extern int curr_line; extern int debug; extern int groupname_len; extern int i_key_search_last; +extern int input_context; extern int iso2asc_supported; extern int last_resp; extern int max_active; @@ -1239,7 +1229,6 @@ extern long *base; extern signed long int read_newsrc_lines; -extern mode_t real_umask; extern pid_t process_id; extern struct regex_cache strip_re_regex; @@ -1287,7 +1276,6 @@ extern t_bool newsrc_active; extern t_bool no_write; extern t_bool post_article_and_exit; extern t_bool post_postponed_and_exit; -extern t_bool quitting; extern t_bool read_local_newsgroups_file; extern t_bool read_news_via_nntp; extern t_bool read_saved_news; diff -Nurp tin-1.7.3/include/keymap.h tin-1.7.4/include/keymap.h --- tin-1.7.3/include/keymap.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/keymap.h Sun Dec 28 15:27:28 2003 @@ -6,7 +6,7 @@ * Updated : 2003-05-14 * Notes : * - * Copyright (c) 1999-2003 Jason Faultless + * Copyright (c) 1999-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/menukeys.h tin-1.7.4/include/menukeys.h --- tin-1.7.3/include/menukeys.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/menukeys.h Sun Dec 28 15:27:37 2003 @@ -6,7 +6,7 @@ * Updated : 2003-05-14 * Notes : * - * Copyright (c) 1994-2003 Steve Robbins + * Copyright (c) 1994-2004 Steve Robbins * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/newsrc.h tin-1.7.4/include/newsrc.h --- tin-1.7.3/include/newsrc.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/newsrc.h Sun Dec 28 15:27:46 2003 @@ -6,7 +6,7 @@ * Updated : 2003-11-18 * Notes : newsrc bit handling * - * Copyright (c) 1997-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1997-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/nntplib.h tin-1.7.4/include/nntplib.h --- tin-1.7.3/include/nntplib.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/nntplib.h Sun Dec 28 15:27:59 2003 @@ -6,7 +6,7 @@ * Updated : 2003-09-19 * Notes : nntp.h 1.5.11/1.6 with extensions for tin * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/oldconfig.h tin-1.7.4/include/oldconfig.h --- tin-1.7.3/include/oldconfig.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/oldconfig.h Sun Dec 28 15:28:14 2003 @@ -6,7 +6,7 @@ * Updated : 2001-07-22 * Notes : #defines to determine different OS capabilites * - * Copyright (c) 1995-2003 Iain Lea + * Copyright (c) 1995-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/policy.h tin-1.7.4/include/policy.h --- tin-1.7.3/include/policy.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/policy.h Mon Jan 26 11:35:19 2004 @@ -3,10 +3,10 @@ * Module : policy.h * Author : Ralf Doeblitz * Created : 1999-01-12 - * Updated : 2003-09-08 + * Updated : 2004-01-02 * Notes : #defines and static data for policy configuration * - * Copyright (c) 1999-2003 Ralf Doeblitz + * Copyright (c) 1999-2004 Ralf Doeblitz * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,9 +81,8 @@ * .do Dominican Republic .dz Algeria * * .ec Ecuador .ee Estonia - * .eg Egypt .eh Western Sahara - * .er Eritrea .es Spain - * .et Ethiopia + * .eg Egypt .er Eritrea + * .es Spain .et Ethiopia * * .fi Finland .fj Fiji * .fk Falkland Islands (Malvina) .fm Micronesia, Federal State of @@ -116,7 +115,6 @@ * .ke Kenya .kg Kyrgystan * .kh Cambodia .ki Kiribati * .km Comoros .kn Saint Kitts and Nevis - * .kp Korea, Democratic People's Republic * .kr Korea, Republic of .kw Kuwait * .ky Cayman Islands .kz Kazakhstan * @@ -213,16 +211,20 @@ * .aa, .qm, .qz, .xa, .xz, .zz * * unused TLDs: + * .eh Western Sahara + * .kp Korea, Democratic People's Republic * .nt Neutral Zone * * requested new TLDs: + * .ax Aaland-Islands (Finnish) * .cs Serbia and Montenegro - * .eu European Union + * .eu European Union (planned for 2004-11) * * 'expireing' TLDs: * .gb United Kingdom, use .uk *(.hk Hong Kong, now .cn) * .su former USSR, now .ru + *(.yu former Yugoslavia) */ static char gnksa_country_codes[26*26] = { @@ -231,13 +233,13 @@ static char gnksa_country_codes[26*26] = /* B */ 1,1,0,1,1, 1,1,1,1,1, 0,0,1,1,1, 0,0,1,1,1, 0,1,1,0,1,1, /* C */ 1,0,1,1,0, 1,1,1,1,0, 1,1,1,1,1, 0,0,1,0,0, 1,1,0,1,1,1, /* D */ 0,0,0,0,1, 0,0,0,0,1, 1,0,1,0,1, 0,0,0,0,0, 0,0,0,0,0,1, -/* E */ 0,0,1,0,1, 0,1,1,0,0, 0,0,0,0,0, 0,0,1,1,1, 0,0,0,0,0,0, +/* E */ 0,0,1,0,1, 0,1,0,0,0, 0,0,0,0,0, 0,0,1,1,1, 0,0,0,0,0,0, /* F */ 0,0,0,0,0, 0,0,0,1,1, 1,0,1,0,1, 0,0,1,0,0, 0,0,0,0,0,0, /* G */ 1,1,0,1,1, 1,1,1,1,0, 0,1,1,1,0, 1,1,1,1,1, 1,0,1,0,1,0, /* H */ 0,0,0,0,0, 0,0,0,0,0, 1,0,1,1,0, 0,0,1,0,1, 1,0,0,0,0,0, /* I */ 0,0,0,1,1, 0,0,0,0,0, 0,1,1,1,1, 0,1,1,1,1, 0,0,0,0,0,0, /* J */ 0,0,0,0,1, 0,0,0,0,0, 0,0,1,0,1, 1,0,0,0,0, 0,0,0,0,0,0, -/* K */ 0,0,0,0,1, 0,1,1,1,0, 0,0,1,1,0, 1,0,1,0,0, 0,0,1,0,1,1, +/* K */ 0,0,0,0,1, 0,1,1,1,0, 0,0,1,1,0, 0,0,1,0,0, 0,0,1,0,1,1, /* L */ 1,1,1,0,0, 0,0,0,1,0, 1,0,0,0,0, 0,0,1,1,1, 1,1,0,0,1,0, /* M */ 1,0,1,1,0, 0,1,1,0,0, 1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1,1, /* N */ 1,0,1,0,1, 1,1,0,1,0, 0,1,0,0,1, 1,0,1,0,0, 1,0,0,0,0,1, @@ -276,7 +278,7 @@ static const char *gnksa_domain_list[] = "info", /* Unrestricted use */ "name", /* For registration by individuals */ "museum", /* Museums */ - /* 3 more gTLDs to come in 2003 (.travel is likely to be one of them) */ + /* 3 more gTLDs to come in 2004 (.travel is likely to be one of them) */ # if 0 /* $DEAD */ "uucp", "bitnet", diff -Nurp tin-1.7.3/include/proto.h tin-1.7.4/include/proto.h --- tin-1.7.3/include/proto.h Wed Dec 17 19:11:19 2003 +++ tin-1.7.4/include/proto.h Mon Feb 23 11:45:29 2004 @@ -3,10 +3,10 @@ * Module : proto.h * Author : Urs Janssen * Created : - * Updated : 2003-12-17 + * Updated : 2004-02-23 * Notes : * - * Copyright (c) 1997-2003 Urs Janssen + * Copyright (c) 1997-2004 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -91,7 +91,7 @@ extern void convert_tex2iso(char *from, extern void bcol(int color); extern void fcol(int color); #endif /* HAVE_COLOR */ -extern void draw_pager_line(const char *str, int flags); +extern void draw_pager_line(const char *str, int flags, t_bool raw_data); /* config.c */ extern char **ulBuildArgv(char *cmd, int *new_argc); @@ -190,6 +190,7 @@ extern void write_filter_file(const char /* getline.c */ extern char *tin_getline(const char *prompt, int number_only, const char *str, int max_chars, t_bool passwd, int which_hist); +extern void gl_redraw(void); /* global.c */ extern void bug_report(void); @@ -209,9 +210,7 @@ extern int group_page(struct t_group *gr extern void clear_note_area(void); extern void mark_screen(int level, int screen_row, int screen_col, const char *value); extern void pos_first_unread_thread(void); -extern void set_subj_from_size(int num_cols); extern void show_group_page(void); -extern void toggle_subject_from(void); /* hashstr.c */ extern char *hash_str(const char *s); @@ -254,7 +253,7 @@ extern void free_keymaps(void); /* langinfo.c */ #ifndef NO_LOCALE - extern char *tin_nl_langinfo(nl_item item); + extern const char *tin_nl_langinfo(nl_item item); #endif /* !NO_LOCALE */ /* list.c */ @@ -474,7 +473,7 @@ extern void quick_post_article(t_bool po /* prompt.c */ extern char *prompt_string_default(const char *prompt, char *def, const char *failtext, int history); -extern char *sized_message(const char *format, const char *subject); +extern char *sized_message(char **result, const char *format, const char *subject); extern int prompt_list(int row, int col, int var, constext *help_text, constext *prompt_text, constext *list[], int size); extern int prompt_num(int ch, const char *prompt); extern int prompt_yn(int line, const char *prompt, t_bool default_answer); @@ -519,7 +518,7 @@ extern void rfc1521_encode(char *line, F extern FILE *open_art_fp(struct t_group *group, long art); extern const char *get_param(t_param *list, const char *name); extern char *parse_header(char *buf, const char *pat, t_bool decode, t_bool structured); -extern int art_open(t_bool wrap_lines, struct t_article *art, struct t_group *group, t_openartinfo *artinfo, t_bool show_progress_meter); +extern int art_open(t_bool wrap_lines, struct t_article *art, struct t_group *group, t_openartinfo *artinfo, t_bool show_progress_meter, char *pmesg); extern int content_type(char *type); extern int parse_rfc822_headers(struct t_header *hdr, FILE *from, FILE *to); extern t_part *new_part(t_part *part); @@ -594,6 +593,7 @@ extern size_t my_strftime(char *s, size_ /* string.c */ extern char *eat_tab(char *s); +extern char *fmt_string(const char *fmt, ...); extern char *my_strdup(const char *str); extern char *str_trim(char *string); extern char *tin_ltoa(long value, int digits); diff -Nurp tin-1.7.3/include/rfc2046.h tin-1.7.4/include/rfc2046.h --- tin-1.7.3/include/rfc2046.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/rfc2046.h Sun Dec 28 15:28:49 2003 @@ -6,7 +6,7 @@ * Updated : 2003-05-06 * Notes : rfc2046 MIME article definitions * - * Copyright (c) 2000-2003 Jason Faultless + * Copyright (c) 2000-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/stpwatch.h tin-1.7.4/include/stpwatch.h --- tin-1.7.3/include/stpwatch.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/stpwatch.h Sun Dec 28 15:29:21 2003 @@ -7,7 +7,7 @@ * Notes : Simple stopwatch routines for timing code using timeb * or gettimeofday structs * - * Copyright (c) 1993-2003 Iain Lea + * Copyright (c) 1993-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/tcurses.h tin-1.7.4/include/tcurses.h --- tin-1.7.3/include/tcurses.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/tcurses.h Tue Jan 20 15:37:17 2004 @@ -3,10 +3,10 @@ * Module : tcurses.h * Author : Thomas Dickey * Created : 1997-03-02 - * Updated : 2003-09-29 + * Updated : 2004-01-20 * Notes : curses #include files, #defines & struct's * - * Copyright (c) 1997-2003 Thomas Dickey + * Copyright (c) 1997-2004 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -125,11 +125,15 @@ extern void write_line(int row, char *bu # ifdef NEED_TERM_H # include -# ifdef HAVE_NCURSES_TERM_H -# include +# ifdef HAVE_NCURSESW_TERM_H +# include # else -# include -# endif /* HAVE_NCURSES_TERM_H */ +# ifdef HAVE_NCURSES_TERM_H +# include +# else +# include +# endif /* HAVE_NCURSES_TERM_H */ +# endif /* HAVE_NCURSESW_TERM_H */ # else # ifdef HAVE_TERMCAP_H # include diff -Nurp tin-1.7.3/include/tin.h tin-1.7.4/include/tin.h --- tin-1.7.3/include/tin.h Fri Dec 19 15:35:43 2003 +++ tin-1.7.4/include/tin.h Mon Feb 23 11:45:37 2004 @@ -3,10 +3,10 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-12-19 + * Updated : 2004-02-23 * Notes : #include files, #defines & struct's * - * Copyright (c) 1997-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1997-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -100,6 +100,7 @@ #include enum context { cMain, cArt, cConfig, cFilter, cGroup, cHelp, cInfopager, cPage, cSelect, cThread }; +enum icontext { cNone, cGetline }; enum resizer { cNo, cYes, cRedraw }; enum rc_state { RC_IGNORE, RC_CHECK, RC_UPGRADE, RC_DOWNGRADE, RC_ERROR }; @@ -1947,6 +1948,10 @@ extern void joindir (char *result, const # define S_IXUGO (S_IXUSR|S_IXGRP|S_IXOTH) /* execute permission (all) */ #endif /* !S_IRWXUGO */ +#ifndef S_ISVTX +# define S_ISVTX 0 +#endif /* !S_ISVTX */ + #ifdef DONT_HAVE_PIPING # ifdef VMS # define TIN_PRINTFILE "Sys$Scratch:TIN_PRINT%d.TMP" @@ -2152,6 +2157,12 @@ extern struct tm *localtime(time_t *); #else # define CLOSEDIR(DIR) if (closedir(DIR)) error_message("closedir() failed: %s %s", __FILE__, __LINE__) #endif /* CLOSEDIR_VOID */ + +#ifdef HAVE_GETTIMEOFDAY +# ifndef GETTIMEOFDAY_2ARGS +# define gettimeofday(a,b) gettimeofday(a) +# endif /* GETTIMEOFDAY_2ARGS */ +#endif /* HAVE_GETTIMEOFDAY */ /* libmss */ #ifdef MSS diff -Nurp tin-1.7.3/include/tinrc.h tin-1.7.4/include/tinrc.h --- tin-1.7.3/include/tinrc.h Tue Dec 9 09:44:46 2003 +++ tin-1.7.4/include/tinrc.h Sun Dec 28 15:29:59 2003 @@ -6,7 +6,7 @@ * Updated : 2003-12-09 * Notes : * - * Copyright (c) 1999-2003 Jason Faultless + * Copyright (c) 1999-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/tnntp.h tin-1.7.4/include/tnntp.h --- tin-1.7.3/include/tnntp.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/tnntp.h Tue Jan 20 15:20:59 2004 @@ -1,12 +1,12 @@ /* * Project : tin - a Usenet reader * Module : tnntp.h - * Author : Thomas Dickey + * Author : Thomas Dickey * Created : 1997-03-05 * Updated : 2003-09-19 * Notes : #include files, #defines & struct's * - * Copyright (c) 1997-2003 Thomas Dickey + * Copyright (c) 1997-2004 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/trace.h tin-1.7.4/include/trace.h --- tin-1.7.3/include/trace.h Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/include/trace.h Tue Jan 20 15:21:00 2004 @@ -1,12 +1,12 @@ /* * Project : tin - a Usenet reader * Module : trace.h - * Author : Thomas Dickey + * Author : Thomas Dickey * Created : 1997-03-22 * Updated : 2002-11-10 * Notes : Interface of trace.c * - * Copyright (c) 1997-2003 Thomas Dickey + * Copyright (c) 1997-2004 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/include/version.h tin-1.7.4/include/version.h --- tin-1.7.3/include/version.h Sat Dec 20 18:49:53 2003 +++ tin-1.7.4/include/version.h Wed Feb 25 10:59:01 2004 @@ -6,7 +6,7 @@ * Updated : 2003-09-19 * Notes : * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,10 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "1.7.3" +# define VERSION "1.7.4" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20031220" -# define RELEASENAME "Taransay" +# define RELEASEDATE "20040225" +# define RELEASENAME "Benbecula" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.7" # define ATTRIBUTES_VERSION "1.0.2" diff -Nurp tin-1.7.3/intl/Makefile.in tin-1.7.4/intl/Makefile.in --- tin-1.7.3/intl/Makefile.in Sat Nov 29 22:30:43 2003 +++ tin-1.7.4/intl/Makefile.in Tue Jan 20 15:21:00 2004 @@ -44,13 +44,16 @@ mkinstalldirs = $(SHELL) `case "$(MKINST l = @INTL_LIBTOOL_SUFFIX_PREFIX@ -AR = ar +ARCHIVE = @AR@ @AR_OPTS@ CC = @CC@ LIBTOOL = @LIBTOOL@ RANLIB = @RANLIB@ YACC = @INTLBISON@ -y -d YFLAGS = --name-prefix=__gettext +x = @EXEEXT@ +o = .@OBJEXT@ + DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ -DLIBDIR=\"$(libdir)\" @DEFS@ CPPFLAGS = @CPPFLAGS@ @@ -88,8 +91,8 @@ LTV_REVISION=1 LTV_AGE=0 .SUFFIXES: -.SUFFIXES: .c .y .o .lo .sin .sed -.c.o: +.SUFFIXES: .c .y $o .lo .sin .sed +.c$o: $(COMPILE) $< .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) $< @@ -112,7 +115,7 @@ all-no-no: libintl.a libgnuintl.a: $(OBJECTS) rm -f $@ - $(AR) cru $@ $(OBJECTS) + $(ARCHIVE) $@ $(OBJECTS) $(RANLIB) $@ libintl.la libgnuintl.la: $(OBJECTS) @@ -269,7 +272,7 @@ ID: $(HEADERS) $(SOURCES) mostlyclean: - rm -f *.a *.la *.o *.lo core core.* + rm -f *.a *.la *$o *.lo core core.* rm -f libintl.h charset.alias ref-add.sed ref-del.sed rm -f -r .libs _libs diff -Nurp tin-1.7.3/intl/dcigettext.c tin-1.7.4/intl/dcigettext.c --- tin-1.7.3/intl/dcigettext.c Sat Nov 29 22:30:43 2003 +++ tin-1.7.4/intl/dcigettext.c Tue Jan 20 15:21:00 2004 @@ -27,25 +27,30 @@ # include #endif -#include - +/* see AC_FUNC_ALLOCA macro */ #ifdef __GNUC__ # define alloca __builtin_alloca -# define HAVE_ALLOCA 1 #else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if HAVE_ALLOCA_H +# include # else -# ifndef alloca +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# endif # endif # endif # endif #endif +#include + #include #ifndef errno extern int errno; @@ -766,7 +771,7 @@ _nl_find_msg (domain_file, domainbinding + W (domain->must_swap, domain->trans_tab[act].offset)); resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; -#if defined _LIBC || HAVE_ICONV +#if defined _LIBC || defined HAVE_ICONV if (domain->codeset_cntr != (domainbinding != NULL ? domainbinding->codeset_cntr : 0)) { @@ -781,7 +786,7 @@ _nl_find_msg (domain_file, domainbinding # ifdef _LIBC domain->conv != (__gconv_t) -1 # else -# if HAVE_ICONV +# ifdef HAVE_ICONV domain->conv != (iconv_t) -1 # endif # endif @@ -859,7 +864,7 @@ _nl_find_msg (domain_file, domainbinding inbuf = result; # else -# if HAVE_ICONV +# ifdef HAVE_ICONV const char *inptr = (const char *) inbuf; size_t inleft = resultlen; char *outptr = (char *) outbuf; diff -Nurp tin-1.7.3/intl/gettextP.h tin-1.7.4/intl/gettextP.h --- tin-1.7.3/intl/gettextP.h Sat Nov 29 22:30:43 2003 +++ tin-1.7.4/intl/gettextP.h Tue Jan 20 15:21:00 2004 @@ -25,7 +25,7 @@ #ifdef _LIBC # include "../iconv/gconv_int.h" #else -# if HAVE_ICONV +# ifdef HAVE_ICONV # include # endif #endif @@ -132,7 +132,7 @@ struct loaded_domain #ifdef _LIBC __gconv_t conv; #else -# if HAVE_ICONV +# ifdef HAVE_ICONV iconv_t conv; # endif #endif @@ -237,11 +237,11 @@ extern char *bind_textdomain_codeset__ P #endif #ifdef _LIBC -extern void __gettext_free_exp PARAMS ((struct expression *exp)) +extern void __gettext_free_exp PARAMS ((struct expression *_exp)) internal_function; extern int __gettextparse PARAMS ((void *arg)); #else -extern void gettext_free_exp__ PARAMS ((struct expression *exp)) +extern void gettext_free_exp__ PARAMS ((struct expression *_exp)) internal_function; extern int gettextparse__ PARAMS ((void *arg)); #endif diff -Nurp tin-1.7.3/intl/loadmsgcat.c tin-1.7.4/intl/loadmsgcat.c --- tin-1.7.3/intl/loadmsgcat.c Sat Nov 29 22:30:43 2003 +++ tin-1.7.4/intl/loadmsgcat.c Tue Jan 20 15:21:00 2004 @@ -27,29 +27,34 @@ # include #endif -#include -#include -#include -#include -#include - +/* see AC_FUNC_ALLOCA macro */ #ifdef __GNUC__ # define alloca __builtin_alloca -# define HAVE_ALLOCA 1 #else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if HAVE_ALLOCA_H +# include # else -# ifndef alloca +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# endif # endif # endif # endif #endif +#include +#include +#include +#include +#include + #include #include @@ -101,15 +106,6 @@ char *alloca (); # define PLURAL_PARSE gettextparse__ #endif -/* For those losing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -# define freea(p) /* nothing */ -#else -# define alloca(n) malloc (n) -# define freea(p) free (p) -#endif - /* For systems that distinguish between text and binary I/O. O_BINARY is usually declared in . */ #if !defined O_BINARY && defined _O_BINARY @@ -223,7 +219,7 @@ _nl_init_domain_conv (domain_file, domai #ifdef _LIBC domain->conv = (__gconv_t) -1; #else -# if HAVE_ICONV +# ifdef HAVE_ICONV domain->conv = (iconv_t) -1; # endif #endif @@ -234,7 +230,7 @@ _nl_init_domain_conv (domain_file, domai if (nullentry != NULL) { -#if defined _LIBC || HAVE_ICONV +#if defined _LIBC || defined HAVE_ICONV const char *charsetstr; charsetstr = strstr (nullentry, "charset="); @@ -326,7 +322,7 @@ _nl_free_domain_conv (domain) if (domain->conv != (__gconv_t) -1) __gconv_close (domain->conv); #else -# if HAVE_ICONV +# ifdef HAVE_ICONV if (domain->conv != (iconv_t) -1) iconv_close (domain->conv); # endif @@ -379,7 +375,7 @@ _nl_load_domain (domain_file, domainbind #else __builtin_expect (fstat (fd, &st) != 0, 0) #endif - || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) + || __builtin_expect ((size = (size_t) st.st_size) != (size_t) st.st_size, 0) || __builtin_expect (size < sizeof (struct mo_file_header), 0)) { /* Something went wrong. */ diff -Nurp tin-1.7.3/intl/localealias.c tin-1.7.4/intl/localealias.c --- tin-1.7.3/intl/localealias.c Sat Nov 29 22:30:43 2003 +++ tin-1.7.4/intl/localealias.c Tue Jan 20 15:21:00 2004 @@ -27,27 +27,40 @@ # include #endif -#include -#include -#include +#undef freea +/* see AC_FUNC_ALLOCA macro */ #ifdef __GNUC__ # define alloca __builtin_alloca -# define HAVE_ALLOCA 1 #else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if HAVE_ALLOCA_H +# include # else -# ifndef alloca +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# else +# define freea(n) free(n) +# endif # endif # endif # endif #endif +#ifndef freea +#define freea(n) /* nothing */ +#endif + +#include +#include +#include + #include #include @@ -80,15 +93,6 @@ __libc_lock_define_initialized (static, #ifndef internal_function # define internal_function -#endif - -/* For those losing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -# define freea(p) /* nothing */ -#else -# define alloca(n) malloc (n) -# define freea(p) free (p) #endif #if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED diff -Nurp tin-1.7.3/pcre/Makefile.in tin-1.7.4/pcre/Makefile.in --- tin-1.7.3/pcre/Makefile.in Sat Dec 13 13:11:27 2003 +++ tin-1.7.4/pcre/Makefile.in Tue Jan 20 15:21:00 2004 @@ -11,8 +11,18 @@ srcdir = @srcdir@ VPATH = $(srcdir) @SET_MAKE@ -CC = @CC@ -CFLAGS = @CFLAGS@ @PCRE_DEFINES@ +CC = @CC@ +CFLAGS = @CFLAGS@ @PCRE_DEFINES@ + +x = @EXEEXT@ +o = .@OBJEXT@ + +BUILD_CC = @BUILD_CC@ +BUILD_CFLAGS = @BUILD_CFLAGS@ +BUILD_CPPFLAGS = @BUILD_CPPFLAGS@ +BUILD_LDFLAGS = @BUILD_LDFLAGS@ +BUILD_LIBS = @BUILD_LIBS@ +X = $(BUILD_EXEEXT) # The -D options correspond to pcre 4.1's default values. CPPOPTS = \ @@ -24,84 +34,84 @@ CPPOPTS = \ RANLIB = @RANLIB@ RM = rm -x = @PROG_EXT@ + PRELIB = @LIB_PREFIX@ -AR = ar cq +ARCHIVE = @AR@ @AR_OPTS@ ########################################################################## OBJ = \ - maketables.o \ - get.o \ - study.o \ - pcre.o + maketables$o \ + get$o \ + study$o \ + pcre$o PCR_DEP = \ internal.h \ pcre.h -all: $(PRELIB)pcre.a $(PRELIB)pcreposix.a pcretest$x pgrep$x +all : $(PRELIB)pcre.a $(PRELIB)pcreposix.a pcretest$x pgrep$x -.SUFFIXES: .i +.SUFFIXES : .i -.c.o: +.c$o : @SHOW_CC@ @ECHO_CC@$(CC) $(CPPOPTS) $(CFLAGS) -c $(srcdir)/$*.c -.c.i: +.c.i : @SHOW_CC@ @ECHO_CC@$(CPP) -C $(CPPOPTS) $*.c >$@ -pgrep$x: $(PRELIB)pcre.a pcregrep.o - $(CC) $(CFLAGS) -o $@ pcregrep.o $(PRELIB)pcre.a +pgrep$x : $(PRELIB)pcre.a pcregrep$o + $(CC) $(CFLAGS) -o $@ pcregrep$o $(PRELIB)pcre.a -pcretest$x: $(PRELIB)pcre.a $(PRELIB)pcreposix.a pcretest.o - $(CC) $(CFLAGS) -o $@ pcretest.o $(PRELIB)pcre.a $(PRELIB)pcreposix.a +pcretest$x : $(PRELIB)pcre.a $(PRELIB)pcreposix.a pcretest$o + $(CC) $(CFLAGS) -o $@ pcretest$o $(PRELIB)pcre.a $(PRELIB)pcreposix.a -$(PRELIB)pcre.a: $(OBJ) +$(PRELIB)pcre.a : $(OBJ) $(RM) -f $(PRELIB)pcre.a - $(AR) $(PRELIB)pcre.a $(OBJ) + $(ARCHIVE) $(PRELIB)pcre.a $(OBJ) $(RANLIB) $(PRELIB)pcre.a -$(PRELIB)pcreposix.a: pcreposix.o +$(PRELIB)pcreposix.a : pcreposix$o $(RM) -f $(PRELIB)pcreposix.a - $(AR) $(PRELIB)pcreposix.a pcreposix.o + $(ARCHIVE) $(PRELIB)pcreposix.a pcreposix$o $(RANLIB) $(PRELIB)pcreposix.a -pcre.o: chartables.c pcre.c $(PCR_DEP) +pcre$o : chartables.c pcre.c $(PCR_DEP) -pcreposix.o: pcreposix.c pcreposix.h $(PCR_DEP) +pcreposix$o : pcreposix.c pcreposix.h $(PCR_DEP) -maketables.o: maketables.c $(PCR_DEP) +maketables$o : maketables.c $(PCR_DEP) @SHOW_CC@ @ECHO_CC@$(CC) $(CPPOPTS) $(CFLAGS) -c $(srcdir)/maketables.c -get.o: get.c $(PCR_DEP) +get$o : get.c $(PCR_DEP) -study.o: study.c $(PCR_DEP) +study$o : study.c $(PCR_DEP) -pcretest.o: pcretest.c pcre.h +pcretest$o : pcretest.c pcre.h -pcregrep.o: pcregrep.c pcre.h +pcregrep$o : pcregrep.c pcre.h # An auxiliary program makes the default character table source -chartables.c: dftables$x - ./dftables$x $@ +chartables.c : dftables$X + ./dftables$X $@ -dftables$x: dftables.c maketables.c $(PCR_DEP) +dftables$X : dftables.c maketables.c $(PCR_DEP) @SHOW_CC@ - @ECHO_CC@$(CC) -o $@ $(CFLAGS) $(CPPOPTS) $(srcdir)/dftables.c + @ECHO_CC@$(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(CPPOPTS) $(srcdir)/dftables.c # We deliberately omit dftables and chartables.c from 'make clean'; once made # chartables.c shouldn't change, and if people have edited the tables by hand, # you don't want to throw them away. -clean:; $(RM) -f *.o *.a pcretest$x pgrep$x +clean :; $(RM) -f *$o *.a pcretest$x pgrep$x -distclean: clean ; $(RM) -f pcre.h dftables$x chartables.c RunTest +distclean : clean ; $(RM) -f pcre.h dftables$X chartables.c RunTest -runtest: all +runtest : all ./RunTest # End Binary files tin-1.7.3/po/de.gmo and tin-1.7.4/po/de.gmo differ diff -Nurp tin-1.7.3/po/de.po tin-1.7.4/po/de.po --- tin-1.7.3/po/de.po Sat Dec 20 18:45:10 2003 +++ tin-1.7.4/po/de.po Wed Feb 25 10:34:09 2004 @@ -5,8 +5,8 @@ # Christian Garbs , 2003 # msgid "" -msgstr "Project-Id-Version: tin 1.7.0\n" - "POT-Creation-Date: 2003-12-20 18:42+0100\n" +msgstr "Project-Id-Version: tin 1.7.4\n" + "POT-Creation-Date: 2004-02-25 10:33+0100\n" "PO-Revision-Date: 2003-03-13 04:15+0200\n" "Last-Translator: Sven Hartge , Kai Bojens " "\n" @@ -15,7 +15,7 @@ msgstr "Project-Id-Version: tin 1.7.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1425 +#: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Fehlerhafter Overview-Datensatz (%d Felder) '%s'" @@ -283,7 +283,7 @@ msgstr "(unbekannt)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:608 src/filter.c:616 +#: src/filter.c:612 src/filter.c:620 msgid "Removed from the previous rule: " msgstr "Aus der vorigen Regel gelöscht: " @@ -512,8 +512,8 @@ msgid "*** Beginning of article ***" msgstr "*** Anfang des Artikels ***" #: 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): " +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:98 msgid "Cancelling article..." @@ -635,7 +635,7 @@ msgstr "Erzeuge die Datei 'active' für g msgid "Creating newsrc file...\n" msgstr "Erzeuge newsrc Datei...\n" -#: src/lang.c:127 src/lang.c:1126 +#: src/lang.c:127 src/lang.c:1118 msgid "Default" msgstr "Voreinstellung" @@ -1271,8 +1271,8 @@ msgid "0 - 9\t display article by numbe msgstr "0 - 9\t zeigt Artikel nach Nummern sortiert im aktuellen Thread" #: src/lang.c:283 -msgid "cancel (delete) current article; must have been posted by you" -msgstr "cancelt (löscht) den aktuellen Artikel; dieser muß von Ihnen sein" +msgid "cancel (delete) or supersede (overwrite) current article" +msgstr "cancelt (löscht) oder ersetzt den aktuellen Artikel" #: src/lang.c:284 msgid "edit article (mail-groups only)" @@ -1318,7 +1318,7 @@ msgstr "nächsten Artikel anzeigen" msgid "display first article in next thread" msgstr "zeigt den ersten Artikel im nächsten Thread an" -#: src/lang.c:295 src/lang.c:302 src/lang.c:361 src/lang.c:362 +#: src/lang.c:295 msgid "display next unread article" msgstr "nächsten ungelesenen Artikel anzeigen" @@ -1330,7 +1330,7 @@ msgstr "(Bezugs)Artikel anzeigen, den de msgid "display previous article" msgstr "vorhergehenden Artikel anzeigen" -#: src/lang.c:298 src/lang.c:364 +#: src/lang.c:298 msgid "display previous unread article" msgstr "vorhergehenden ungelesenen Artikel anzeigen" @@ -1346,194 +1346,198 @@ msgstr "markiert (hervorheben) Artikel u msgid "return to group selection level" msgstr "kehrt zum Gruppenauswahlmenü zurück" -#: src/lang.c:303 +#: src/lang.c:302 msgid "reply through mail to author" msgstr "Antwort per Mail an den Autor" -#: src/lang.c:304 +#: src/lang.c:303 msgid "reply through mail (don't copy text) to author" msgstr "Antwort per Mail an den Autor (ohne Zitieren des Textes)" -#: src/lang.c:305 +#: src/lang.c:304 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:306 src/lang.c:366 +#: src/lang.c:305 msgid "repost chosen article to another group" msgstr "gewählten Artikel in eine andere Gruppe reposten" -#: src/lang.c:307 +#: src/lang.c:306 msgid "search backwards within this article" msgstr "sucht rückwärts innerhalb des Artikels" -#: src/lang.c:308 +#: src/lang.c:307 msgid "search forwards within this article" msgstr "sucht vorwärts innerhalb des Artikels" -#: src/lang.c:309 +#: src/lang.c:308 msgid "show article in raw-mode (including all headers)" msgstr "Artikel im Rohformat (inklusive aller Header) anzeigen" -#: src/lang.c:310 +#: src/lang.c:309 msgid "skip next block of included text" msgstr "überspringt den nächsten Zitatblock" -#: src/lang.c:311 +#: src/lang.c:310 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:312 +#: src/lang.c:311 msgid "toggle word highlighting on/off" msgstr "schaltet das Wort-Hervorheben ein/aus" -#: src/lang.c:313 +#: src/lang.c:312 msgid "toggle ROT-13 (basic decode) for current article" msgstr "(de)aktiviert ROT-13 Dekodierung für den aktuellen Artikel" -#: src/lang.c:314 +#: src/lang.c:313 msgid "toggle tabwidth 4 <-> 8" msgstr "wechsle Tabulatorweite 4 <-> 8" -#: src/lang.c:315 +#: src/lang.c:314 msgid "toggle german TeX style decoding for current article" msgstr "(de)aktiviere deutsche TeX-style Dekodierung für aktuellen Artikel" -#: src/lang.c:316 +#: src/lang.c:315 msgid "toggle display of uuencoded sections" msgstr "Anzeige von UU-kodierten Teilen umschalten" -#: src/lang.c:317 +#: src/lang.c:316 msgid "View/save multimedia attachments" msgstr "Multimedia-Anhänge anzeigen/speichern" -#: src/lang.c:318 +#: src/lang.c:317 #, c-format msgid "report bug or comment via mail to %s" msgstr "sendet Fehlerbericht oder Kommentar via Mail an %s" -#: src/lang.c:319 +#: src/lang.c:318 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:320 +#: src/lang.c:319 msgid "escape from command prompt" msgstr "Verlassen der Kommandozeile" -#: src/lang.c:321 +#: src/lang.c:320 msgid "get help" msgstr "zeigt die Hilfe" -#: src/lang.c:322 +#: src/lang.c:321 msgid "display last article viewed" msgstr "zeigt den zuletzt angezeigten Artikel an" -#: src/lang.c:323 +#: src/lang.c:322 msgid "down one line" msgstr "eine Zeile runter" -#: src/lang.c:324 +#: src/lang.c:323 msgid "up one line" msgstr "eine Zeile hoch" -#: src/lang.c:325 +#: src/lang.c:324 msgid "go to article chosen by Message-ID" msgstr "Artikel mit dieser Message-ID anzeigen" -#: src/lang.c:326 +#: src/lang.c:325 msgid "mail article/thread/hot/pattern/tagged articles to someone" msgstr "Artikel/Thread/hervorgeh./markierten Artikel per Mail weiterleiten" -#: src/lang.c:327 +#: src/lang.c:326 msgid "menu of configurable options" msgstr "Menü der konfigurierbaren Optionen" -#: src/lang.c:328 +#: src/lang.c:327 msgid "down one page" msgstr "eine Seite runter" -#: src/lang.c:329 +#: src/lang.c:328 msgid "up one page" msgstr "eine Seite hoch" -#: src/lang.c:330 +#: src/lang.c:329 msgid "post (write) article to current group" msgstr "poste (schreibe) Artikel in die aktuelle Gruppe" -#: src/lang.c:331 +#: src/lang.c:330 msgid "post postponed articles" msgstr "poste zurückgestellte Artikel" -#: src/lang.c:332 +#: src/lang.c:331 msgid "list articles posted by you (from posted file)" msgstr "listet ihre geposteten Artikel auf (aus der 'posted' Datei)" -#: src/lang.c:333 +#: src/lang.c:332 msgid "return to previous menu" msgstr "kehrt zum vorherigen Menü zurück" -#: src/lang.c:334 +#: src/lang.c:333 msgid "quit tin immediately" msgstr "beendet tin sofort" -#: src/lang.c:335 +#: src/lang.c:334 msgid "redraw page" msgstr "Bildschirmdarstellung neu zeichnen" -#: src/lang.c:336 +#: src/lang.c:335 msgid "save article/thread/hot/pattern/tagged articles to file" msgstr "speichert Artikel/Thread hervorgehoben/muster/markierten Artikel" -#: src/lang.c:337 +#: src/lang.c:336 msgid "save marked articles automatically without user prompts" msgstr "speichert markierte Artikel automatisch ohne Nachfrage" -#: src/lang.c:338 +#: src/lang.c:337 msgid "search for articles by author backwards" msgstr "sucht rückwärts nach Artikeln von Autor" -#: src/lang.c:339 +#: src/lang.c:338 msgid "search for articles by author forwards" msgstr "sucht vorwärts nach Artikeln von Autor" -#: src/lang.c:340 +#: src/lang.c:339 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:341 +#: src/lang.c:340 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:342 +#: src/lang.c:341 msgid "search for articles by Subject line backwards" msgstr "durchsucht Artikel rückwärts nach Subject Zeile" -#: src/lang.c:343 +#: src/lang.c:342 msgid "search for articles by Subject line forwards" msgstr "durchsucht Artikel vorwärts nach Subject Zeile" -#: src/lang.c:344 +#: src/lang.c:343 msgid "repeat last search" msgstr "letzte Suche wiederholen" -#: src/lang.c:345 +#: src/lang.c:344 msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "markiere Artikel für nochmaliges posten/pipen/drucken/abspeichern" -#: src/lang.c:346 +#: src/lang.c:345 msgid "toggle info message in last line (subject/description)" msgstr "Anzeige von Subject/Beschreibung in d. letzten Zeile (de)aktivieren" -#: src/lang.c:347 +#: src/lang.c:346 msgid "toggle inverse video" msgstr "(de)aktiviert inverse Darstellung" -#: src/lang.c:348 +#: src/lang.c:347 msgid "toggle mini help menu display" msgstr "schaltet das Minihilfemenü ein/aus" +#: src/lang.c:348 +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:349 msgid "show version information" msgstr "zeige Versionsinformationen" @@ -1550,330 +1554,326 @@ msgstr "markiere Artikel gelesen; öffne msgid "choose first thread in list" msgstr "Wähle ersten Thread in der Liste" -#: src/lang.c:353 src/lang.c:384 -msgid "choose group by name" -msgstr "Gruppe anhand des Namens auswählen" - -#: src/lang.c:354 +#: src/lang.c:353 msgid "choose last thread in list" msgstr "Wähle letzten Thread in der Liste" -#: src/lang.c:355 +#: src/lang.c:354 msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "listet Artikel im aktuellen Thread (öffnet das Thread Untermenü)" -#: src/lang.c:356 +#: src/lang.c:355 msgid "mark article as unread" msgstr "markiert Artikel als ungelesen" -#: src/lang.c:357 +#: src/lang.c:356 msgid "mark current thread or tagged threads as read" msgstr "markiert den aktuellen Thread oder markierte Artikel als gelesen" -#: src/lang.c:358 +#: src/lang.c:357 msgid "mark thread as unread" msgstr "markiert den aktuellen Thread als ungelesen" -#: src/lang.c:359 +#: src/lang.c:358 msgid "toggle display of all/selected articles" msgstr "wechselt zwischen der Anzeige aller/markierter (hot) Artikel" -#: src/lang.c:360 +#: src/lang.c:359 msgid "display next group" msgstr "zeige nächste Gruppe" -#: src/lang.c:363 +#: src/lang.c:360 msgid "display previous group" msgstr "zeige vorhergehende Gruppe" -#: src/lang.c:365 src/lang.c:413 -msgid "read chosen article" -msgstr "zeige gewählten Artikel" - -#: src/lang.c:367 +#: src/lang.c:361 msgid "toggle all selections (all articles)" msgstr "Markierung 'hot'/wichtig für alle Artikel umschalten" -#: src/lang.c:368 +#: src/lang.c:362 msgid "select group (make \"hot\")" msgstr "Markierung 'hot'/wichtig für Gruppe setzen" -#: src/lang.c:369 +#: src/lang.c:363 msgid "select thread" msgstr "Markierung 'hot'/wichtig für Thread setzen" # TODO: formating -#: src/lang.c:370 +#: src/lang.c:364 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:371 +#: src/lang.c:365 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:372 +#: src/lang.c:366 msgid "tag all parts of current multipart-message in order" msgstr "markiert alle Teile der multipart-Nachrichten in der Reihenfolge" -#: src/lang.c:373 +#: src/lang.c:367 msgid "0 - 9\t choose thread by number" msgstr "0 - 9\t wählt Thread anhand der Nummer" -#: src/lang.c:374 +#: src/lang.c:368 msgid "toggle limit number of articles to get, and reload" msgstr "Anzahl der zu holenden oder wieder zu ladenden Artikel ändern" -#: src/lang.c:375 +#: src/lang.c:369 msgid "toggle display of all/unread articles" msgstr "wechselt zwischen der Anzeige aller/ungelesener Artikel" -#: src/lang.c:376 src/lang.c:414 -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:377 +#: src/lang.c:370 msgid "toggle selection of thread" msgstr "Markierung 'hot'/wichtig für Thread setzen/entfernen" -#: src/lang.c:378 +#: src/lang.c:371 msgid "cycle through threading options available" msgstr "wechsle durch die verschiedenen Threading-Optionen" -#: src/lang.c:379 +#: src/lang.c:372 msgid "undo all selections (all articles)" msgstr "Markierung 'hot'/wichtig für alle Artikel entfernen" -#: src/lang.c:380 +#: src/lang.c:373 msgid "untag all tagged threads" msgstr "hebt die Markierung der markierten Artikel auf" -#: src/lang.c:381 +#: src/lang.c:374 msgid "mark all articles in group as read" msgstr "markiert alle Artikel der Gruppe als gelesen" -#: src/lang.c:382 +#: src/lang.c:375 msgid "mark all articles in group as read and move to next unread group" msgstr "markiert Gruppe als gelesen, springt zur nächsten mit ungel. Artikeln" -#: src/lang.c:383 +#: src/lang.c:376 msgid "choose first group in list" msgstr "Wähle erste Gruppe in der Liste" -#: src/lang.c:385 +#: src/lang.c:377 +msgid "choose group by name" +msgstr "Gruppe anhand des Namens auswählen" + +#: src/lang.c:378 msgid "0 - 9\t choose group by number" msgstr "0 - 9\t wählt die Gruppe anhand der Nummer" -#: src/lang.c:386 +#: src/lang.c:379 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:387 +#: src/lang.c:380 msgid "choose last group in list" msgstr "Wähle letzte Gruppe in der Liste" -#: src/lang.c:388 +#: src/lang.c:381 msgid "mark all articles in chosen group unread" msgstr "markiert alle Artikel in der gewählten Gruppe als ungelesen" -#: src/lang.c:389 +#: src/lang.c:382 msgid "move chosen group within list" msgstr "bewegt die gewählte Gruppe innerhalb der Liste" -#: src/lang.c:390 +#: src/lang.c:383 msgid "choose next group with unread news" msgstr "wählt die nächste Gruppe mit ungelesenen Artikeln" -#: src/lang.c:391 src/lang.c:1173 +#: src/lang.c:384 src/lang.c:1165 msgid "quit" msgstr "Beenden" -#: src/lang.c:392 +#: src/lang.c:385 msgid "quit without saving configuration changes" msgstr "beenden ohne die Konfigurationsänderungen zu sichern" -#: src/lang.c:393 +#: src/lang.c:386 msgid "read chosen group" msgstr "liest ausgewählte Gruppe" -#: src/lang.c:394 +#: src/lang.c:387 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr "setzt die .newsrc zurück (alle Artikel als gelesen markiert)" -#: src/lang.c:395 +#: src/lang.c:388 msgid "search backwards for a group name" msgstr "sucht rückwärts nach einem Gruppennamen" -#: src/lang.c:396 +#: src/lang.c:389 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:397 +#: src/lang.c:390 msgid "search forwards for a group name" msgstr "suche vorwärts nach einer Gruppe" -#: src/lang.c:398 +#: src/lang.c:391 msgid "subscribe to chosen group" msgstr "abonniert ausgewählte Gruppe" -#: src/lang.c:399 +#: src/lang.c:392 msgid "subscribe to groups that match pattern" msgstr "abonniere Gruppen, die auf das Muster passen" -#: src/lang.c:400 +#: src/lang.c:393 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:401 +#: src/lang.c:394 msgid "toggle display of group name only or group name plus description" msgstr "Anzeige der Kurzbeschreibung der Gruppe (de)aktivieren." -#: src/lang.c:402 +#: src/lang.c:395 msgid "toggle display to show all/unread subscribed groups" msgstr "wechselt die Anzeige zwischen allen/ungelesenen abonnierten Gruppen" -#: src/lang.c:403 +#: src/lang.c:396 msgid "unsubscribe from chosen group" msgstr "bestellt ausgewählte Gruppe ab" -#: src/lang.c:404 +#: src/lang.c:397 msgid "unsubscribe from groups that match pattern" msgstr "bestelle Gruppen ab, die auf das Muster passen" -#: src/lang.c:405 +#: src/lang.c:398 msgid "sort the list of groups" msgstr "Liste der Gruppen sortieren" -#: src/lang.c:406 +#: src/lang.c:399 msgid "toggle display to show all/subscribed groups" msgstr "schaltet um zwischen der Anzeige aller/abonnierten Gruppen" -#: src/lang.c:407 +#: src/lang.c:400 msgid "0 - 9\t choose article by number" msgstr "0 - 9\t Wähle Artikel anhand der Nummer" -#: src/lang.c:408 +#: src/lang.c:401 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:409 +#: src/lang.c:402 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:410 +#: src/lang.c:403 msgid "choose first article in list" msgstr "wähle ersten Artikel in der Liste" -#: src/lang.c:411 +#: src/lang.c:404 msgid "choose last article in list" msgstr "wähle letzten Artikel in der Liste" -#: src/lang.c:412 +#: src/lang.c:405 msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "markiert Artikel als gelesen geht zum nächsten ungelesenen Artikel" -#: src/lang.c:415 +#: src/lang.c:406 +msgid "read chosen article" +msgstr "zeige gewählten Artikel" + +#: src/lang.c:407 msgid "Display properties\n" "------------------" msgstr "Darstellungsoptionen\n" "--------------------" -#: src/lang.c:416 +#: src/lang.c:408 msgid "Miscellaneous\n" "-------------" msgstr "Verschiedenes\n" "-------------" -#: src/lang.c:417 +#: src/lang.c:409 msgid "Moving around\n" "-------------" msgstr "Position ändern\n" "---------------" -#: src/lang.c:418 +#: src/lang.c:410 msgid "Group/thread/article operations\n" "-------------------------------" msgstr "Gruppe/Thread/Artikel Kommandos\n" "-------------------------------" -#: src/lang.c:420 +#: src/lang.c:412 msgid "Group Level Commands" msgstr "Gruppenlevel Befehle" -#: src/lang.c:421 +#: src/lang.c:413 msgid "Kill filter added" msgstr "Killfilter hinzugefügt" -#: src/lang.c:422 +#: src/lang.c:414 msgid "Auto-selection filter added" msgstr "Automatischer Auswahlfilter hinzugefügt" -#: src/lang.c:423 +#: src/lang.c:415 msgid "All parts tagged" msgstr "Alle Teile markiert" -#: src/lang.c:424 +#: src/lang.c:416 msgid "Storing article for later posting" msgstr "Speichert Artikel, um ihn später zu posten" -#: src/lang.c:425 +#: src/lang.c:417 msgid "Please enter a valid character" msgstr "Bitte ein gültiges Zeichen eingeben" -#: src/lang.c:426 +#: src/lang.c:418 #, c-format msgid "Missing part #%d" msgstr "Teil Nummer %d fehlt." -#: src/lang.c:427 +#: src/lang.c:419 msgid "*** No postponed articles ***" msgstr "*** Keine zurückgelegten Artikel ***" -#: src/lang.c:428 +#: src/lang.c:420 msgid "Not a multi-part message" msgstr "Kein mehrteiliger Artikel" -#: src/lang.c:429 +#: src/lang.c:421 msgid "You are not subscribed to this group" msgstr "Sie haben diese Gruppe nicht abonniert" -#: src/lang.c:430 +#: src/lang.c:422 msgid "No previous expression" msgstr "Kein vorhergehender Ausdruck" -#: src/lang.c:431 +#: src/lang.c:423 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:433 +#: src/lang.c:425 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d zurückgelegte %s, hervorholen mit ^O...\n" -#: src/lang.c:434 +#: src/lang.c:426 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:436 +#: src/lang.c:428 #, 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:437 +#: src/lang.c:429 msgid "TeX2Iso encoded article" msgstr "TeX2Iso kodierter Artikel" -#: src/lang.c:438 +#: src/lang.c:430 msgid "incomplete " msgstr "unvollständige " #. TODO: replace hardcoded key-names -#: src/lang.c:440 +#: src/lang.c:432 #, c-format msgid "\n" "Welcome to %s, a full screen threaded Netnews reader. It can read news " @@ -1931,129 +1931,129 @@ msgstr "\n" "Bitte senden Sie Fehlerberichte und Kommentare mittels des 'R' Kommandos an\n" "%s.\n" -#: src/lang.c:456 +#: src/lang.c:448 #, 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:457 +#: src/lang.c:449 #, c-format msgid "Invalid Sender:-header %s" msgstr "Ungültiger Sender:-Header %s" -#: src/lang.c:458 +#: src/lang.c:450 msgid "Inverse video disabled" msgstr "Inverse Bilddarstellung abgestellt" -#: src/lang.c:459 +#: src/lang.c:451 msgid "Inverse video enabled" msgstr "Inverse Bilddarstellung eingeschaltet" -#: src/lang.c:461 +#: src/lang.c:453 #, c-format msgid "Missing definition for %s\n" msgstr "Fehlende Definition für %s\n" -#: src/lang.c:462 +#: src/lang.c:454 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Ungültige Tastenbelegung '%s'\n" -#: src/lang.c:463 +#: src/lang.c:455 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Ungültiger Tastenname '%s'\n" -#: src/lang.c:464 +#: src/lang.c:456 #, 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:465 +#: src/lang.c:457 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "Filter From: [%s] (j/n): " -#: src/lang.c:466 +#: src/lang.c:458 msgid "Kill Lines: (num): " msgstr "Filter Z.: (num): " -#: src/lang.c:467 +#: src/lang.c:459 msgid "Kill Article Menu" msgstr "Filter Menü (Kill, Bewertung/Score verringern)" -#: src/lang.c:468 +#: src/lang.c:460 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "Filter Msg-Id: [%s] (v/l/n/n): " -#: src/lang.c:469 +#: src/lang.c:461 msgid "Kill pattern scope : " msgstr "Filter nach Muster : " -#: src/lang.c:470 +#: src/lang.c:462 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Filter Subject:[%s] (j/n): " -#: src/lang.c:471 +#: src/lang.c:463 msgid "Kill text pattern : " msgstr "Filter Textmuster : " -#: src/lang.c:472 +#: src/lang.c:464 msgid "Kill time in days : " msgstr "Filterzeit in Tagen : " -#: src/lang.c:474 +#: src/lang.c:466 msgid "Last" msgstr "Letzte" -#: src/lang.c:475 +#: src/lang.c:467 msgid "-- Last response --" msgstr "-- Letzte Antwort --" -#: src/lang.c:476 +#: src/lang.c:468 #, c-format msgid "Lines %s " msgstr "Zeilen %s " -#: src/lang.c:478 +#: src/lang.c:470 msgid "Message-ID: line " msgstr "Message-ID: Zeile " -#: src/lang.c:480 +#: src/lang.c:472 msgid "mailbox " msgstr "Mailbox " -#: src/lang.c:481 +#: src/lang.c:473 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Mailt Artikel an [%.*s]> " -#: src/lang.c:482 +#: src/lang.c:474 #, c-format msgid "Mailing log to %s\n" msgstr "Maile Log-Datei an %s\n" -#: src/lang.c:483 +#: src/lang.c:475 msgid "Mail bug report..." msgstr "Maile einen Fehlerbericht..." -#: src/lang.c:484 +#: src/lang.c:476 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Fehlerbericht an %s senden?" -#: src/lang.c:485 +#: src/lang.c:477 msgid "Mailed" msgstr "Gemailt" -#: src/lang.c:486 +#: src/lang.c:478 #, c-format msgid "Mailing to %s..." msgstr "Senden der Mail an %s..." -#: src/lang.c:487 +#: src/lang.c:479 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" @@ -2063,283 +2063,283 @@ msgstr "# [Mail/Speicher] active-Datei. "# Das 4. Feld ist das Basisverzeichnis (z.B. ~/Mail oder ~/News)\n" "#\n" -#: src/lang.c:490 +#: src/lang.c:482 #, c-format msgid "%s marked as unread" msgstr "%s als ungelesen markiert" -#: src/lang.c:491 +#: src/lang.c:483 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "%d von %d %s als gelesen markiert" -#: src/lang.c:492 +#: src/lang.c:484 #, c-format msgid "Mark all articles as read%s?" msgstr "Alle Artikel als gelesen markieren%s?" -#: src/lang.c:493 +#: src/lang.c:485 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "%s=markierte oder %s=aktuellen Artikel auf gelesen setzen. %s=Abbrechen: " -#: src/lang.c:494 +#: src/lang.c:486 #, c-format -msgid "Mark group %.*s as read?" -msgstr "Die Gruppe %.*s als gelesen markieren?" +msgid "Mark group %s as read?" +msgstr "Die Gruppe %s als gelesen markieren?" -#: src/lang.c:495 +#: src/lang.c:487 #, c-format msgid "Mark thread as read%s?" msgstr "Den Thread als gelesen markieren%s?" -#: src/lang.c:496 +#: src/lang.c:488 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "%s=markierte oder %s=aktuellen Artikel/Thread auf gelesen setzen. " "%s=Abbrechen: " -#: src/lang.c:497 +#: src/lang.c:489 #, c-format msgid "Matching %s groups..." msgstr "Übereinstimmende %s Gruppen..." -#: src/lang.c:498 src/lang.c:502 +#: src/lang.c:490 src/lang.c:494 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=Wähle n; %s=n. ungel.; %s=Suche; %s=Filter" -#: src/lang.c:499 +#: src/lang.c:491 #, 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:500 +#: src/lang.c:492 #, 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:501 +#: src/lang.c:493 #, 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:503 +#: src/lang.c:495 #, 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:504 +#: src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=Wähle n; %s=n. ungel.; %s,%s=Suche; %s=Catchup" -#: src/lang.c:505 +#: src/lang.c:497 #, 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:506 +#: src/lang.c:498 #, 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:507 +#: src/lang.c:499 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=Wähle n; %s=n. ungel.; %s=Catchup; %s=Infozeile" -#: src/lang.c:508 +#: src/lang.c:500 #, 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:509 +#: src/lang.c:501 msgid "--More--" msgstr "--Mehr--" -#: src/lang.c:510 +#: src/lang.c:502 #, c-format msgid "Moving %s..." msgstr "Verschiebe %s..." -#: src/lang.c:512 +#: src/lang.c:504 msgid ", name: " msgstr ", Name: " -#: src/lang.c:513 +#: src/lang.c:505 #, c-format msgid "Goto newsgroup [%s]> " msgstr "Gehe zu Gruppe [%s]> " -#: src/lang.c:514 +#: src/lang.c:506 msgid "newsgroups" msgstr "Gruppen" -#: src/lang.c:515 +#: src/lang.c:507 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Position %s in der Gruppenliste (1,2,..,$) [%d]> " -#: src/lang.c:516 +#: src/lang.c:508 msgid "newsgroup" msgstr "Gruppe" -#: src/lang.c:517 +#: src/lang.c:509 msgid "Try and save newsrc file again?" msgstr "Erneut versuchen, die newsrc-Datei zu schreiben?" -#: src/lang.c:518 +#: src/lang.c:510 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "Warnung: Keine Newsgruppen in die newsrc geschrieben. Speicherabbruch" -#: src/lang.c:519 +#: src/lang.c:511 msgid "newsrc file saved successfully.\n" msgstr "newsrc-Datei erfolgreich geschrieben.\n" -#: src/lang.c:520 +#: src/lang.c:512 msgid "-- Next response --" msgstr "-- Nächste Antwort --" -#: src/lang.c:521 +#: src/lang.c:513 #, c-format msgid "NNTP authorization password not found for %s" msgstr "NNTP Anmeldepasswort für %s nicht gefunden" -#: src/lang.c:522 +#: src/lang.c:514 msgid "No " msgstr "Nein" -#: src/lang.c:523 +#: src/lang.c:515 msgid "*** No articles ***" msgstr "*** Keine Artikel ***" -#: src/lang.c:524 +#: src/lang.c:516 msgid "No articles have been posted" msgstr "Es wurden keine Artikel gepostet" -#: src/lang.c:525 +#: src/lang.c:517 msgid "*** No description ***" msgstr "*** Keine Kurzbeschreibung ***" -#: src/lang.c:526 +#: src/lang.c:518 msgid "No filename" msgstr "Kein Dateiname" -#: src/lang.c:527 +#: src/lang.c:519 msgid "No group" msgstr "Keine Gruppe" -#: src/lang.c:528 +#: src/lang.c:520 msgid "*** No groups ***" msgstr "*** Keine Newsgruppen ***" -#: src/lang.c:529 +#: src/lang.c:521 msgid "No more groups to read" msgstr "Keine Gruppen zum Lesen übrig" -#: src/lang.c:530 +#: src/lang.c:522 msgid "No last message" msgstr "Keine letzte Nachricht" -#: src/lang.c:531 +#: src/lang.c:523 msgid "No mail address" msgstr "Keine EMail-Adresse" -#: src/lang.c:532 +#: src/lang.c:524 msgid "No articles marked for saving" msgstr "Keine Artikel zum Speichern markiert" -#: src/lang.c:533 +#: src/lang.c:525 msgid "No match" msgstr "Kein Treffer" -#: src/lang.c:534 +#: src/lang.c:526 msgid "No more groups" msgstr "Keine Gruppen mehr" -#: src/lang.c:535 +#: src/lang.c:527 msgid "No newsgroups" msgstr "Keine Newsgruppen" -#: src/lang.c:536 +#: src/lang.c:528 msgid "No next unread article" msgstr "Kein nächster ungelesener Artikel" -#: src/lang.c:537 +#: src/lang.c:529 msgid "No previous group" msgstr "Keine vorherige Gruppe" -#: src/lang.c:538 +#: src/lang.c:530 msgid "No previous unread article" msgstr "Kein vorheriger ungelesener Artikel" -#: src/lang.c:539 +#: src/lang.c:531 msgid "No responses" msgstr "Keine Antworten" -#: src/lang.c:540 +#: src/lang.c:532 msgid "No responses to list in current thread" msgstr "Keine Antworten vorhanden im aktuellen Thread" -#: src/lang.c:541 +#: src/lang.c:533 msgid "No search string" msgstr "Kein Suchmuster" -#: src/lang.c:542 +#: src/lang.c:534 msgid "No subject" msgstr "Kein Subject" -#: src/lang.c:543 +#: src/lang.c:535 #, 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:544 +#: src/lang.c:536 #, 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:545 +#: src/lang.c:537 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminal muss Schirmlöschen (cl) unterstützen\n" -#: src/lang.c:546 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal muss Cursor-Bewegungen unterstützen (cm)\n" -#: src/lang.c:547 +#: src/lang.c:539 #, 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:548 +#: src/lang.c:540 #, c-format msgid "No viewer found for %s/%s\n" msgstr "Kein Programm für %s/%s gefunden\n" -#: src/lang.c:549 +#: src/lang.c:541 msgid "Newsgroup does not exist on this server" msgstr "Newsgruppe existiert nicht auf diesem Server" -#: src/lang.c:550 +#: src/lang.c:542 #, c-format msgid "Group %s not found in active file" msgstr "Gruppe %s nicht in der Active-Datei gefunden" -#: src/lang.c:551 +#: src/lang.c:543 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:552 +#: src/lang.c:544 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:553 +#: src/lang.c:545 #, c-format msgid "# NNTP-server -> newsrc translation table and NNTP-server\n" "# shortname list for %s %s\n" @@ -2366,40 +2366,40 @@ msgstr "# NNTP-Server -> newsrc Übersetz "# news.ka.nu /tmp/nrc-nu kanu nu\n" "#\n" -#: src/lang.c:560 +#: src/lang.c:552 msgid "Only" msgstr "Nur" -#: src/lang.c:561 +#: src/lang.c:553 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Option nicht vorhanden. Neukompilieren mit %s." -#: src/lang.c:562 +#: src/lang.c:554 msgid "Options Menu" msgstr "Optionsmenü" -#: src/lang.c:565 +#: src/lang.c:557 #, 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:566 +#: src/lang.c:558 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Fehler im regulären Ausdruck: Interner Fehler %d des pcre" -#: src/lang.c:567 +#: src/lang.c:559 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Fehler im regulären Ausdruck: pcre interner Fehler %s" -#: src/lang.c:568 +#: src/lang.c:560 msgid "Post a followup..." msgstr "Schreibe eine Antwort..." #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:570 +#: src/lang.c:562 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" @@ -2407,269 +2407,269 @@ 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:573 +#: src/lang.c:565 msgid "Posted articles history" msgstr "Übersicht der geposteten Artikel" -#: src/lang.c:574 +#: src/lang.c:566 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "In Newsgruppe(n) [%s] posten> " -#: src/lang.c:575 +#: src/lang.c:567 msgid "-- post processing started --" msgstr "-- Nachbearbeitung gestartet --" -#: src/lang.c:576 +#: src/lang.c:568 msgid "-- post processing completed --" msgstr "-- Nachbearbeitung beendet --" -#: src/lang.c:577 +#: src/lang.c:569 #, c-format msgid "Post subject [%s]> " msgstr "Wähle Subject [%s]> " -#: src/lang.c:578 +#: src/lang.c:570 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:579 +#: src/lang.c:571 msgid "Posting article..." msgstr "Poste Artikel..." -#: src/lang.c:580 -msgid "Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): " -msgstr "Zurückgelegten Artikel [%%.*s]posten? (%s/%s/%s/%s/%s): " +#: src/lang.c:572 +msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " +msgstr "Zurückgelegten Artikel [%%s]posten? (%s/%s/%s/%s/%s): " -#: src/lang.c:581 +#: src/lang.c:573 #, c-format msgid "Hot %s" msgstr "Wichtig/Hot %s" -#: src/lang.c:582 +#: src/lang.c:574 #, c-format msgid "Tagged %s" msgstr "%s markiert" -#: src/lang.c:583 +#: src/lang.c:575 #, c-format msgid "Untagged %s" msgstr "%s Markierung entfernt" -#: src/lang.c:584 +#: src/lang.c:576 msgid "Processing mail messages marked for deletion." msgstr "Bearbeite zum Löschen markierte EMails" -#: src/lang.c:585 +#: src/lang.c:577 msgid "Processing saved articles marked for deletion." msgstr "Bearbeite zum Löschen markierte gespeicherte Artikel." -#: src/lang.c:586 +#: src/lang.c:578 #, 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:587 +#: src/lang.c:579 msgid "Article unchanged, abort mailing?" msgstr "Mail unverändert, Absenden abbrechen?" -#: src/lang.c:588 +#: src/lang.c:580 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Wollen Sie die zurückgestellten Artikel sehen (%d)?" -#: src/lang.c:590 +#: src/lang.c:582 msgid "Add quick kill filter?" msgstr "Artikel schnell (laut Voreinstellungen) killen?" -#: src/lang.c:591 +#: src/lang.c:583 msgid "Add quick selection filter?" msgstr "Filterregel (hochscoren) (laut Voreinstellungen) hinzufügen?" -#: src/lang.c:592 +#: src/lang.c:584 msgid "Do you really want to quit?" msgstr "Möchten Sie das Programm wirklich beenden?" -#: src/lang.c:593 -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:585 +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:594 +#: src/lang.c:586 msgid "You have tagged articles in this group - quit anyway?" msgstr "Es befinden sich markierte Artikel in der Gruppe, trotzdem beenden?" -#: src/lang.c:595 +#: src/lang.c:587 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=zurücklegen: " -#: src/lang.c:596 +#: src/lang.c:588 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=Abbrechen %s=Editieren %s=Kill-Filter speichern: " -#: src/lang.c:597 +#: src/lang.c:589 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr " %s=Abbrechen %s=Editieren %s=Filter (hot) speichern: " -#: src/lang.c:598 +#: src/lang.c:590 msgid "Do you really want to quit without saving your configuration?" msgstr "Wirklich ohne Speichern der Konfiguration beenden?" -#: src/lang.c:601 +#: src/lang.c:593 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:602 +#: src/lang.c:594 msgid "Do you want to abort this operation?" msgstr "Wollen Sie diese Operation abbrechen?" -#: src/lang.c:603 +#: src/lang.c:595 msgid "Do you want to exit tin immediately?" msgstr "Wollen Sie tin augenblicklich verlassen?" -#: src/lang.c:604 +#: src/lang.c:596 msgid "Read response> " msgstr "Lese Antwort> " -#: src/lang.c:605 +#: src/lang.c:597 msgid "Reading ('q' to quit)..." msgstr "Lesen ('q' zum Beenden)..." -#: src/lang.c:606 +#: src/lang.c:598 #, c-format msgid "Reading %sarticles..." msgstr "Lese %sArtikel..." -#: src/lang.c:607 +#: src/lang.c:599 #, c-format msgid "Reading %sattributes file...\n" msgstr "Lese %sAttribute-Datei...\n" -#: src/lang.c:608 +#: src/lang.c:600 #, c-format msgid "Reading %sconfig file...\n" msgstr "Lese %sKonfigurations-Datei...\n" -#: src/lang.c:609 +#: src/lang.c:601 msgid "Reading filter file...\n" msgstr "Lese Filter-Datei...\n" -#: src/lang.c:610 +#: src/lang.c:602 #, c-format msgid "Reading %s groups..." msgstr "Lese %s Gruppen..." -#: src/lang.c:611 +#: src/lang.c:603 msgid "Reading input history file...\n" msgstr "Lese Eingabe-History...\n" -#: src/lang.c:612 +#: src/lang.c:604 msgid "Reading keymap file...\n" msgstr "Lese Tastaturbelegungen...\n" -#: src/lang.c:613 +#: src/lang.c:605 msgid "Reading groups from active file... " msgstr "Lese Gruppen aus dem Active... " -#: src/lang.c:614 +#: src/lang.c:606 msgid "Reading groups from newsrc file... " msgstr "Lese Gruppen aus der newsrc-Datei... " -#: src/lang.c:615 +#: src/lang.c:607 msgid "Reading newsgroups file... " msgstr "Lese Newsgroups-Datei... " -#: src/lang.c:616 +#: src/lang.c:608 msgid "Reading newsrc file..." msgstr "Lese newsrc-Datei..." -#: src/lang.c:617 +#: src/lang.c:609 #, c-format msgid "Bogus group %s removed." msgstr "Nicht vorhandene Gruppe %s entfernt." -#: src/lang.c:618 +#: src/lang.c:610 #, c-format msgid "Error: rename %s to %s" msgstr "Fehler: Benenne %s in %s" -#: src/lang.c:619 +#: src/lang.c:611 msgid "Reply to author..." msgstr "Mailantwort an Autor..." -#: src/lang.c:620 +#: src/lang.c:612 msgid "Repost" msgstr "Reposte" -#: src/lang.c:621 +#: src/lang.c:613 msgid "Reposting article..." msgstr "Wiederholtes posten des Artikels..." -#: src/lang.c:622 +#: src/lang.c:614 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Wiederholtes posten de(s|r) Artikel(s) in [%s]> " -#: src/lang.c:623 +#: src/lang.c:615 msgid "Reset newsrc?" msgstr "newsrc zurücksetzen?" -#: src/lang.c:624 +#: src/lang.c:616 msgid "Responses have been directed to the following newsgroups" msgstr "Antworten werden in folgende Gruppen gepostet" -#: src/lang.c:625 +#: src/lang.c:617 #, 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:626 +#: src/lang.c:618 #, c-format msgid "RespNo %4d of %4d" msgstr "Antw. %4d von %4d" -#: src/lang.c:627 +#: src/lang.c:619 msgid "Press to continue..." msgstr "Drücken sie um fortzufahren..." -#: src/lang.c:629 +#: src/lang.c:621 #, c-format msgid "Select From [%s] (y/n): " msgstr "Wähle From [%s] (j/n): " -#: src/lang.c:630 +#: src/lang.c:622 msgid "Select Lines: (num): " msgstr "Wähle Zeilen: (num): " -#: src/lang.c:631 +#: src/lang.c:623 msgid "Auto-select Article Menu" msgstr "Filter Menü (Bewertung/Score erhöhen)" -#: src/lang.c:632 +#: src/lang.c:624 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "Wähle Msg-Id [%s] (v/l/n/n): " -#: src/lang.c:633 +#: src/lang.c:625 msgid "Select pattern scope: " msgstr "Wähle Muster : " -#: src/lang.c:634 +#: src/lang.c:626 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Wähle Subject [%s] (j/n): " -#: src/lang.c:635 +#: src/lang.c:627 msgid "Select text pattern : " msgstr "Wähle Textmuster : " -#: src/lang.c:636 +#: src/lang.c:628 msgid "Select time in days : " msgstr "Wähle Zeit in Tagen : " -#: src/lang.c:637 +#: src/lang.c:629 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2689,218 +2689,218 @@ msgstr "# %s Server Konfigurationsdatei\ "############################################################################\n" "\n" -#: src/lang.c:643 +#: src/lang.c:635 msgid "Showing unread groups only" msgstr "Zeige nur Gruppen mit ungelesenen Artikeln" -#: src/lang.c:644 +#: src/lang.c:636 msgid "Subject: line (ignore case) " msgstr "Subject: Z. (Groß-Kl. ign.) " -#: src/lang.c:645 +#: src/lang.c:637 msgid "Subject: line (case sensitive)" msgstr "Subject: Z. (Groß-Kl. beachten) " -#: src/lang.c:646 +#: src/lang.c:638 msgid "Save" msgstr "Speichern" -#: src/lang.c:647 +#: src/lang.c:639 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "'%s' (%s/%s) speichern?" -#: src/lang.c:648 +#: src/lang.c:640 msgid "Save configuration before continuing?" msgstr "Zuerst Konfiguration speichern und danach fortfahren?" -#: src/lang.c:649 +#: src/lang.c:641 msgid "Save filename> " msgstr "Name der zu speichernden Datei> " -#: src/lang.c:650 +#: src/lang.c:642 msgid "Saved" msgstr "Gespeichert" -#: src/lang.c:651 +#: src/lang.c:643 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d ungelesene (%4d 'hot') %s in %s\n" -#: src/lang.c:652 +#: src/lang.c:644 #, c-format msgid "Saved %s...\n" msgstr "%s gespeichert...\n" -#: src/lang.c:653 +#: src/lang.c:645 msgid "Nothing was saved" msgstr "Nichts gespeichert" -#: src/lang.c:654 +#: src/lang.c:646 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s aus %d %s\n" -#: src/lang.c:655 +#: src/lang.c:647 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s nach %s%s gespeichert --" -#: src/lang.c:656 +#: src/lang.c:648 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s gespeichert als %s - %s --" -#: src/lang.c:657 +#: src/lang.c:649 msgid "Saving..." msgstr "Speichere..." -#: src/lang.c:658 +#: src/lang.c:650 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Initialisierung des Bildschirms fehlgeschlagen" -#: src/lang.c:659 +#: src/lang.c:651 #, c-format msgid "%s: screen is too small\n" msgstr "%s: Anzeige ist zu klein\n" -#: src/lang.c:660 +#: src/lang.c:652 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "Anzeige zu klein, %s beendet sich\n" -#: src/lang.c:661 +#: src/lang.c:653 #, c-format msgid "Search backwards [%s]> " msgstr "Suche rückwärts [%s]> " -#: src/lang.c:662 +#: src/lang.c:654 #, c-format msgid "Search body [%s]> " msgstr "Durchsuche Artikelinhalt [%s]> " -#: src/lang.c:663 +#: src/lang.c:655 #, c-format msgid "Search forwards [%s]> " msgstr "Suche vorwärts [%s]> " -#: src/lang.c:664 +#: src/lang.c:656 msgid "Searching..." msgstr "Suche..." -#: src/lang.c:665 +#: src/lang.c:657 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Suche Artikel %d von %d ('q' zum abbrechen)..." -#: src/lang.c:666 +#: src/lang.c:658 msgid "Select article> " msgstr "Wähle Artikel> " -#: src/lang.c:667 +#: src/lang.c:659 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "Wähle Optionsnummer, oder benutze die Cursor Tasten und . 'q' zum beenden." -#: src/lang.c:668 +#: src/lang.c:660 msgid "Select group> " msgstr "Wähle Gruppe> " -#: src/lang.c:669 +#: src/lang.c:661 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Nenne das Auswahlmuster [%s]> " -#: src/lang.c:670 +#: src/lang.c:662 msgid "Select thread > " msgstr "Wähle thread > " -#: src/lang.c:671 +#: src/lang.c:663 #, 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:672 +#: src/lang.c:664 msgid "servers active-file" msgstr "Die 'active' Datei des Servers" -#: src/lang.c:673 +#: src/lang.c:665 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Kann die Newsgruppe nicht öffnen. Sie muss erst abonniert werden..." -#: src/lang.c:674 +#: src/lang.c:666 msgid "" msgstr "" -#: src/lang.c:675 +#: src/lang.c:667 #, c-format msgid "Starting: (%s)" msgstr "Starte: (%s)" -#: src/lang.c:676 +#: src/lang.c:668 #, c-format msgid "List Thread (%d of %d)" msgstr "Zeige Thread (%d von %d)" -#: src/lang.c:677 +#: src/lang.c:669 #, c-format msgid "Thread (%.*s)" msgstr "Thread (%.*s)" -#: src/lang.c:678 +#: src/lang.c:670 msgid "Enter wildcard subscribe pattern> " msgstr "Wildcardmuster für zu abonnierende Gruppen> " -#: src/lang.c:679 +#: src/lang.c:671 #, c-format msgid "subscribed to %d groups" msgstr "%d Gruppen sind abonniert" -#: src/lang.c:680 +#: src/lang.c:672 #, c-format msgid "Subscribed to %s" msgstr "%s wurde abonniert" -#: src/lang.c:681 +#: src/lang.c:673 msgid "Subscribing... " msgstr "Abonniere... " -#: src/lang.c:682 -msgid "Repost or supersede article(s) [%%.*s]? (%s/%s/%s): " -msgstr "Artikel erneut posten oder überschreiben [%%.*s]? (%s/%s/%s): " +#: src/lang.c:674 +msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " +msgstr "Artikel erneut posten oder überschreiben [%%s]? (%s/%s/%s): " -#: src/lang.c:683 +#: src/lang.c:675 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Supersede (überschreibe) Artikel in den Gruppen [%s]> " -#: src/lang.c:684 +#: src/lang.c:676 msgid "Superseding article ..." msgstr "Überschreibe Artikel ..." -#: src/lang.c:685 +#: src/lang.c:677 #, 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:687 +#: src/lang.c:679 #, c-format msgid "%d days" msgstr "%d Tage" -#: src/lang.c:688 +#: src/lang.c:680 msgid "" msgstr "" -#: src/lang.c:689 +#: src/lang.c:681 msgid "# Default action/prompt strings\n" msgstr "# Voreingestellte Aktion/zeige Zeichenkette\n" -#: src/lang.c:690 +#: src/lang.c:682 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,261 +2916,261 @@ 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:703 +#: src/lang.c:695 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:704 +#: src/lang.c:696 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:705 +#: src/lang.c:697 msgid "There is no news\n" msgstr "Es gibt keine neuen Artikel\n" -#: src/lang.c:706 +#: src/lang.c:698 msgid "Thread" msgstr "Thread" -#: src/lang.c:707 +#: src/lang.c:699 msgid "Thread Level Commands" msgstr "Thread Level Kommandos" -#: src/lang.c:708 +#: src/lang.c:700 msgid "Thread deselected" msgstr "Thread nicht mehr ausgewählt" -#: src/lang.c:709 +#: src/lang.c:701 msgid "Thread selected" msgstr "Thread ausgewählt" -#: src/lang.c:710 +#: src/lang.c:702 msgid "threads" msgstr "Threads" -#: src/lang.c:711 +#: src/lang.c:703 msgid "Thread range" msgstr "Thread-Bereich" -#: src/lang.c:712 +#: src/lang.c:704 msgid "thread" msgstr "Thread" -#: src/lang.c:713 +#: src/lang.c:705 #, c-format msgid "Thread %4s of %4s" msgstr "Thread %4s v. %4s" -#: src/lang.c:714 +#: src/lang.c:706 msgid "Threading articles..." msgstr "Sortiere Artikel..." -#: src/lang.c:715 +#: src/lang.c:707 #, c-format msgid "Toggled word highlighting %s" msgstr "Wort-Hervorhebung: %s" -#: src/lang.c:716 +#: src/lang.c:708 msgid "Toggled rot13 encoding" msgstr "ROT13-Kodierung (de)aktiviert" -#: src/lang.c:717 +#: src/lang.c:709 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Deutsche TeX-Dekodierung: %s" -#: src/lang.c:718 +#: src/lang.c:710 #, c-format msgid "Toggled tab-width to %d" msgstr "Tabulatorweite zu %d gewechselt" -#: src/lang.c:719 +#: src/lang.c:711 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Versuche %s zu dotlocken" -#: src/lang.c:720 +#: src/lang.c:712 #, c-format msgid "%d Trying to lock %s" msgstr "%d Versuche %s zu locken" -#: src/lang.c:721 +#: src/lang.c:713 msgid " h=help\n" msgstr " h=Hilfe\n" -#: src/lang.c:723 +#: src/lang.c:715 msgid "Unlimited" msgstr "Unbegrenzt" -#: src/lang.c:724 +#: src/lang.c:716 msgid "Enter wildcard unsubscribe pattern> " msgstr "Wildcardmuster für abzubestellende Gruppen> " -#: src/lang.c:725 +#: src/lang.c:717 #, c-format msgid "Error decoding %s : %s" msgstr "Fehler beim Dekodieren von %s : %s" -#: src/lang.c:726 +#: src/lang.c:718 msgid "No end." msgstr "Kein Ende." -#: src/lang.c:727 +#: src/lang.c:719 #, c-format msgid "%s successfully decoded." msgstr "%s erfolgreich dekodiert" -#: src/lang.c:728 +#: src/lang.c:720 #, 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:729 +#: src/lang.c:721 msgid "unread " msgstr "ungelesen " -#: src/lang.c:730 +#: src/lang.c:722 #, c-format msgid "unsubscribed from %d groups" msgstr "%d Gruppen abbestellt" -#: src/lang.c:731 +#: src/lang.c:723 #, c-format msgid "Unsubscribed from %s" msgstr "%s wurde abbestellt" -#: src/lang.c:732 +#: src/lang.c:724 msgid "Unsubscribing... " msgstr "Abbestellen... " -#: src/lang.c:733 +#: src/lang.c:725 msgid "Unthreading articles..." msgstr "Aktuelle Sortierung der Artikel aufheben..." -#: src/lang.c:734 +#: src/lang.c:726 msgid "Updated" msgstr "Aktualisiert" -#: src/lang.c:735 +#: src/lang.c:727 msgid "Updating" msgstr "Aktualisiere" -#: src/lang.c:736 +#: src/lang.c:728 #, c-format msgid "Opening %s\n" msgstr "Öffne %s\n" -#: src/lang.c:737 +#: src/lang.c:729 msgid "No more URL's in this article" msgstr "Keine weiteren URLs im Artikel" -#: src/lang.c:738 +#: src/lang.c:730 msgid "Use MIME display program for this message?" msgstr "MIME-Anzeigeprogramm für diese Nachricht benutzen?" -#: src/lang.c:739 +#: src/lang.c:731 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:740 +#: src/lang.c:732 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:741 +#: src/lang.c:733 msgid " -q don't check for new newsgroups" msgstr " -q Überprüfe nicht auf neue Newsgruppen" -#: src/lang.c:742 +#: src/lang.c:734 msgid " -X don't save any files on quit" msgstr " -X Speicher keine Dateien beim Beenden" -#: src/lang.c:743 +#: src/lang.c:735 msgid " -d don't show newsgroup descriptions" msgstr " -d Zeige keine Newsgruppenbeschreibungen" -#: src/lang.c:744 +#: src/lang.c:736 msgid " -G limit get only limit articles/group" msgstr " -G limit Hole nur 'limit' Artikel pro Newsgruppe" -#: src/lang.c:745 +#: src/lang.c:737 #, c-format msgid " -H help information about %s" msgstr " -H Hilfe und Informationen über %s" -#: src/lang.c:746 +#: src/lang.c:738 msgid " -h this help message" msgstr " -h Diese Hilfeseite" -#: src/lang.c:747 +#: src/lang.c:739 #, 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:748 +#: src/lang.c:740 msgid " -u update index files (batch mode)" msgstr " -u Erneuere Index-Dateien (Batch-Modus)" -#: src/lang.c:749 +#: src/lang.c:741 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr " -m Verz. Mailbox-Verzeichnis [Standard=%s]" -#: src/lang.c:750 +#: src/lang.c:742 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Schicken Sie Fehlerberichte/Kommentare an %s" -#: src/lang.c:751 +#: src/lang.c:743 msgid " -N mail new news to your posts (batch mode)" msgstr " -N Maile neue Artikel an sich selbst (Batch-Modus)" -#: src/lang.c:752 +#: src/lang.c:744 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:753 +#: src/lang.c:745 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f Datei 'Datei' als .newsrc-Datei nutzen [Standard=%s]" -#: src/lang.c:754 +#: src/lang.c:746 msgid " -x no posting mode" msgstr " -x Posten nicht erlaubt Modus" -#: src/lang.c:755 +#: src/lang.c:747 msgid " -w post an article and exit" msgstr " -w Postet einen Artikel und beendet tin" -#: src/lang.c:756 +#: src/lang.c:748 msgid " -o post all postponed articles and exit" msgstr " -o Postet alle zurückgelegten Artikel und beendet tin" -#: src/lang.c:757 +#: src/lang.c:749 msgid " -r read news remotely from default NNTP server" msgstr " -r Lese Artikel vom Standard-NNTP-Server" -#: src/lang.c:758 +#: src/lang.c:750 msgid " -R read news saved by -S option" msgstr " -R Lese Artikel, die durch -S gespeichert wurden" -#: src/lang.c:759 +#: src/lang.c:751 #, c-format msgid " -s dir save news directory [default=%s]" msgstr " -s Verz. Verzeichnis zum News-Speichern [Standard=%s]" -#: src/lang.c:760 +#: src/lang.c:752 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:761 +#: src/lang.c:753 msgid " -z start if any unread news" msgstr " -z Starte, wenn ungelesene Artikel vorliegen" -#: src/lang.c:762 +#: src/lang.c:754 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3179,37 +3179,37 @@ msgstr "Ein Usenet-Client.\n" "\n" "Syntax: %s [Optionen] [Newsgruppe[,...]]" -#: src/lang.c:763 +#: src/lang.c:755 msgid " -v verbose output for batch mode options" msgstr " -v Ausführliche Ausgabe für Batch-Modus-Optionen" -#: src/lang.c:764 +#: src/lang.c:756 msgid " -V print version & date information" msgstr " -V Gebe Versions- und Datumsinformationen aus" -#: src/lang.c:765 +#: src/lang.c:757 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "%s ist nur sinnvoll ohne Batchmodeoperationen\n" -#: src/lang.c:766 +#: src/lang.c:758 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "%s ist nur sinnvoll für Batchmodeoperationen\n" -#: src/lang.c:768 +#: src/lang.c:760 #, 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:769 +#: src/lang.c:761 #, c-format msgid "View '%s' (%s/%s)?" msgstr "'%s' (%s/%s) anzeigen?" -#: src/lang.c:771 +#: src/lang.c:763 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3218,26 +3218,26 @@ msgstr "\n" "Warnung: Artikel überschreitet %d Spalten. Zeile %d ist die erste lange:\n" "%-100s\n" -#: src/lang.c:772 +#: src/lang.c:764 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Warnung: Artikel wurde im Editor nicht verändert\n" -#: src/lang.c:773 +#: src/lang.c:765 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Warnung: \"Subject:\" enthält nur Leerzeichen.\n" -#: src/lang.c:774 +#: src/lang.c:766 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:776 +#: src/lang.c:768 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3245,7 +3245,7 @@ msgstr "\n" "Warnung: Artikel hat \"References:\" aber \"Subject:\" beginnt nicht\n" " mit \"Re: \" and enthält auch kein \"(was:\".\n" -#: src/lang.c:779 +#: src/lang.c:771 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3265,7 +3265,7 @@ msgstr "Sorgfältig lesen!\n" "Das ist der Artikel, den sie canceln (löschen) wollen:\n" "\n" -#: src/lang.c:783 +#: src/lang.c:775 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" @@ -3277,7 +3277,7 @@ msgstr "\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:788 +#: src/lang.c:780 #, c-format msgid "\n" "\n" @@ -3290,7 +3290,7 @@ msgstr "\n" "Einige Einstellungen in Ihrem %s-File haben sich geändert!\n" "Lesen sie \"WHATSNEW\", usw....\n" -#: src/lang.c:790 +#: src/lang.c:782 #, c-format msgid "\n" "\n" @@ -3302,7 +3302,7 @@ msgstr "\n" "Evtl. werden Einstellungen in Ihrem %s-File nicht erkannt\n" "oder ändern sich!\n" -#: src/lang.c:793 +#: src/lang.c:785 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3315,19 +3315,19 @@ msgstr "Warnung: tin hat weniger Gruppen "währenddessen abbestellt haben, ist ein Fehler aufgetreten und Sie sollten\n" "ihre %s wiederherstellen, bevor Sie tin nochmal starten!\n" -#: src/lang.c:797 +#: src/lang.c:789 #, 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:798 +#: src/lang.c:790 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Warnung: Nur %d von %d Artikeln gespeichert" -#: src/lang.c:799 +#: src/lang.c:791 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3341,48 +3341,48 @@ msgstr "\n" " nützlichen Informationen enthalten, sollten sie so kurz wie möglich\n" " gehalten werden.\n" -#: src/lang.c:803 +#: src/lang.c:795 #, 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:804 +#: src/lang.c:796 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:805 +#: src/lang.c:797 msgid "Writing attributes file..." msgstr "Schreibe Datei mit den Eigenschaften der Newsgruppen..." -#: src/lang.c:807 +#: src/lang.c:799 #, c-format msgid "%d Responses" msgstr "%d Antworten" -#: src/lang.c:809 +#: src/lang.c:801 #, c-format msgid "Added %d %s" msgstr "%d %s hinzugefügt" -#: src/lang.c:810 +#: src/lang.c:802 msgid "No unsubscribed groups to show" msgstr "Keine nicht abonnierte Gruppen gefunden" -#: src/lang.c:811 +#: src/lang.c:803 msgid "Showing subscribed to groups only" msgstr "Zeige nur abonnierte Gruppen" -#: src/lang.c:812 +#: src/lang.c:804 msgid "Yes " msgstr "Ja " -#: src/lang.c:813 +#: src/lang.c:805 msgid " You have mail\n" msgstr " Sie haben Mail\n" -#: src/lang.c:818 +#: src/lang.c:810 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3401,16 +3401,16 @@ msgstr "\n" " entfernen oder MM_NETWORK_CHARSET im M)neu auf einen\n" " passenderen Wert setzen.\n" -#: src/lang.c:829 +#: src/lang.c:821 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Neubelegung %s '%s' -> '%s'\n" -#: src/lang.c:830 +#: src/lang.c:822 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D Debug-Modus 1=NNTP 2=ALLES" -#: src/lang.c:834 +#: src/lang.c:826 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3436,11 +3436,11 @@ msgstr "Sorgfältig lesen!\n" "Dies ist der Artikel, den Sie canceln (löschen) wollen:\n" "\n" -#: src/lang.c:843 +#: src/lang.c:835 msgid "toggle color" msgstr "Farben ein/aus" -#: src/lang.c:844 +#: src/lang.c:836 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" @@ -3459,352 +3459,352 @@ msgstr "# Für die Farbanpassung benutzen "# Eine '-1' wird als Voreinstellung interpretiert (der Vordergrund ist\n" "# normalerweise weiß und der Hintergrund schwarz)\n" -#: src/lang.c:852 +#: src/lang.c:844 msgid " -a toggle color flag" msgstr " -a Farbe ein- oder ausschalten" -#: src/lang.c:856 +#: src/lang.c:848 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:857 +#: src/lang.c:849 #, 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:858 +#: src/lang.c:850 #, 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:860 +#: src/lang.c:852 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:861 +#: src/lang.c:853 #, 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:862 +#: src/lang.c:854 #, 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:863 +#: src/lang.c:855 #, 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:867 +#: src/lang.c:859 #, 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:868 +#: src/lang.c:860 msgid "Missing parts." msgstr "Teile fehlen." -#: src/lang.c:869 +#: src/lang.c:861 msgid "No beginning." msgstr "Kein Anfang." -#: src/lang.c:870 +#: src/lang.c:862 msgid "No data." msgstr "Keine Daten." -#: src/lang.c:871 +#: src/lang.c:863 msgid "Unknown error." msgstr "Unbekannter Fehler." -#: src/lang.c:873 +#: src/lang.c:865 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tPrüfsumme für %s (%ld %s)" -#: src/lang.c:877 +#: src/lang.c:869 msgid "Reading mail active file... " msgstr "Lese EMail-Active-Datei... " -#: src/lang.c:878 +#: src/lang.c:870 msgid "Reading mailgroups file... " msgstr "Lese Mailgruppen-Datei... " -#: src/lang.c:882 +#: src/lang.c:874 msgid "perform PGP operations on article" msgstr "wendet PGP auf den Artikel an" -#: src/lang.c:883 +#: src/lang.c:875 msgid "Add key(s) to public keyring?" msgstr "Schlüssel dem Öffentlichen Schlüsselring hinzufügen?" -#: src/lang.c:884 +#: src/lang.c:876 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=verschlüsseln, %s=signieren, %s=beides, %s=Ende: " -#: src/lang.c:885 +#: src/lang.c:877 #, 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:886 +#: src/lang.c:878 #, 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:887 +#: src/lang.c:879 msgid "Article not signed and no public keys found" msgstr "Artikel ist nicht signiert; keine öffentlichen Schlüssel gefunden" -#: src/lang.c:889 +#: src/lang.c:881 #, 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:890 -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:882 +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:891 -msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:883 +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]: " + "[%%s]: " -#: src/lang.c:893 +#: src/lang.c:885 #, 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:894 -msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: " -msgstr "%s=Ende, %s=bearbeiten, %s=pgp, %s=verschicken [%%.*s]: " +#: src/lang.c:886 +msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " +msgstr "%s=Ende, %s=bearbeiten, %s=pgp, %s=verschicken [%%s]: " -#: src/lang.c:895 -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:887 +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:899 +#: src/lang.c:891 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=Menü, %s=posten, %s=zurücklegen: " -#: src/lang.c:900 -msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: " -msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=verschicken [%%.*s]: " - -#: src/lang.c:901 -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:892 +msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " +msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=verschicken [%%s]: " + +#: src/lang.c:893 +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:903 +#: src/lang.c:895 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=Menu, %s=posten, %s=zurücklegen: " -#: src/lang.c:904 -msgid "%s=quit, %s=edit, %s=send [%%.*s]: " -msgstr "%s=Ende, %s=bearbeiten, %s=verschicken [%%.*s]: " - -#: src/lang.c:905 -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:896 +msgid "%s=quit, %s=edit, %s=send [%%s]: " +msgstr "%s=Ende, %s=bearbeiten, %s=verschicken [%%s]: " + +#: src/lang.c:897 +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:914 +#: src/lang.c:906 msgid "Try cache_overview_files to speed up things.\n" msgstr "Setze cache_overview_files um das lesen zu beschleubigen.\n" -#: src/lang.c:915 +#: src/lang.c:907 msgid "Tin will use local index files instead.\n" msgstr "Tin wird lokale index files benutzen.\n" -#: src/lang.c:916 +#: src/lang.c:908 msgid "Cannot find NNTP server name" msgstr "Kann den Namen des NNTP Servers nicht finden" -#: src/lang.c:917 +#: src/lang.c:909 #, c-format msgid "Connecting to %s:%d..." msgstr "Verbinde mit %s:%d..." -#: src/lang.c:918 +#: src/lang.c:910 msgid "Disconnecting from server...\n" msgstr "Trenne Verbindung zum Server...\n" -#: src/lang.c:919 +#: src/lang.c:911 #, 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:920 +#: src/lang.c:912 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "Konnte nicht zum NNTP Server %s verbinden. Beende..." -#: src/lang.c:921 +#: src/lang.c:913 msgid "205 Closing connection" msgstr "205 Schließe Verbindung" -#: src/lang.c:922 +#: src/lang.c:914 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:923 +#: src/lang.c:915 msgid "Connection to news server has timed out. Reconnect?" msgstr "Die Verbindung zum Newsserver wurde unterbrochen. Wieder verbinden?" -#: src/lang.c:924 +#: src/lang.c:916 #, 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:925 +#: src/lang.c:917 msgid " -A force authentication on connect" msgstr " -A Erzwinge Anmeldung bei Verbindung" -#: src/lang.c:926 +#: src/lang.c:918 #, 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:927 +#: src/lang.c:919 #, 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:928 +#: src/lang.c:920 msgid " -Q quick start. Same as -nqd" msgstr " -Q Schnellstart. Das Selbe wie -nqd" -#: src/lang.c:929 +#: src/lang.c:921 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l Benutze nur das LIST anstelle vom GROUP-Kommando (-n)" -#: src/lang.c:930 +#: src/lang.c:922 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:932 +#: src/lang.c:924 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp: Unbekannter Service.\n" -#: src/lang.c:935 +#: src/lang.c:927 msgid "\n" "socket or connect problem\n" msgstr "\n" "Socket oder Verbindungsproblem\n" -#: src/lang.c:937 +#: src/lang.c:929 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Verbindung mit %s: " -#: src/lang.c:938 +#: src/lang.c:930 msgid "Giving up...\n" msgstr "Gebe auf...\n" -#: src/lang.c:941 +#: src/lang.c:933 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:944 +#: src/lang.c:936 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:947 +#: src/lang.c:939 #, 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:950 +#: src/lang.c:942 msgid " -Q quick start. Same as -qd" msgstr " -Q Schnellstart. Das Selbe wie -qd" -#: src/lang.c:951 +#: src/lang.c:943 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:952 +#: src/lang.c:944 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:953 +#: src/lang.c:945 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:957 +#: src/lang.c:949 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "Fehler beim Posten mit externem inews, verwende eingebautes?" -#: src/lang.c:958 +#: src/lang.c:950 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:966 +#: src/lang.c:958 #, c-format msgid "%d %s printed" msgstr "%d %s gedruckt" -#: src/lang.c:967 +#: src/lang.c:959 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "druckt Artikel/Thread/hervorgehobene/Muster/markierten" -#: src/lang.c:968 +#: src/lang.c:960 msgid "Print" msgstr "drucken" -#: src/lang.c:969 +#: src/lang.c:961 msgid "Printing..." msgstr "Drucke..." -#: src/lang.c:973 +#: src/lang.c:965 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "pipet Artikel/thread hervorgehoben/muster/markierten Artikel" -#: src/lang.c:974 +#: src/lang.c:966 msgid "No command" msgstr "Kein Kommando" -#: src/lang.c:975 +#: src/lang.c:967 msgid "Pipe" msgstr "Pipe" -#: src/lang.c:976 +#: src/lang.c:968 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Pipen in Kommando [%.*s]> " -#: src/lang.c:977 +#: src/lang.c:969 msgid "Piping..." msgstr "Pipen..." -#: src/lang.c:979 +#: src/lang.c:971 msgid "Piping not enabled." msgstr "Pipen nicht aktiviert." -#: src/lang.c:983 +#: src/lang.c:975 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3817,7 +3817,7 @@ msgstr "\n" " vom Inhalt trennt. Benutzen sie ein ',' um mehrere Newsgruppen\n" " anzugeben\n" -#: src/lang.c:988 +#: src/lang.c:980 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3828,7 +3828,7 @@ msgstr "\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:993 +#: src/lang.c:985 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3839,7 +3839,7 @@ msgstr "\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:997 +#: src/lang.c:989 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" @@ -3847,7 +3847,7 @@ msgstr "\n" "Warnung: Die \"%s:\" Zeile enthält Leerzeichen die entfernt\n" " werden sollten.\n" -#: src/lang.c:1002 +#: src/lang.c:994 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3878,554 +3878,554 @@ msgstr "\n" " Artikel nicht sorgfältig formatieren, ist es sehr wahrscheinlich, dass er\n" " von vielen gar nicht gelesen wird.\n" -#: src/lang.c:1015 +#: src/lang.c:1007 msgid "shell escape" msgstr "Ausgang zur Shell" -#: src/lang.c:1016 +#: src/lang.c:1008 #, c-format msgid "Shell Command (%s)" msgstr "Shellkommando (%s)" -#: src/lang.c:1017 +#: src/lang.c:1009 #, c-format msgid "Enter shell command [%s]> " msgstr "Geben Sie ein Shellkommando ein [%s]> " -#: src/lang.c:1021 +#: src/lang.c:1013 #, 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:1025 +#: src/lang.c:1017 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Gruppe %.*s ('q' zum beenden...)" -#: src/lang.c:1027 +#: src/lang.c:1019 #, c-format msgid "Group %.*s..." msgstr "Gruppe %.*s..." -#: src/lang.c:1031 +#: src/lang.c:1023 msgid "Server unavailable\n" msgstr "Server nicht erreichbar\n" -#: src/lang.c:1037 +#: src/lang.c:1029 #, 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:1038 +#: src/lang.c:1030 #, 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:1040 +#: src/lang.c:1032 #, 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:1041 +#: src/lang.c:1033 #, 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:1045 +#: src/lang.c:1037 #, 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:1046 +#: src/lang.c:1038 #, 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:1048 +#: src/lang.c:1040 #, 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:1049 +#: src/lang.c:1041 #, 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:1055 +#: src/lang.c:1047 msgid "Terminal does not support color" msgstr "Terminal unterstützt keine Farben" -#: src/lang.c:1060 +#: src/lang.c:1052 #, c-format msgid "Trying %s" msgstr "Versuche %s" -#: src/lang.c:1074 src/lang.c:1099 src/lang.c:1115 src/lang.c:1294 src/refs.c:266 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:297 msgid "None" msgstr "Nichts" -#: src/lang.c:1075 +#: src/lang.c:1067 msgid "Subject" msgstr "Subject" -#: src/lang.c:1076 +#: src/lang.c:1068 msgid "References" msgstr "References" -#: src/lang.c:1077 +#: src/lang.c:1069 msgid "Both Subject and References" msgstr "Beides: Subject und References" -#: src/lang.c:1078 +#: src/lang.c:1070 msgid "Multipart Subject" msgstr "Mehrteilige Artikel (Subject)" -#: src/lang.c:1090 src/lang.c:1201 +#: src/lang.c:1082 src/lang.c:1193 msgid "No" msgstr "Nein" -#: src/lang.c:1091 src/lang.c:1203 +#: src/lang.c:1083 src/lang.c:1195 msgid "Yes" msgstr "Ja" -#: src/lang.c:1092 +#: src/lang.c:1084 msgid "Hide All" msgstr "Alle ausblenden" -#: src/lang.c:1100 +#: src/lang.c:1092 msgid "Address" msgstr "Adresse" -#: src/lang.c:1101 +#: src/lang.c:1093 msgid "Full Name" msgstr "Voller Name" -#: src/lang.c:1102 +#: src/lang.c:1094 msgid "Address and Name" msgstr "Adresse und Name" -#: src/lang.c:1109 +#: src/lang.c:1101 msgid "Max" msgstr "Höchster" -#: src/lang.c:1110 +#: src/lang.c:1102 msgid "Sum" msgstr "Summe" -#: src/lang.c:1111 +#: src/lang.c:1103 msgid "Average" msgstr "Durchschnitt" -#: src/lang.c:1116 +#: src/lang.c:1108 msgid "Lines" msgstr "Zeilen" -#: src/lang.c:1117 +#: src/lang.c:1109 msgid "Score" msgstr "Bewertung" -#: src/lang.c:1118 +#: src/lang.c:1110 msgid "Lines & Score" msgstr "Zeilen und Bewertung" -#: src/lang.c:1127 +#: src/lang.c:1119 msgid "Black" msgstr "Schwarz" -#: src/lang.c:1128 +#: src/lang.c:1120 msgid "Red" msgstr "Rot" -#: src/lang.c:1129 +#: src/lang.c:1121 msgid "Green" msgstr "Grün" -#: src/lang.c:1130 +#: src/lang.c:1122 msgid "Brown" msgstr "Braun" -#: src/lang.c:1131 +#: src/lang.c:1123 msgid "Blue" msgstr "Blau" -#: src/lang.c:1132 +#: src/lang.c:1124 msgid "Pink" msgstr "Rosa" -#: src/lang.c:1133 +#: src/lang.c:1125 msgid "Cyan" msgstr "Cyan" -#: src/lang.c:1134 +#: src/lang.c:1126 msgid "White" msgstr "Weiß" -#: src/lang.c:1135 +#: src/lang.c:1127 msgid "Gray" msgstr "Grau" -#: src/lang.c:1136 +#: src/lang.c:1128 msgid "Light Red" msgstr "Helles Rot" -#: src/lang.c:1137 +#: src/lang.c:1129 msgid "Light Green" msgstr "Helles Grün" -#: src/lang.c:1138 +#: src/lang.c:1130 msgid "Yellow" msgstr "Gelb" -#: src/lang.c:1139 +#: src/lang.c:1131 msgid "Light Blue" msgstr "Helles Blau" -#: src/lang.c:1140 +#: src/lang.c:1132 msgid "Light Pink" msgstr "Helles Rosa" -#: src/lang.c:1141 +#: src/lang.c:1133 msgid "Light Cyan" msgstr "Helles Cyan" -#: src/lang.c:1142 +#: src/lang.c:1134 msgid "Light White" msgstr "Helles Weiß" -#: src/lang.c:1150 src/lang.c:1207 src/lang.c:1221 +#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 msgid "Nothing" msgstr "Nichts" -#: src/lang.c:1151 +#: src/lang.c:1143 msgid "Mark" msgstr "Markierung" -#: src/lang.c:1152 +#: src/lang.c:1144 msgid "Space" msgstr "Leerzeichen" -#: src/lang.c:1159 +#: src/lang.c:1151 msgid "Normal" msgstr "Normal" -#: src/lang.c:1160 +#: src/lang.c:1152 msgid "Best highlighting" msgstr "Beste Hervorhebung" -#: src/lang.c:1161 +#: src/lang.c:1153 msgid "Underline" msgstr "Unterstreichen" -#: src/lang.c:1162 +#: src/lang.c:1154 msgid "Reverse video" msgstr "Invers" -#: src/lang.c:1163 +#: src/lang.c:1155 msgid "Blinking" msgstr "Blinkend" -#: src/lang.c:1164 +#: src/lang.c:1156 msgid "Half bright" msgstr "Halbe Helligkeit" -#: src/lang.c:1165 +#: src/lang.c:1157 msgid "Bold" msgstr "Fett" -#: src/lang.c:1170 +#: src/lang.c:1162 msgid "none" msgstr "Nichts" -#: src/lang.c:1171 +#: src/lang.c:1163 msgid "commands" msgstr "Kommandos" -#: src/lang.c:1172 +#: src/lang.c:1164 msgid "select" msgstr "X-Befehl" -#: src/lang.c:1174 +#: src/lang.c:1166 msgid "commands & quit" msgstr "Kommandos & Ende" -#: src/lang.c:1175 +#: src/lang.c:1167 msgid "commands & select" msgstr "Kommandos & X-Befehl" -#: src/lang.c:1176 +#: src/lang.c:1168 msgid "quit & select" msgstr "Ende & X-Befehl" -#: src/lang.c:1177 +#: src/lang.c:1169 msgid "commands & quit & select" msgstr "Kmndos & Ende & X-Befehl" -#: src/lang.c:1202 +#: src/lang.c:1194 msgid "Shell archive" msgstr "Shellarchiv" -#: src/lang.c:1208 +#: src/lang.c:1200 msgid "Subject: (descending)" msgstr "Subject: (Absteigend)" -#: src/lang.c:1209 +#: src/lang.c:1201 msgid "Subject: (ascending)" msgstr "Subject: (Aufsteigend)" -#: src/lang.c:1210 +#: src/lang.c:1202 msgid "From: (descending)" msgstr "From: (Absteigend)" -#: src/lang.c:1211 +#: src/lang.c:1203 msgid "From: (ascending)" msgstr "From: (Aufsteigend)" -#: src/lang.c:1212 +#: src/lang.c:1204 msgid "Date: (descending)" msgstr "Date: (Absteigend)" -#: src/lang.c:1213 +#: src/lang.c:1205 msgid "Date: (ascending)" msgstr "Date: (Aufsteigend)" -#: src/lang.c:1214 src/lang.c:1222 +#: src/lang.c:1206 src/lang.c:1214 msgid "Score (descending)" msgstr "Bewertung (Absteigend)" -#: src/lang.c:1215 src/lang.c:1223 +#: src/lang.c:1207 src/lang.c:1215 msgid "Score (ascending)" msgstr "Bewertung (Aufsteigend)" -#: src/lang.c:1216 +#: src/lang.c:1208 msgid "Lines: (descending)" msgstr "Lines: (Absteigend)" -#: src/lang.c:1217 +#: src/lang.c:1209 msgid "Lines: (ascending)" msgstr "Lines: (Aufsteigend)" -#: src/lang.c:1228 +#: src/lang.c:1220 msgid "Always Keep" msgstr "Immer behalten" -#: src/lang.c:1229 +#: src/lang.c:1221 msgid "Always Remove" msgstr "Immer entfernen" -#: src/lang.c:1230 +#: src/lang.c:1222 msgid "Mark with D on selection screen" msgstr "Mit D in der Anzeige markiert" -#: src/lang.c:1235 +#: src/lang.c:1227 msgid "Kill only unread arts" msgstr "Killt nur ungelesene Artikel" -#: src/lang.c:1236 +#: src/lang.c:1228 msgid "Kill all arts & show with K" msgstr "Killt alle Artikel, markiert mit K" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1237 +#: src/lang.c:1229 msgid "Kill all arts and never show" msgstr "Killt alle Artikel, zeigt sie nie" -#: src/lang.c:1242 +#: src/lang.c:1234 msgid "Nothing special" msgstr "Nichts besonderes" -#: src/lang.c:1243 +#: src/lang.c:1235 msgid "Compress quotes" msgstr "Zitatzeichen zusammenfassen" -#: src/lang.c:1244 +#: src/lang.c:1236 msgid "Quote signatures" msgstr "Signaturen zitieren" -#: src/lang.c:1245 +#: src/lang.c:1237 msgid "Compress quotes, quote sigs" msgstr "Zitatz. kürzen, Signat. zitieren" -#: src/lang.c:1246 +#: src/lang.c:1238 msgid "Quote empty lines" msgstr "Leerzeilen zitieren" -#: src/lang.c:1247 +#: src/lang.c:1239 msgid "Compress quotes, quote empty lines" msgstr "Zitatz. kürzen, Leerzeilen zit." -#: src/lang.c:1248 +#: src/lang.c:1240 msgid "Quote sigs & empty lines" msgstr "Signat. und Leerzeilen zitieren" -#: src/lang.c:1249 +#: src/lang.c:1241 msgid "Comp. q., quote sigs & empty lines" msgstr "Zitatz. kürzen, Sign & Leerz. zit." -#: src/lang.c:1287 +#: src/lang.c:1279 msgid "no" msgstr "nein" -#: src/lang.c:1288 +#: src/lang.c:1280 msgid "with headers" msgstr "mit Header" -#: src/lang.c:1289 +#: src/lang.c:1281 msgid "without headers" msgstr "ohne Header" # TRANSLATION MISSING -#: src/lang.c:1296 src/lang.c:1302 +#: src/lang.c:1288 src/lang.c:1294 msgid "NFKC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1297 +#: src/lang.c:1289 msgid "NFKD" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1298 +#: src/lang.c:1290 msgid "NFC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1299 +#: src/lang.c:1291 msgid "NFD" msgstr "" -#: src/lang.c:1310 +#: src/lang.c:1302 msgid "Display Options" msgstr "Darstellungseinstellungen" -#: src/lang.c:1316 +#: src/lang.c:1308 msgid "Color Options" msgstr "Farbeinstellungen" -#: src/lang.c:1322 +#: src/lang.c:1314 msgid "Article-Limiting Options" msgstr "Artikel-Begrenzungseinstellungen" -#: src/lang.c:1328 +#: src/lang.c:1320 msgid "Posting/Mailing Options" msgstr "Versandeinstellungen für Mail und News" -#: src/lang.c:1334 +#: src/lang.c:1326 msgid "Saving/Printing Options" msgstr "Speicher- und Druckereinstellungen" -#: src/lang.c:1340 +#: src/lang.c:1332 msgid "Expert Options" msgstr "Experteneinstellungen" -#: src/lang.c:1346 +#: src/lang.c:1338 msgid "Filtering Options" msgstr "Filtereinstellungen" -#: src/lang.c:1351 src/lang.c:1377 src/lang.c:1383 src/lang.c:1390 src/lang.c:1422 -#: src/lang.c:1428 src/lang.c:1436 src/lang.c:1456 src/lang.c:1531 src/lang.c:1693 -#: src/lang.c:1699 src/lang.c:1705 src/lang.c:1711 src/lang.c:1723 src/lang.c:1730 -#: src/lang.c:1781 src/lang.c:1790 src/lang.c:1796 src/lang.c:1802 src/lang.c:1808 -#: src/lang.c:1814 src/lang.c:1820 src/lang.c:1826 src/lang.c:1832 src/lang.c:1838 -#: src/lang.c:1844 src/lang.c:1850 src/lang.c:1856 src/lang.c:1862 src/lang.c:1868 -#: src/lang.c:1874 src/lang.c:1880 src/lang.c:1886 src/lang.c:1892 src/lang.c:1898 -#: src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 src/lang.c:1923 src/lang.c:1929 -#: src/lang.c:1936 src/lang.c:1947 src/lang.c:1953 src/lang.c:1959 src/lang.c:1965 -#: src/lang.c:1971 src/lang.c:1977 src/lang.c:1991 src/lang.c:2003 src/lang.c:2037 -#: src/lang.c:2089 src/lang.c:2096 src/lang.c:2102 src/lang.c:2127 src/lang.c:2144 -#: src/lang.c:2197 src/lang.c:2230 src/lang.c:2250 src/lang.c:2285 src/lang.c:2294 -#: src/lang.c:2319 src/lang.c:2331 src/lang.c:2350 +#: src/lang.c:1343 src/lang.c:1369 src/lang.c:1375 src/lang.c:1382 src/lang.c:1414 +#: src/lang.c:1420 src/lang.c:1428 src/lang.c:1448 src/lang.c:1523 src/lang.c:1685 +#: src/lang.c:1691 src/lang.c:1697 src/lang.c:1703 src/lang.c:1715 src/lang.c:1722 +#: src/lang.c:1773 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:1884 src/lang.c:1890 +#: src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1915 src/lang.c:1921 +#: src/lang.c:1928 src/lang.c:1939 src/lang.c:1945 src/lang.c:1951 src/lang.c:1957 +#: src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 src/lang.c:1995 src/lang.c:2029 +#: src/lang.c:2081 src/lang.c:2088 src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 +#: src/lang.c:2189 src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 msgid " toggles, sets, cancels." msgstr " schaltet um, setzt, bricht ab." -#: src/lang.c:1352 +#: src/lang.c:1344 msgid "Show mini menu & posting etiquette :" msgstr "Zeigt Minimenü & Posting etiquette :" -#: src/lang.c:1353 +#: src/lang.c:1345 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:1358 +#: src/lang.c:1350 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Zeige Kurzbeschreibung für Gruppe. wechselt & setzt." -#: src/lang.c:1359 +#: src/lang.c:1351 msgid "Show description of each newsgroup :" msgstr "Zeige Beschreibung der Newsgruppen :" -#: src/lang.c:1360 +#: src/lang.c:1352 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:1365 +#: src/lang.c:1357 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Zeigt Subject & From (Autor) Felder im Gruppenmenü. wechselt & " "setzt." -#: src/lang.c:1366 +#: src/lang.c:1358 msgid "In group menu, show author by :" msgstr "Im Gruppenmenü, zeige Autor an nach:" -#: src/lang.c:1367 +#: src/lang.c:1359 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:1371 +#: src/lang.c:1363 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Zeige -> oder Hervorhebung für Auswahl. wechselt & setzt." -#: src/lang.c:1372 +#: src/lang.c:1364 msgid "Draw -> instead of highlighted bar :" msgstr "Zeige -> anstatt einer Markierung :" -#: src/lang.c:1373 +#: src/lang.c:1365 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Falls ON benutze -> andernfalls benutze eine Markierung zur Auswahl\n" -#: src/lang.c:1378 +#: src/lang.c:1370 msgid "Use inverse video for page headers :" msgstr "Inverse Darstellung für die Header :" -#: src/lang.c:1379 +#: src/lang.c:1371 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:1384 +#: src/lang.c:1376 msgid "Thread articles by :" msgstr "Threade Artikel anhand :" -#: src/lang.c:1385 +#: src/lang.c:1377 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:1391 +#: src/lang.c:1383 msgid "Score of a thread :" msgstr "Bewertung eines Threads :" -#: src/lang.c:1392 +#: src/lang.c:1384 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:1396 +#: src/lang.c:1388 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Sortiere Artikel nach Subject, From, Datum oder Bewertung." -#: src/lang.c:1397 +#: src/lang.c:1389 msgid "Sort articles by :" msgstr "Sortiere Artikel nach :" -#: src/lang.c:1398 +#: src/lang.c:1390 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" @@ -4434,56 +4434,56 @@ msgstr "# Sort. Art. nach 0=(nichts) 1=( "# 7=(Bewertung abst.) 8=(Bewertung aufst.) 9=(Lines abst.) 10=(Lines " "aufst.).\n" -#: src/lang.c:1404 +#: src/lang.c:1396 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Threads nach Bewertung (Score) oder nichts ordnen. wechselt & " "setzt" -#: src/lang.c:1405 +#: src/lang.c:1397 msgid "Sort threads by :" msgstr "Sortiere Threads nach :" -#: src/lang.c:1406 +#: src/lang.c:1398 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:1410 +#: src/lang.c:1402 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "Setze Cursor an ersten/letzten ungel. Artikel. wechselt & setzt." -#: src/lang.c:1411 +#: src/lang.c:1403 msgid "Goto first unread article in group :" msgstr "Setze Cursor auf ersten ungel. Art.:" -#: src/lang.c:1412 +#: src/lang.c:1404 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:1416 +#: src/lang.c:1408 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Zeige alle oder nur ungelesene Artikel. wechselt & setzt." -#: src/lang.c:1417 +#: src/lang.c:1409 msgid "Show only unread articles :" msgstr "Zeige nur ungelesene Artikel :" -#: src/lang.c:1418 +#: src/lang.c:1410 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:1423 +#: src/lang.c:1415 msgid "Show only groups with unread arts :" msgstr "Zeige nur Gruppen mit ungel. Art. :" -#: src/lang.c:1424 +#: src/lang.c:1416 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:1429 +#: src/lang.c:1421 msgid "Filter which articles :" msgstr "Filter (kill) anwenden auf :" -#: src/lang.c:1430 +#: src/lang.c:1422 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" @@ -4491,215 +4491,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:1437 +#: src/lang.c:1429 msgid "Tab goes to next unread article :" msgstr "Tab zeigt nächsten ungelesenen Art.:" -#: src/lang.c:1438 +#: src/lang.c:1430 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" -#: src/lang.c:1442 +#: src/lang.c:1434 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "Weiterscrollen mit Leertaste am Artikelende wechselt zum nächsten ungel. " "Artikel" -#: src/lang.c:1443 +#: src/lang.c:1435 msgid "Space goes to next unread article :" msgstr "Leertaste zeigt nächsten unge. Art.:" -#: src/lang.c:1444 +#: src/lang.c:1436 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" -#: src/lang.c:1449 +#: src/lang.c:1441 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "Weiterscrollen mit BildAb am Artikelende wechselt zum nächsten ungel. Artikel" -#: src/lang.c:1450 +#: src/lang.c:1442 msgid "PgDn goes to next unread article :" msgstr "PgDn zeigt nächst. ungelesenen Art.:" -#: src/lang.c:1451 +#: src/lang.c:1443 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:1457 +#: src/lang.c:1449 msgid "List thread using right arrow key :" msgstr "Zeige Thread mit rechter Pfeilt. an:" -#: src/lang.c:1458 +#: src/lang.c:1450 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:1462 +#: src/lang.c:1454 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Definiere Zeichen für gelöschte Artikel. setzt, bricht ab." -#: src/lang.c:1463 +#: src/lang.c:1455 msgid "Character to show deleted articles :" msgstr "Zeichen für gelöschte Artikel :" -#: src/lang.c:1464 +#: src/lang.c:1456 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:1469 +#: src/lang.c:1461 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "Definiere Zeichen, das Artikel im Bereich anzeigt. setzt, bricht ab." -#: src/lang.c:1470 +#: src/lang.c:1462 msgid "Character to show inrange articles :" msgstr "Zeichen für Artikel im Bereich :" -#: src/lang.c:1471 +#: src/lang.c:1463 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:1476 +#: src/lang.c:1468 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Definiere Zeichen für wiederkehrende Art. setzt. bricht ab." -#: src/lang.c:1477 +#: src/lang.c:1469 msgid "Character to show returning arts :" msgstr "Zeichen für wiederkehrende Artikel :" -#: src/lang.c:1478 +#: src/lang.c:1470 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:1483 +#: src/lang.c:1475 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Zeichen für Artikel mit Markierung wichtig/'hot' setzt, bricht ab." -#: src/lang.c:1484 +#: src/lang.c:1476 msgid "Character to show selected articles:" msgstr "Zeichen für wichtige Artikel :" -#: src/lang.c:1485 +#: src/lang.c:1477 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:1490 +#: src/lang.c:1482 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Definiere Zeichen für aktuelle Artikel. setzt, bricht ab." -#: src/lang.c:1491 +#: src/lang.c:1483 msgid "Character to show recent articles :" msgstr "Zeichen für aktuelle Artikel :" -#: src/lang.c:1492 +#: src/lang.c:1484 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:1497 +#: src/lang.c:1489 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Zeichen für ungelesene Artikel. setzt, bricht ab." -#: src/lang.c:1498 +#: src/lang.c:1490 msgid "Character to show unread articles :" msgstr "Zeichen für ungelesene Artikel :" -#: src/lang.c:1499 +#: src/lang.c:1491 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:1504 +#: src/lang.c:1496 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Zeichen für gelesene Artikel. setzt, bricht ab." -#: src/lang.c:1505 +#: src/lang.c:1497 msgid "Character to show read articles :" msgstr "Zeichen für gelesene Artikel :" -#: src/lang.c:1506 +#: src/lang.c:1498 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:1511 +#: src/lang.c:1503 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Zeichen für gekillte Artikel. setzt, bricht ab." -#: src/lang.c:1512 +#: src/lang.c:1504 msgid "Character to show killed articles :" msgstr "Zeichen für gekillte Artikel :" -#: src/lang.c:1513 +#: src/lang.c:1505 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:1518 +#: src/lang.c:1510 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Zeichen für gelesene wichtige/'hot' Artikel. setzt, bricht ab." -#: src/lang.c:1519 +#: src/lang.c:1511 msgid "Character to show readselected arts:" msgstr "Zeichen für gelesene wichtige Art. :" -#: src/lang.c:1520 +#: src/lang.c:1512 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:1525 +#: src/lang.c:1517 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Maximale Länge des angezeigten Newsgruppennamens. setzt." -#: src/lang.c:1526 +#: src/lang.c:1518 msgid "Max. length of group names shown :" msgstr "Max. Länge angezeigter Gruppennamen:" -#: src/lang.c:1527 +#: src/lang.c:1519 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maximale Länge der angezeigten Newsgruppennamen\n" -#: src/lang.c:1532 +#: src/lang.c:1524 msgid "Show lines/score in listings :" msgstr "Zeige Zeilenz./Bewert. in Übersicht:" -#: src/lang.c:1533 +#: src/lang.c:1525 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:1538 +#: src/lang.c:1530 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:1539 +#: src/lang.c:1531 msgid "Number of lines to scroll in pager :" msgstr "Blättere Artikel um ... Zeilen :" -#: src/lang.c:1540 +#: src/lang.c:1532 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" @@ -4709,27 +4709,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:1547 +#: src/lang.c:1539 msgid "Display signatures. toggles & sets." msgstr "Zeige Signaturen an. wechselt & setzt." -#: src/lang.c:1548 +#: src/lang.c:1540 msgid "Display signatures :" msgstr "Zeige Signaturen an :" -#: src/lang.c:1549 +#: src/lang.c:1541 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Falls OFF zeige keine Signaturen an\n" -#: src/lang.c:1553 +#: src/lang.c:1545 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Uu-kodierte Teile als Attachment anzeigen. wechselt & setzt." -#: src/lang.c:1554 +#: src/lang.c:1546 msgid "Display uue data as an attachment :" msgstr "Zeige uue-Teile als Attachment :" -#: src/lang.c:1555 +#: src/lang.c:1547 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" @@ -4742,29 +4742,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:1564 +#: src/lang.c:1556 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "TeX german.sty Umlautkodierung auswerten. wechselt & setzt." -#: src/lang.c:1565 +#: src/lang.c:1557 msgid "Display \"a as Umlaut-a :" msgstr "Wandle TeX-Umlaute automatisch um :" -#: src/lang.c:1566 +#: src/lang.c:1558 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:1571 src/lang.c:1581 +#: src/lang.c:1563 src/lang.c:1573 msgid "Space separated list of header fields" msgstr "Durch Leerzeichen getrennte Liste der Header-Felder" -#: src/lang.c:1572 +#: src/lang.c:1564 msgid "Display these header fields (or *) :" msgstr "Zeige diese Header-Felder (oder *) :" -#: src/lang.c:1573 +#: src/lang.c:1565 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" @@ -4778,11 +4778,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:1582 +#: src/lang.c:1574 msgid "Do not display these header fields :" msgstr "Zeige folgende Header nicht an :" -#: src/lang.c:1583 +#: src/lang.c:1575 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 " @@ -4799,27 +4799,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:1593 +#: src/lang.c:1585 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:1594 +#: src/lang.c:1586 msgid "Skip multipart/alternative parts :" msgstr "Übersp. multipart/alternative-Teile:" -#: src/lang.c:1595 +#: src/lang.c:1587 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Falls ON entsorge multipart/alternative Teile des Artikels automatisch\n" -#: src/lang.c:1600 +#: src/lang.c:1592 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:1601 +#: src/lang.c:1593 msgid "Regex used to show quoted lines :" msgstr "Regulärer Ausd. für zit. Zeilen :" -#: src/lang.c:1602 +#: src/lang.c:1594 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" @@ -4828,15 +4828,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:1608 +#: src/lang.c:1600 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:1609 +#: src/lang.c:1601 msgid "Regex used to show twice quoted l. :" msgstr "Reg. Ausd. für zweifach zitierte Z.:" -#: src/lang.c:1610 +#: src/lang.c:1602 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" @@ -4845,15 +4845,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:1616 +#: src/lang.c:1608 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:1617 +#: src/lang.c:1609 msgid "Regex used to show >= 3 times q.l. :" msgstr "Reg. Ausd. für >=3-fach zitierte Z.:" -#: src/lang.c:1618 +#: src/lang.c:1610 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" @@ -4862,15 +4862,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:1625 +#: src/lang.c:1617 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:1626 +#: src/lang.c:1618 msgid "Regex used to highlight /slashes/ :" msgstr "Reg. für /Schrägst./ Hervorhebungen:" -#: src/lang.c:1627 +#: src/lang.c:1619 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" @@ -4878,15 +4878,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:1633 +#: src/lang.c:1625 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:1634 +#: src/lang.c:1626 msgid "Regex used to highlight *stars* :" msgstr "Regu. A. für *Stern* Hervorhebungen:" -#: src/lang.c:1635 +#: src/lang.c:1627 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" @@ -4894,15 +4894,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:1641 +#: src/lang.c:1633 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:1642 +#: src/lang.c:1634 msgid "Regex used to highlight -strokes- :" msgstr "Reg. für -Durchstr.- Hervorhebungen:" -#: src/lang.c:1643 +#: src/lang.c:1635 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" @@ -4910,15 +4910,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:1649 +#: src/lang.c:1641 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:1650 +#: src/lang.c:1642 msgid "Regex used to highlight _underline_:" msgstr "Reg. für _Unterstr._ Hervorhebungen:" -#: src/lang.c:1651 +#: src/lang.c:1643 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" @@ -4926,44 +4926,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:1657 +#: src/lang.c:1649 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:1658 +#: src/lang.c:1650 msgid "Regex with Subject prefixes :" msgstr "Reg. Ausd. für den Subjectanfang :" -#: src/lang.c:1659 +#: src/lang.c:1651 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:1664 +#: src/lang.c:1656 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:1665 +#: src/lang.c:1657 msgid "Regex with Subject suffixes :" msgstr "Reg. Ausd. für das Subjectende :" -#: src/lang.c:1666 +#: src/lang.c:1658 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:1671 +#: src/lang.c:1663 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:1672 +#: src/lang.c:1664 msgid "MIME binary content viewer :" msgstr "MIME-Viewer :" -#: src/lang.c:1673 +#: src/lang.c:1665 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" @@ -4972,51 +4972,51 @@ 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:1680 +#: src/lang.c:1672 msgid "Confirm before starting non-text viewing program" msgstr "Start des MIME-Viewers bestätigen" -#: src/lang.c:1681 +#: src/lang.c:1673 msgid "Ask before using MIME viewer :" msgstr "Start des MIME-Viewers bestätigen :" -#: src/lang.c:1682 +#: src/lang.c:1674 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:1687 +#: src/lang.c:1679 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "Beim Beenden anbieten, alle betretenen Gruppen als gelesen zu markieren?" -#: src/lang.c:1688 +#: src/lang.c:1680 msgid "Catchup read groups when quitting :" msgstr "Aufholen der Gruppen beim Beenden :" -#: src/lang.c:1689 +#: src/lang.c:1681 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:1694 +#: src/lang.c:1686 msgid "Catchup group using left key :" msgstr "Catchup der Gruppe mit l. Cursor :" -#: src/lang.c:1695 +#: src/lang.c:1687 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:1700 +#: src/lang.c:1692 msgid "Catchup thread by using left key :" msgstr "Catchup mit der linken Cursort. :" -#: src/lang.c:1706 +#: src/lang.c:1698 msgid "Which actions require confirmation :" msgstr "Bestätigung erforderlich für :" -#: src/lang.c:1707 +#: src/lang.c:1699 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" @@ -5024,330 +5024,330 @@ msgstr "# Welche Operationen müssen expl "# gelesen (siehe 'X' Befehl im Manual).\n" # TRANSLATION MISSING -#: src/lang.c:1712 +#: src/lang.c:1704 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1713 +#: src/lang.c:1705 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "# Falls ON wird mit der Fuktion 'Artikel als gelesen markieren' nur\n" "# der jeweilige Artikel markiert.\n" -#: src/lang.c:1717 +#: src/lang.c:1709 msgid "Program to run to open URL's, sets, cancels." msgstr "Öffne URLs mit ... setzt, bricht ab." -#: src/lang.c:1718 +#: src/lang.c:1710 msgid "Program that opens URL's :" msgstr "Öffne URLs mit ... :" -#: src/lang.c:1719 +#: src/lang.c:1711 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:1724 +#: src/lang.c:1716 msgid "Use mouse in xterm :" msgstr "Maus in xterm nutzen :" -#: src/lang.c:1725 +#: src/lang.c:1717 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:1731 +#: src/lang.c:1723 msgid "Use scroll keys on keypad :" msgstr "Scrollt. vom Nummernblock nutzen :" -#: src/lang.c:1732 +#: src/lang.c:1724 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:1737 +#: src/lang.c:1729 msgid "Enter maximum number of article to get. sets." msgstr "Maximale Anzahl der zu holenden Artikel eingeben. setzt." -#: src/lang.c:1738 +#: src/lang.c:1730 msgid "Number of articles to get :" msgstr "Anzahl der zu holenden Artikel :" -#: src/lang.c:1739 +#: src/lang.c:1731 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:1744 +#: src/lang.c:1736 msgid "Enter number of days article is considered recent. sets." msgstr "Anzahl der Tage, die ein Artikel als neu eingestuft wird. setzt." -#: src/lang.c:1745 +#: src/lang.c:1737 msgid "Article recentness time limit :" msgstr "Artikel Neuheitszeit-Limit :" -#: src/lang.c:1746 +#: src/lang.c:1738 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:1750 +#: src/lang.c:1742 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:1751 +#: src/lang.c:1743 msgid "Wildcard matching :" msgstr "Wildcardprüfung :" -#: src/lang.c:1752 +#: src/lang.c:1744 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "# Wildcardprüfung 0=(wildmat) 1=(Regulärer Ausdruck)\n" -#: src/lang.c:1756 +#: src/lang.c:1748 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Artikel mit weniger Bewertung (Score) werden als `gekillt' markiert. " "setzt." -#: src/lang.c:1757 +#: src/lang.c:1749 msgid "Score limit (kill) :" msgstr "Bewertungsgrenze (kill) :" -#: src/lang.c:1758 +#: src/lang.c:1750 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:1762 +#: src/lang.c:1754 msgid "Enter default score to kill articles. sets." msgstr "Bewertung für gekillte Artikel. setzt." -#: src/lang.c:1763 +#: src/lang.c:1755 msgid "Default score to kill articles :" msgstr "Bewertung für gekillte Artikel :" -#: src/lang.c:1764 +#: src/lang.c:1756 msgid "# Default score to kill articles\n" msgstr "# Bewertung für gekillte Artikel\n" -#: src/lang.c:1768 +#: src/lang.c:1760 msgid "Enter minimal score before an article is marked hot. sets." msgstr "Artikel mit einer höheren Bewertung (Score) werd. als wichtig/hot markiert." -#: src/lang.c:1769 +#: src/lang.c:1761 msgid "Score limit (select) :" msgstr "Bewertungsgrenze (select) :" -#: src/lang.c:1770 +#: src/lang.c:1762 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:1774 +#: src/lang.c:1766 msgid "Enter default score to select articles. sets." msgstr "Bewertung für wichtige Artikel (hot). setzt." -#: src/lang.c:1775 +#: src/lang.c:1767 msgid "Default score to select articles :" msgstr "Bewertung für wichtige Artikel :" -#: src/lang.c:1776 +#: src/lang.c:1768 msgid "# Default score to select articles\n" msgstr "# Bewertung für wichtige Artikel (hot)\n" -#: src/lang.c:1782 +#: src/lang.c:1774 msgid "Use slrnface to show ''X-Face:''s :" msgstr "''X-Face:''s mit slrnface Anzeigen :" -#: src/lang.c:1783 +#: src/lang.c:1775 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:1791 +#: src/lang.c:1783 msgid "Use ANSI color :" msgstr "Benutze ANSI-Farben :" -#: src/lang.c:1792 +#: src/lang.c:1784 msgid "# If ON using ANSI-color\n" msgstr "# Falls ON benutze ANSI-Farben\n" -#: src/lang.c:1797 +#: src/lang.c:1789 msgid "Standard foreground color :" msgstr "Standard Vordergrundfarbe :" -#: src/lang.c:1798 +#: src/lang.c:1790 msgid "# Standard foreground color\n" msgstr "# Standard Vordergrundfarbe\n" -#: src/lang.c:1803 +#: src/lang.c:1795 msgid "Standard background color :" msgstr "Standard Hintergrundfarbe :" -#: src/lang.c:1804 +#: src/lang.c:1796 msgid "# Standard-Background-Color\n" msgstr "# Standard Hintergrundfarbe\n" -#: src/lang.c:1809 +#: src/lang.c:1801 msgid "Color for inverse text (background):" msgstr "Farbe des inversen Text (Hinterg.) :" -#: src/lang.c:1810 +#: src/lang.c:1802 msgid "# Color of background for inverse text\n" msgstr "# Farbe des Hintergrunds für inversen Text\n" -#: src/lang.c:1815 +#: src/lang.c:1807 msgid "Color for inverse text (foreground):" msgstr "Farbe des inversen Text (Vordergr.):" -#: src/lang.c:1816 +#: src/lang.c:1808 msgid "# Color of foreground for inverse text\n" msgstr "# Farbe des Vordergrunds für inversen Text\n" -#: src/lang.c:1821 +#: src/lang.c:1813 msgid "Color of text lines :" msgstr "Farbe der Textzeilen :" -#: src/lang.c:1822 +#: src/lang.c:1814 msgid "# Color of text-lines\n" msgstr "# Farbe der Textzeilen\n" -#: src/lang.c:1827 +#: src/lang.c:1819 msgid "Color of mini help menu :" msgstr "Farbe des Minihilfemenü :" -#: src/lang.c:1828 +#: src/lang.c:1820 msgid "# Color of mini help menu\n" msgstr "# Farbe des Minihilfemenü\n" -#: src/lang.c:1833 +#: src/lang.c:1825 msgid "Color of help text :" msgstr "Farbe des Hilfstext :" -#: src/lang.c:1834 +#: src/lang.c:1826 msgid "# Color of help pages\n" msgstr "# Farbe der Hilfsseiten\n" -#: src/lang.c:1839 +#: src/lang.c:1831 msgid "Color of status messages :" msgstr "Farbe der Statusmeldungen :" -#: src/lang.c:1840 +#: src/lang.c:1832 msgid "# Color of messages in last line\n" msgstr "# Farbe der letzten Zeile im Artikel\n" -#: src/lang.c:1845 +#: src/lang.c:1837 msgid "Color of quoted lines :" msgstr "Farbe der zitierten Zeilen :" -#: src/lang.c:1846 +#: src/lang.c:1838 msgid "# Color of quote-lines\n" msgstr "# Farbe der zitierten Zeilen\n" -#: src/lang.c:1851 +#: src/lang.c:1843 msgid "Color of twice quoted line :" msgstr "Farbe von zweifach zitierten Zeilen:" -#: src/lang.c:1852 +#: src/lang.c:1844 msgid "# Color of twice quoted lines\n" msgstr "# Farbe von zweifach zitierten Zeilen\n" -#: src/lang.c:1857 +#: src/lang.c:1849 msgid "Color of =>3 times quoted line :" msgstr "Farbe von =>3-fach zitierten Zeilen:" -#: src/lang.c:1858 +#: src/lang.c:1850 msgid "# Color of >=3 times quoted lines\n" msgstr "# Farbe von =>3-fach zitierten Zeilen\n" -#: src/lang.c:1863 +#: src/lang.c:1855 msgid "Color of article header lines :" msgstr "Farbe der Artikelheaderzeilen :" -#: src/lang.c:1864 +#: src/lang.c:1856 msgid "# Color of header-lines\n" msgstr "# Farbe der Artikelheaderzeilen\n" -#: src/lang.c:1869 +#: src/lang.c:1861 msgid "Color of actual news header fields :" msgstr "Farbe des angezeigten Headers :" -#: src/lang.c:1870 +#: src/lang.c:1862 msgid "# Color of actual news header fields\n" msgstr "# Farbe des angezeigten Headers\n" -#: src/lang.c:1875 +#: src/lang.c:1867 msgid "Color of article subject lines :" msgstr "Farbe der Subjectzeile :" -#: src/lang.c:1876 +#: src/lang.c:1868 msgid "# Color of article subject\n" msgstr "# Farbe der Subjectzeile\n" -#: src/lang.c:1881 +#: src/lang.c:1873 msgid "Color of response counter :" msgstr "Farbe des Antwortzählers :" -#: src/lang.c:1882 +#: src/lang.c:1874 msgid "# Color of response counter\n" msgstr "# Farbe des Antwortzählers\n" -#: src/lang.c:1887 +#: src/lang.c:1879 msgid "Color of sender (From:) :" msgstr "Farbe des Autors (From:) :" -#: src/lang.c:1888 +#: src/lang.c:1880 msgid "# Color of sender (From:)\n" msgstr "# Farbe des Autors (From:)\n" -#: src/lang.c:1893 +#: src/lang.c:1885 msgid "Color of help/mail sign :" msgstr "Farbe des Hilfe/Mail-Zeichen :" -#: src/lang.c:1894 +#: src/lang.c:1886 msgid "# Color of Help/Mail-Sign\n" msgstr "# Farbe des Hilfe/Mail-Zeichen\n" -#: src/lang.c:1899 +#: src/lang.c:1891 msgid "Color of signatures :" msgstr "Farbe von Signaturen :" -#: src/lang.c:1900 +#: src/lang.c:1892 msgid "# Color of signature\n" msgstr "# Farbe von Signaturen\n" -#: src/lang.c:1905 +#: src/lang.c:1897 msgid "Color of highlighted URLs :" msgstr "Farbe der hervorgehobenen URLs :" -#: src/lang.c:1906 +#: src/lang.c:1898 msgid "# Color of highlighted URLs\n" msgstr "# Farbe der hervorgehobenen URLs\n" -#: src/lang.c:1911 +#: src/lang.c:1903 msgid "Color of highlighting with *stars* :" msgstr "Farbe der Hervorhebung *Sterne* :" -#: src/lang.c:1912 +#: src/lang.c:1904 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:1918 +#: src/lang.c:1910 msgid "Color of highlighting with _dash_ :" msgstr "Farbe der Hervorhebung _Striche_ :" -#: src/lang.c:1924 +#: src/lang.c:1916 msgid "Color of highlighting with /slash/ :" msgstr "Farbe der Hervorhebung /Schrägstr./:" -#: src/lang.c:1930 +#: src/lang.c:1922 msgid "Color of highlighting with -stroke-:" msgstr "Farbe der Hervorhebung -Durchstr.- :" -#: src/lang.c:1937 +#: src/lang.c:1929 msgid "Attr. of highlighting with *stars* :" msgstr "Hervorhebungsattribute *Sterne* :" -#: src/lang.c:1938 +#: src/lang.c:1930 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5361,39 +5361,39 @@ msgstr "# Attribute der Hervorhebung von "# 0 - normal, 1 - unterstrichen, 2 - beste Hervorhebung,\n" "# 3 - invers, 4 - blinkend, 5 - halbe Helligkeit, 6 - fett\n" -#: src/lang.c:1948 +#: src/lang.c:1940 msgid "Attr. of highlighting with _dash_ :" msgstr "Hervorhebungsattr. _Unterstriche_ :" -#: src/lang.c:1954 +#: src/lang.c:1946 msgid "Attr. of highlighting with /slash/ :" msgstr "Hervorhebungsattr. /Schrägstriche/ :" -#: src/lang.c:1960 +#: src/lang.c:1952 msgid "Attr. of highlighting with -stroke-:" msgstr "Hervorhebungsattr. -Durchstreich.- :" -#: src/lang.c:1966 +#: src/lang.c:1958 msgid "URL highlighting in message body :" msgstr "URL-Hervorhebung im Artikel :" -#: src/lang.c:1967 +#: src/lang.c:1959 msgid "# Enable URL highlighting?\n" msgstr "# URL-Hervorhebung aktivieren?\n" -#: src/lang.c:1972 +#: src/lang.c:1964 msgid "Word highlighting in message body :" msgstr "Wort-Hervorhebung im Artikel :" -#: src/lang.c:1973 +#: src/lang.c:1965 msgid "# Enable word highlighting?\n" msgstr "# Wort-Hervorhebung aktivieren?\n" -#: src/lang.c:1978 +#: src/lang.c:1970 msgid "What to display instead of mark :" msgstr "Anstelle der Markierung anzeigen :" -#: src/lang.c:1979 +#: src/lang.c:1971 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" @@ -5401,59 +5401,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:1985 +#: src/lang.c:1977 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Nach wie vielen Zeichen soll im Pager umbrochen werden? setzt." -#: src/lang.c:1986 +#: src/lang.c:1978 msgid "Page line wrap column :" msgstr "Zeilen umbrechen nach :" -#: src/lang.c:1987 +#: src/lang.c:1979 msgid "# Wrap article lines at column\n" msgstr "# In der Artikelanzeige Zeilen umbrechen bei Spalte\n" -#: src/lang.c:1992 +#: src/lang.c:1984 msgid "Wrap around threads on next unread :" msgstr "Nä.ungel.-kein Abbr. am Listenende?:" -#: src/lang.c:1993 +#: src/lang.c:1985 msgid "# If ON wrap around threads on searching next unread article\n" 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:1997 +#: src/lang.c:1989 msgid "Enter default mail address (and fullname). sets." msgstr "Standard Mail-Adresse (und Name) eingeben. setzt." -#: src/lang.c:1998 +#: src/lang.c:1990 msgid "Mail address (and fullname) :" msgstr "Mailadresse (und Name) :" -#: src/lang.c:1999 +#: src/lang.c:1991 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:2004 +#: src/lang.c:1996 msgid "Show empty Followup-To in editor :" msgstr "Leeres Fup'2 im Editor anzeigen :" -#: src/lang.c:2005 +#: src/lang.c:1997 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:2009 +#: src/lang.c:2001 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "Setze Pfad/! Kommando/--none um ihre Signatur festzulegen. setzt." -#: src/lang.c:2010 +#: src/lang.c:2002 msgid "Create signature from path/command :" msgstr "Erzeuge Signatur aus Pfad/Kommando :" -#: src/lang.c:2011 +#: src/lang.c:2003 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 " @@ -5464,49 +5464,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:2018 +#: src/lang.c:2010 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Trenne Sig mit \"-- \" in eigener Zeile ab. wechselt & setzt." -#: src/lang.c:2019 +#: src/lang.c:2011 msgid "Prepend signature with \"-- \" :" msgstr "Trenne Sig mit \"-- \" ab :" -#: src/lang.c:2020 +#: src/lang.c:2012 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# Falls ON trenne Signatur mit '\\n-- \\n' ab\n" -#: src/lang.c:2024 +#: src/lang.c:2016 msgid "Add signature when reposting articles. toggles & sets." msgstr "Sig. beim Reposten eines Artikels hinzufügen? wechselt & setzt." -#: src/lang.c:2025 +#: src/lang.c:2017 msgid "Add signature when reposting :" msgstr "Signatur beim Reposten anhängen :" -#: src/lang.c:2026 +#: src/lang.c:2018 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:2030 +#: src/lang.c:2022 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:2031 +#: src/lang.c:2023 msgid "Characters used as quote-marks :" msgstr "Zitatzeichen :" -#: src/lang.c:2032 +#: src/lang.c:2024 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:2038 +#: src/lang.c:2030 msgid "Quoting behavior :" msgstr "Zitierverhalten :" -#: src/lang.c:2039 +#: src/lang.c:2031 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5527,15 +5527,15 @@ msgstr "# Spezielle Optionen beim Zitier "# 7 = Zitatzeichen zusammenziehen & Signaturen zitieren & Leerzeilen " "zitieren\n" -#: src/lang.c:2051 src/lang.c:2059 src/lang.c:2065 +#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 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:2052 +#: src/lang.c:2044 msgid "Quote line when following up :" msgstr "Einleitungszeile beim Antworten :" -#: src/lang.c:2053 +#: src/lang.c:2045 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" @@ -5543,35 +5543,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:2060 +#: src/lang.c:2052 msgid "Quote line when cross-posting :" msgstr "Einleitungszeile beim Crossposten :" -#: src/lang.c:2066 +#: src/lang.c:2058 msgid "Quote line when mailing :" msgstr "Einleitungszeile bei Mailantwort :" -#: src/lang.c:2071 +#: src/lang.c:2063 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Falls ON, füge User-Agent:-Header ein. wechselt & setzt." -#: src/lang.c:2072 +#: src/lang.c:2064 msgid "Insert 'User-Agent:'-header :" msgstr "Füge 'User-Agent:'-header ein :" -#: src/lang.c:2073 +#: src/lang.c:2065 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Falls ON füge 'User-Agent: header' ein\n" -#: src/lang.c:2077 +#: src/lang.c:2069 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "Zeichensatz für MIME (z.B. US-ASCII, ISO-8859-1, EUC-KR), setzt." -#: src/lang.c:2078 +#: src/lang.c:2070 msgid "MM_CHARSET :" msgstr "MM_CHARSET :" -#: src/lang.c:2079 +#: src/lang.c:2071 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" @@ -5588,27 +5588,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:2090 +#: src/lang.c:2082 msgid "MM_NETWORK_CHARSET :" msgstr "MM_NETWORK_CHARSET :" -#: src/lang.c:2091 +#: src/lang.c:2083 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:2097 +#: src/lang.c:2089 msgid "Mailbox format :" msgstr "Mailbox-Format :" -#: src/lang.c:2098 +#: src/lang.c:2090 msgid "# Format of the mailbox.\n" msgstr "# Format der Mailbox.\n" -#: src/lang.c:2103 +#: src/lang.c:2095 msgid "MIME encoding in news messages :" msgstr "MIME-Kodierung in Newsartikeln :" -#: src/lang.c:2104 +#: src/lang.c:2096 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" @@ -5622,15 +5622,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:2112 src/lang.c:2133 +#: src/lang.c:2104 src/lang.c:2125 msgid "Don't change unless you know what you are doing. cancels." msgstr "Nur ändern, wenn Sie genau wissen, was Sie machen. bricht ab" -#: src/lang.c:2113 +#: src/lang.c:2105 msgid "Use 8bit characters in news headers:" msgstr "Benutze 8bit-Zeichen im Newsheader :" -#: src/lang.c:2114 +#: src/lang.c:2106 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" @@ -5642,27 +5642,27 @@ msgstr "# Wenn ON werden 8-Bit-Zeichen ( "# kodiert, wenn post_mime_encoding nicht auch auf 8bit eingestellt\n" "# ist.\n" -#: src/lang.c:2121 +#: src/lang.c:2113 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Nachbearbeitete Artikel autom. anz. wechselt, setzt, Ende" -#: src/lang.c:2122 +#: src/lang.c:2114 msgid "View post-processed files :" msgstr "Nachbearbeitete Artikel anzeigen :" -#: src/lang.c:2123 +#: src/lang.c:2115 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:2128 +#: src/lang.c:2120 msgid "MIME encoding in mail messages :" msgstr "MIME-Kodierung für E-Mails :" -#: src/lang.c:2134 +#: src/lang.c:2126 msgid "Use 8bit characters in mail headers:" msgstr "Benutze 8bit Zeichen im Mail Header:" -#: src/lang.c:2135 +#: src/lang.c:2127 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 " @@ -5679,24 +5679,24 @@ 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:2145 +#: src/lang.c:2137 msgid "Strip blanks from ends of lines :" msgstr "Leerzeichen am Zeilenende entfernen:" -#: src/lang.c:2146 +#: src/lang.c:2138 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "# Falls ON lösche Leerzeichen am Zeilenende; verbessert die Geschwindigkeit\n" -#: src/lang.c:2151 +#: src/lang.c:2143 msgid "If ON, use transliteration. toggles & sets." msgstr "Wenn ON verwende Umschreibungen. wechselt & setzt." -#: src/lang.c:2152 +#: src/lang.c:2144 msgid "Transliteration :" msgstr "Verwende Umschreibungen :" -#: src/lang.c:2153 +#: src/lang.c:2145 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" @@ -5706,242 +5706,242 @@ msgstr "# Wenn ON verwende //TRANSLIT Er "# Terminal als EUR umschrieben, ohne //TRANSLIT würde tin ein\n" "# Fragezeichen verwenden.\n" -#: src/lang.c:2160 +#: src/lang.c:2152 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Sendet ihnen automatisch eine Kopie. wechselt & setzt." -#: src/lang.c:2161 +#: src/lang.c:2153 msgid "Send you a cc automatically :" msgstr "Sendet Ihnen ein Cc automatisch :" -#: src/lang.c:2162 +#: src/lang.c:2154 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:2166 +#: src/lang.c:2158 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Sendet ihnen automatisch eine blinde Kopie. wechselt & setzt." -#: src/lang.c:2167 +#: src/lang.c:2159 msgid "Send you a blind cc automatically :" msgstr "Sendet Ihnen eine blinde cc autom. :" -#: src/lang.c:2168 +#: src/lang.c:2160 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:2172 +#: src/lang.c:2164 msgid "Enter address elements about which you want to be warned. sets." msgstr "Geben Sie den Adressenteil an, vor dem Sie gewarnt werden. setzt." -#: src/lang.c:2173 +#: src/lang.c:2165 msgid "Spamtrap warning address parts :" msgstr "Spamfallenwarnung in Adresse :" -#: src/lang.c:2174 +#: src/lang.c:2166 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:2179 +#: src/lang.c:2171 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Gültigkeit eines Filtereintrags in Tagen. setzt." -#: src/lang.c:2180 +#: src/lang.c:2172 msgid "No. of days a filter entry is valid:" msgstr "Tage, die ein Filter gültig ist :" -#: src/lang.c:2181 +#: src/lang.c:2173 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:2185 +#: src/lang.c:2177 msgid "Add posted articles to filter. toggles & sets." msgstr "Gepostete Artikel zum Filter hinzufügen. wechselt & setzt." -#: src/lang.c:2186 +#: src/lang.c:2178 msgid "Add posted articles to filter :" msgstr "Füge gepostete Artikel zum Filter :" -#: src/lang.c:2187 +#: src/lang.c:2179 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:2191 +#: src/lang.c:2183 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:2192 +#: src/lang.c:2184 msgid "Mail directory :" msgstr "Mail Verzeichnis :" -#: src/lang.c:2193 +#: src/lang.c:2185 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:2198 +#: src/lang.c:2190 msgid "Save articles in batch mode (-S) :" msgstr "Speicher Artikel im Batchmode (-S) :" -#: src/lang.c:2199 +#: src/lang.c:2191 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:2204 +#: src/lang.c:2196 msgid "The directory where you want articles/threads saved." msgstr "Das Verzeichnis, in dem Artikel/Threads gespeichert werden sollen." -#: src/lang.c:2205 +#: src/lang.c:2197 msgid "Directory to save arts/threads in :" msgstr "Verz. um Art/Threads zu speichern :" -#: src/lang.c:2206 +#: src/lang.c:2198 msgid "# Directory where articles/threads are saved\n" msgstr "# Verzeichnis in dem Artikel/Threads gespeichert werden\n" -#: src/lang.c:2210 +#: src/lang.c:2202 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "Autom. sp. von Art/Thread anhand Archive-name:-Header. wechselt & " " setzt." -#: src/lang.c:2211 +#: src/lang.c:2203 msgid "Use Archive-name: header for save :" msgstr "Nutze Archive-name: zum Speichern :" -#: src/lang.c:2212 +#: src/lang.c:2204 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:2217 +#: src/lang.c:2209 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "Gesp. Art. gelesen markieren. wechselt, setzt, bricht ab." -#: src/lang.c:2218 +#: src/lang.c:2210 msgid "Mark saved articles/threads as read:" msgstr "Mark. gesp. Artikel/Threads gelesen:" -#: src/lang.c:2219 +#: src/lang.c:2211 msgid "# If ON mark articles that are saved as read\n" msgstr "# Falls ON werden gespeicherte Artikel als gelesen markiert\n" -#: src/lang.c:2223 +#: src/lang.c:2215 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Bearbeite (z.B. unshar) gesp. Art/Threads. wechselt & setzt." -#: src/lang.c:2224 +#: src/lang.c:2216 msgid "Post process saved articles :" msgstr "Nachbearbeiten gespeichert. Artikel:" -#: src/lang.c:2225 +#: src/lang.c:2217 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:2231 +#: src/lang.c:2223 msgid "Process only unread articles :" msgstr "Bearbeite nur ungelesene Artikel :" -#: src/lang.c:2232 +#: src/lang.c:2224 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:2237 +#: src/lang.c:2229 msgid "Print all or just part of header. toggles & sets." msgstr "Drucke alles oder nur Teile des Headers wechselt & setzt." -#: src/lang.c:2238 +#: src/lang.c:2230 msgid "Print all headers when printing :" msgstr "Alle Header beim Drucken ausgeben :" -#: src/lang.c:2239 +#: src/lang.c:2231 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:2243 +#: src/lang.c:2235 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:2244 +#: src/lang.c:2236 msgid "Printer program with options :" msgstr "Druckprogramm mit Optionen :" -#: src/lang.c:2245 +#: src/lang.c:2237 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# Druckprogramm mit Optionen zum drucken der Artikel/Threads\n" -#: src/lang.c:2251 +#: src/lang.c:2243 msgid "Force redraw after certain commands:" msgstr "Anzeigeauffrischung nach Kommandos :" -#: src/lang.c:2252 +#: src/lang.c:2244 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:2256 +#: src/lang.c:2248 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "Starte Editor mit Einrückung. wechselt, setzt, bricht ab." -#: src/lang.c:2257 +#: src/lang.c:2249 msgid "Start editor with line offset :" msgstr "Starte Editor mit Einrückung :" -#: src/lang.c:2258 +#: src/lang.c:2250 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:2263 +#: src/lang.c:2255 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "%E für Editor, %F für Dateiname, %N für Zeilennummer, setzt." -#: src/lang.c:2264 +#: src/lang.c:2256 msgid "Invocation of your editor :" msgstr "Aufruf ihres Editors :" -#: src/lang.c:2265 +#: src/lang.c:2257 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:2270 +#: src/lang.c:2262 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:2271 +#: src/lang.c:2263 msgid "External inews :" msgstr "Externes inews-Programm :" -#: src/lang.c:2272 +#: src/lang.c:2264 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:2276 +#: src/lang.c:2268 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "%M für den Mailer, %S für Subject, %T für to, %F für Dateinamen, setzt." -#: src/lang.c:2277 +#: src/lang.c:2269 msgid "Invocation of your mail command :" msgstr "Aufruf ihres Mailkommandos :" -#: src/lang.c:2278 +#: src/lang.c:2270 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" @@ -5951,11 +5951,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:2286 +#: src/lang.c:2278 msgid "Use interactive mail reader :" msgstr "Benutze interaktives Mailprogramm :" -#: src/lang.c:2287 +#: src/lang.c:2279 msgid "# Interactive mailreader:\n" "# 0 = no interactive mailreader\n" "# 1 = use interactive mailreader with headers in file\n" @@ -5966,125 +5966,125 @@ msgstr "# Interaktives Mailprogramm:\n" "übergeben\n" "# 2 = interaktives Mailprogramm, Mailheader werden als Argumente übergeben\n" -#: src/lang.c:2295 +#: src/lang.c:2287 msgid "Remove ~/.article after posting :" msgstr "Entferne ~/.article nach dem posten:" -#: src/lang.c:2296 +#: src/lang.c:2288 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Falls ON entferne ~/.article nach dem posten.\n" -#: src/lang.c:2300 +#: src/lang.c:2292 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "Dateiname für Kopie geposteter Artikel. setzt, kein Name=keine Kopie." -#: src/lang.c:2301 +#: src/lang.c:2293 msgid "Filename for posted articles :" msgstr "Gepostete Artikel speichern in :" -#: src/lang.c:2302 +#: src/lang.c:2294 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:2307 +#: src/lang.c:2299 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "Behalte alle Fehlschläge in ~/dead.articles. wechselt & setzt." -#: src/lang.c:2308 +#: src/lang.c:2300 msgid "Keep failed arts in ~/dead.articles:" msgstr "Halte Fehlschl. in ~/dead.articles :" -#: src/lang.c:2309 +#: src/lang.c:2301 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:2313 +#: src/lang.c:2305 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Wollen Sie nicht-abonnierte Gruppen aus der .newsrc entfernen?" -#: src/lang.c:2314 +#: src/lang.c:2306 msgid "No unsubscribed groups in newsrc :" msgstr "Nur abonnierte Gruppen in newsrc :" -#: src/lang.c:2315 +#: src/lang.c:2307 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Falls ON entferne nicht-abonnierte Gruppen aus der newsrc\n" -#: src/lang.c:2320 +#: src/lang.c:2312 msgid "Remove bogus groups from newsrc :" msgstr "Lösche nicht vorhande G. aus newsrc:" -#: src/lang.c:2321 +#: src/lang.c:2313 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:2325 +#: src/lang.c:2317 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Sekunden, nach denen die active-Datei wieder gelesen wird. setzt." -#: src/lang.c:2326 +#: src/lang.c:2318 msgid "Interval in secs to reread active :" msgstr "Active alle ... Sekunden neu lesen :" -#: src/lang.c:2327 +#: src/lang.c:2319 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:2332 +#: src/lang.c:2324 msgid "Reconnect to server automatically :" msgstr "Autom. Wiederverbindung zum Server :" -#: src/lang.c:2333 +#: src/lang.c:2325 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:2337 +#: src/lang.c:2329 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Erzeuge lokale Kopien der NNTP Overview Dateien. wechselt & " "setzt." -#: src/lang.c:2338 +#: src/lang.c:2330 msgid "Cache NNTP overview files locally :" msgstr "Speichere NNTP Overview Daten lokal:" -#: src/lang.c:2339 +#: src/lang.c:2331 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Falls ON, erzeuge lokale Kopien der NNTP Overview Dateien.\n" -#: src/lang.c:2343 +#: src/lang.c:2335 msgid "Enter format string. sets, cancels." msgstr "Format-Zeichenkette eingeben. setzt, bricht ab." -#: src/lang.c:2344 +#: src/lang.c:2336 msgid "Format string for display of dates :" msgstr "Datums Format-Zeichenkette :" -#: src/lang.c:2345 +#: src/lang.c:2337 msgid "# Format string for date representation\n" msgstr "# Zeichenkette die die Datumsanzeige beschreibt.\n" # TRANSLATION MISSING -#: src/lang.c:2351 +#: src/lang.c:2343 msgid "Unicode normalization form :" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2352 +#: src/lang.c:2344 msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" -#: src/main.c:586 +#: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" msgstr "Version: %s Ausgabe %s (\"%s\") %s %s" -#: src/main.c:589 +#: src/main.c:593 #, c-format msgid "Version: %s release %s (\"%s\")" msgstr "Version: %s Ausgabe %s (\"%s\")" @@ -6093,23 +6093,23 @@ msgstr "Version: %s Ausgabe %s (\"%s\")" msgid "Unreachable?\n" msgstr "Unerreichbar?\n" -#: src/nntplib.c:821 +#: src/nntplib.c:822 #, c-format msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "\n" "Server reagierte nicht, Wiederholung Nummer # %d\n" -#: src/nntplib.c:839 +#: src/nntplib.c:840 msgid "Rejoin current group\n" msgstr "Betrete aktuelle Gruppe neu\n" -#: src/nntplib.c:846 +#: src/nntplib.c:847 #, c-format msgid "Read (%s)\n" msgstr "Lese (%s)\n" -#: src/nntplib.c:848 +#: src/nntplib.c:849 #, c-format msgid "Resend last command (%s)\n" msgstr "Sende letztes Kommando (%s) neu\n" @@ -6119,7 +6119,7 @@ msgstr "Sende letztes Kommando (%s) neu\ msgid "couldn't expand %s\n" msgstr "Kann %s nicht expandieren\n" -#: src/post.c:1939 +#: src/post.c:1951 #, c-format msgid "Posting: %.*s ..." msgstr "Poste: %.*s ..." @@ -6139,15 +6139,15 @@ msgid "Draining\n" msgstr "Ablassen\n" #. Don't hash the initial '<' -#: src/refs.c:220 +#: src/refs.c:251 msgid "unchanged" msgstr "unverändert" -#: src/refs.c:573 +#: src/refs.c:610 msgid "[- Unavailable -]" msgstr "[- Nicht Verfügbar -]" -#: src/save.c:975 +#: src/save.c:976 msgid "bytes" msgstr "Bytes" @@ -6159,7 +6159,7 @@ msgstr "ungelesen" msgid "all" msgstr "Alle" -#: src/select.c:525 src/select.c:527 +#: src/select.c:529 src/select.c:531 msgid " R" msgstr " R" Binary files tin-1.7.3/po/en_GB.gmo and tin-1.7.4/po/en_GB.gmo differ diff -Nurp tin-1.7.3/po/en_GB.po tin-1.7.4/po/en_GB.po --- tin-1.7.3/po/en_GB.po Sat Dec 20 18:45:12 2003 +++ tin-1.7.4/po/en_GB.po Wed Feb 25 10:34:11 2004 @@ -2,8 +2,8 @@ # Robert Brady , 2000-2002 # msgid "" -msgstr "Project-Id-Version: tin 1.7.0\n" - "POT-Creation-Date: 2003-12-20 18:42+0100\n" +msgstr "Project-Id-Version: tin 1.7.4\n" + "POT-Creation-Date: 2004-02-25 10:33+0100\n" "PO-Revision-Date: 2002-11-15 20:10+0000\n" "Last-Translator: Robert Brady \n" "Language-Team: \n" @@ -11,7 +11,7 @@ msgstr "Project-Id-Version: tin 1.7.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1425 +#: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" @@ -227,7 +227,7 @@ msgstr "" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:608 src/filter.c:616 +#: src/filter.c:612 src/filter.c:620 msgid "Removed from the previous rule: " msgstr "" @@ -451,7 +451,7 @@ msgid "*** Beginning of article ***" msgstr "" #: src/lang.c:97 -msgid "Cancel (delete) or supersede (overwrite) article [%%.*s]? (%s/%s/%s): " +msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "" #: src/lang.c:98 @@ -574,7 +574,7 @@ msgstr "" msgid "Creating newsrc file...\n" msgstr "" -#: src/lang.c:127 src/lang.c:1126 +#: src/lang.c:127 src/lang.c:1118 msgid "Default" msgstr "" @@ -1141,7 +1141,7 @@ msgid "0 - 9\t display article by numbe msgstr "" #: src/lang.c:283 -msgid "cancel (delete) current article; must have been posted by you" +msgid "cancel (delete) or supersede (overwrite) current article" msgstr "" #: src/lang.c:284 @@ -1188,7 +1188,7 @@ msgstr "" msgid "display first article in next thread" msgstr "" -#: src/lang.c:295 src/lang.c:302 src/lang.c:361 src/lang.c:362 +#: src/lang.c:295 msgid "display next unread article" msgstr "" @@ -1200,7 +1200,7 @@ msgstr "" msgid "display previous article" msgstr "" -#: src/lang.c:298 src/lang.c:364 +#: src/lang.c:298 msgid "display previous unread article" msgstr "" @@ -1216,191 +1216,195 @@ msgstr "" msgid "return to group selection level" msgstr "" -#: src/lang.c:303 +#: src/lang.c:302 msgid "reply through mail to author" msgstr "" -#: src/lang.c:304 +#: src/lang.c:303 msgid "reply through mail (don't copy text) to author" msgstr "" -#: src/lang.c:305 +#: src/lang.c:304 msgid "reply through mail to author quoting complete headers" msgstr "" -#: src/lang.c:306 src/lang.c:366 +#: src/lang.c:305 msgid "repost chosen article to another group" msgstr "" -#: src/lang.c:307 +#: src/lang.c:306 msgid "search backwards within this article" msgstr "" -#: src/lang.c:308 +#: src/lang.c:307 msgid "search forwards within this article" msgstr "" -#: src/lang.c:309 +#: src/lang.c:308 msgid "show article in raw-mode (including all headers)" msgstr "" -#: src/lang.c:310 +#: src/lang.c:309 msgid "skip next block of included text" msgstr "" -#: src/lang.c:311 +#: src/lang.c:310 msgid "toggle display of sections hidden by a form-feed (^L) on/off" msgstr "" -#: src/lang.c:312 +#: src/lang.c:311 msgid "toggle word highlighting on/off" msgstr "" -#: src/lang.c:313 +#: src/lang.c:312 msgid "toggle ROT-13 (basic decode) for current article" msgstr "" -#: src/lang.c:314 +#: src/lang.c:313 msgid "toggle tabwidth 4 <-> 8" msgstr "" -#: src/lang.c:315 +#: src/lang.c:314 msgid "toggle german TeX style decoding for current article" msgstr "" -#: src/lang.c:316 +#: src/lang.c:315 msgid "toggle display of uuencoded sections" msgstr "" -#: src/lang.c:317 +#: src/lang.c:316 msgid "View/save multimedia attachments" msgstr "" -#: src/lang.c:318 +#: src/lang.c:317 #, c-format msgid "report bug or comment via mail to %s" msgstr "" -#: src/lang.c:319 +#: src/lang.c:318 msgid "choose range of articles to be affected by next command" msgstr "" -#: src/lang.c:320 +#: src/lang.c:319 msgid "escape from command prompt" msgstr "" -#: src/lang.c:321 +#: src/lang.c:320 msgid "get help" msgstr "" -#: src/lang.c:322 +#: src/lang.c:321 msgid "display last article viewed" msgstr "" -#: src/lang.c:323 +#: src/lang.c:322 msgid "down one line" msgstr "" -#: src/lang.c:324 +#: src/lang.c:323 msgid "up one line" msgstr "" -#: src/lang.c:325 +#: src/lang.c:324 msgid "go to article chosen by Message-ID" msgstr "" -#: src/lang.c:326 +#: src/lang.c:325 msgid "mail article/thread/hot/pattern/tagged articles to someone" msgstr "" -#: src/lang.c:327 +#: src/lang.c:326 msgid "menu of configurable options" msgstr "" -#: src/lang.c:328 +#: src/lang.c:327 msgid "down one page" msgstr "" -#: src/lang.c:329 +#: src/lang.c:328 msgid "up one page" msgstr "" -#: src/lang.c:330 +#: src/lang.c:329 msgid "post (write) article to current group" msgstr "" -#: src/lang.c:331 +#: src/lang.c:330 msgid "post postponed articles" msgstr "" -#: src/lang.c:332 +#: src/lang.c:331 msgid "list articles posted by you (from posted file)" msgstr "" -#: src/lang.c:333 +#: src/lang.c:332 msgid "return to previous menu" msgstr "" -#: src/lang.c:334 +#: src/lang.c:333 msgid "quit tin immediately" msgstr "" -#: src/lang.c:335 +#: src/lang.c:334 msgid "redraw page" msgstr "" -#: src/lang.c:336 +#: src/lang.c:335 msgid "save article/thread/hot/pattern/tagged articles to file" msgstr "" -#: src/lang.c:337 +#: src/lang.c:336 msgid "save marked articles automatically without user prompts" msgstr "" -#: src/lang.c:338 +#: src/lang.c:337 msgid "search for articles by author backwards" msgstr "" -#: src/lang.c:339 +#: src/lang.c:338 msgid "search for articles by author forwards" msgstr "" -#: src/lang.c:340 +#: src/lang.c:339 msgid "search all articles for a given string (this may take some time)" msgstr "" -#: src/lang.c:341 +#: src/lang.c:340 msgid " \t (searches are case-insensitive and wrap around to all articles)" msgstr "" -#: src/lang.c:342 +#: src/lang.c:341 msgid "search for articles by Subject line backwards" msgstr "" -#: src/lang.c:343 +#: src/lang.c:342 msgid "search for articles by Subject line forwards" msgstr "" -#: src/lang.c:344 +#: src/lang.c:343 msgid "repeat last search" msgstr "" -#: src/lang.c:345 +#: src/lang.c:344 msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "" -#: src/lang.c:346 +#: src/lang.c:345 msgid "toggle info message in last line (subject/description)" msgstr "" -#: src/lang.c:347 +#: src/lang.c:346 msgid "toggle inverse video" msgstr "" -#: src/lang.c:348 +#: src/lang.c:347 msgid "toggle mini help menu display" msgstr "" +#: src/lang.c:348 +msgid "cycle the display of authors email address, real name, both or neither" +msgstr "" + #: src/lang.c:349 msgid "show version information" msgstr "" @@ -1417,321 +1421,317 @@ msgstr "" msgid "choose first thread in list" msgstr "" -#: src/lang.c:353 src/lang.c:384 -msgid "choose group by name" -msgstr "" - -#: src/lang.c:354 +#: src/lang.c:353 msgid "choose last thread in list" msgstr "" -#: src/lang.c:355 +#: src/lang.c:354 msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "" -#: src/lang.c:356 +#: src/lang.c:355 msgid "mark article as unread" msgstr "" -#: src/lang.c:357 +#: src/lang.c:356 msgid "mark current thread or tagged threads as read" msgstr "" -#: src/lang.c:358 +#: src/lang.c:357 msgid "mark thread as unread" msgstr "" -#: src/lang.c:359 +#: src/lang.c:358 msgid "toggle display of all/selected articles" msgstr "" -#: src/lang.c:360 +#: src/lang.c:359 msgid "display next group" msgstr "" -#: src/lang.c:363 +#: src/lang.c:360 msgid "display previous group" msgstr "" -#: src/lang.c:365 src/lang.c:413 -msgid "read chosen article" -msgstr "" - -#: src/lang.c:367 +#: src/lang.c:361 msgid "toggle all selections (all articles)" msgstr "" -#: src/lang.c:368 +#: src/lang.c:362 msgid "select group (make \"hot\")" msgstr "" -#: src/lang.c:369 +#: src/lang.c:363 msgid "select thread" msgstr "" -#: src/lang.c:370 +#: src/lang.c:364 msgid "select threads if at least one unread article is selected" msgstr "" -#: src/lang.c:371 +#: src/lang.c:365 msgid "select threads that match user specified pattern" msgstr "" -#: src/lang.c:372 +#: src/lang.c:366 msgid "tag all parts of current multipart-message in order" msgstr "" -#: src/lang.c:373 +#: src/lang.c:367 msgid "0 - 9\t choose thread by number" msgstr "" -#: src/lang.c:374 +#: src/lang.c:368 msgid "toggle limit number of articles to get, and reload" msgstr "" -#: src/lang.c:375 +#: src/lang.c:369 msgid "toggle display of all/unread articles" msgstr "" -#: src/lang.c:376 src/lang.c:414 -msgid "cycle the display of authors email address, real name, both or neither" -msgstr "" - -#: src/lang.c:377 +#: src/lang.c:370 msgid "toggle selection of thread" msgstr "" -#: src/lang.c:378 +#: src/lang.c:371 msgid "cycle through threading options available" msgstr "" -#: src/lang.c:379 +#: src/lang.c:372 msgid "undo all selections (all articles)" msgstr "" -#: src/lang.c:380 +#: src/lang.c:373 msgid "untag all tagged threads" msgstr "" -#: src/lang.c:381 +#: src/lang.c:374 msgid "mark all articles in group as read" msgstr "" -#: src/lang.c:382 +#: src/lang.c:375 msgid "mark all articles in group as read and move to next unread group" msgstr "" -#: src/lang.c:383 +#: src/lang.c:376 msgid "choose first group in list" msgstr "" -#: src/lang.c:385 +#: src/lang.c:377 +msgid "choose group by name" +msgstr "" + +#: src/lang.c:378 msgid "0 - 9\t choose group by number" msgstr "" -#: src/lang.c:386 +#: src/lang.c:379 msgid "choose range of groups to be affected by next command" msgstr "" -#: src/lang.c:387 +#: src/lang.c:380 msgid "choose last group in list" msgstr "" -#: src/lang.c:388 +#: src/lang.c:381 msgid "mark all articles in chosen group unread" msgstr "" -#: src/lang.c:389 +#: src/lang.c:382 msgid "move chosen group within list" msgstr "" -#: src/lang.c:390 +#: src/lang.c:383 msgid "choose next group with unread news" msgstr "" -#: src/lang.c:391 src/lang.c:1173 +#: src/lang.c:384 src/lang.c:1165 msgid "quit" msgstr "" -#: src/lang.c:392 +#: src/lang.c:385 msgid "quit without saving configuration changes" msgstr "" -#: src/lang.c:393 +#: src/lang.c:386 msgid "read chosen group" msgstr "" -#: src/lang.c:394 +#: src/lang.c:387 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr "" -#: src/lang.c:395 +#: src/lang.c:388 msgid "search backwards for a group name" msgstr "" -#: src/lang.c:396 +#: src/lang.c:389 msgid " \t (all searches are case-insensitive and wrap around)" msgstr "" -#: src/lang.c:397 +#: src/lang.c:390 msgid "search forwards for a group name" msgstr "" -#: src/lang.c:398 +#: src/lang.c:391 msgid "subscribe to chosen group" msgstr "" -#: src/lang.c:399 +#: src/lang.c:392 msgid "subscribe to groups that match pattern" msgstr "" -#: src/lang.c:400 +#: src/lang.c:393 msgid "reread active file to check for any new news" msgstr "" -#: src/lang.c:401 +#: src/lang.c:394 msgid "toggle display of group name only or group name plus description" msgstr "" -#: src/lang.c:402 +#: src/lang.c:395 msgid "toggle display to show all/unread subscribed groups" msgstr "" -#: src/lang.c:403 +#: src/lang.c:396 msgid "unsubscribe from chosen group" msgstr "" -#: src/lang.c:404 +#: src/lang.c:397 msgid "unsubscribe from groups that match pattern" msgstr "" -#: src/lang.c:405 +#: src/lang.c:398 msgid "sort the list of groups" msgstr "" -#: src/lang.c:406 +#: src/lang.c:399 msgid "toggle display to show all/subscribed groups" msgstr "" -#: src/lang.c:407 +#: src/lang.c:400 msgid "0 - 9\t choose article by number" msgstr "" -#: src/lang.c:408 +#: src/lang.c:401 msgid "mark thread as read and return to group index page" msgstr "" -#: src/lang.c:409 +#: src/lang.c:402 msgid "mark thread as read and enter next unread thread or group" msgstr "" -#: src/lang.c:410 +#: src/lang.c:403 msgid "choose first article in list" msgstr "" -#: src/lang.c:411 +#: src/lang.c:404 msgid "choose last article in list" msgstr "" -#: src/lang.c:412 +#: src/lang.c:405 msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "" -#: src/lang.c:415 +#: src/lang.c:406 +msgid "read chosen article" +msgstr "" + +#: src/lang.c:407 msgid "Display properties\n" "------------------" msgstr "" -#: src/lang.c:416 +#: src/lang.c:408 msgid "Miscellaneous\n" "-------------" msgstr "" -#: src/lang.c:417 +#: src/lang.c:409 msgid "Moving around\n" "-------------" msgstr "" -#: src/lang.c:418 +#: src/lang.c:410 msgid "Group/thread/article operations\n" "-------------------------------" msgstr "" -#: src/lang.c:420 +#: src/lang.c:412 msgid "Group Level Commands" msgstr "" -#: src/lang.c:421 +#: src/lang.c:413 msgid "Kill filter added" msgstr "" -#: src/lang.c:422 +#: src/lang.c:414 msgid "Auto-selection filter added" msgstr "" -#: src/lang.c:423 +#: src/lang.c:415 msgid "All parts tagged" msgstr "" -#: src/lang.c:424 +#: src/lang.c:416 msgid "Storing article for later posting" msgstr "" -#: src/lang.c:425 +#: src/lang.c:417 msgid "Please enter a valid character" msgstr "" -#: src/lang.c:426 +#: src/lang.c:418 #, c-format msgid "Missing part #%d" msgstr "" -#: src/lang.c:427 +#: src/lang.c:419 msgid "*** No postponed articles ***" msgstr "" -#: src/lang.c:428 +#: src/lang.c:420 msgid "Not a multi-part message" msgstr "" -#: src/lang.c:429 +#: src/lang.c:421 msgid "You are not subscribed to this group" msgstr "" -#: src/lang.c:430 +#: src/lang.c:422 msgid "No previous expression" msgstr "" -#: src/lang.c:431 +#: src/lang.c:423 msgid "Operation disabled in no-overwrite mode" msgstr "" #. TODO: replace hardcoded key-name in txt_info_postponed -#: src/lang.c:433 +#: src/lang.c:425 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "" -#: src/lang.c:434 +#: src/lang.c:426 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:436 +#: src/lang.c:428 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "" -#: src/lang.c:437 +#: src/lang.c:429 msgid "TeX2Iso encoded article" msgstr "" -#: src/lang.c:438 +#: src/lang.c:430 msgid "incomplete " msgstr "" #. TODO: replace hardcoded key-names -#: src/lang.c:440 +#: src/lang.c:432 #, c-format msgid "\n" "Welcome to %s, a full screen threaded Netnews reader. It can read news " @@ -1767,410 +1767,410 @@ msgid "\n" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "" -#: src/lang.c:456 +#: src/lang.c:448 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "" -#: src/lang.c:457 +#: src/lang.c:449 #, c-format msgid "Invalid Sender:-header %s" msgstr "" -#: src/lang.c:458 +#: src/lang.c:450 msgid "Inverse video disabled" msgstr "" -#: src/lang.c:459 +#: src/lang.c:451 msgid "Inverse video enabled" msgstr "" -#: src/lang.c:461 +#: src/lang.c:453 #, c-format msgid "Missing definition for %s\n" msgstr "" -#: src/lang.c:462 +#: src/lang.c:454 #, c-format msgid "Invalid key definition '%s'\n" msgstr "" -#: src/lang.c:463 +#: src/lang.c:455 #, c-format msgid "Invalid keyname '%s'\n" msgstr "" -#: src/lang.c:464 +#: src/lang.c:456 #, c-format msgid "Key '%s' is defined for both %s%s and %s%s\n" msgstr "" -#: src/lang.c:465 +#: src/lang.c:457 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "" -#: src/lang.c:466 +#: src/lang.c:458 msgid "Kill Lines: (num): " msgstr "" -#: src/lang.c:467 +#: src/lang.c:459 msgid "Kill Article Menu" msgstr "" -#: src/lang.c:468 +#: src/lang.c:460 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:469 +#: src/lang.c:461 msgid "Kill pattern scope : " msgstr "" -#: src/lang.c:470 +#: src/lang.c:462 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "" -#: src/lang.c:471 +#: src/lang.c:463 msgid "Kill text pattern : " msgstr "" -#: src/lang.c:472 +#: src/lang.c:464 msgid "Kill time in days : " msgstr "" -#: src/lang.c:474 +#: src/lang.c:466 msgid "Last" msgstr "" -#: src/lang.c:475 +#: src/lang.c:467 msgid "-- Last response --" msgstr "" -#: src/lang.c:476 +#: src/lang.c:468 #, c-format msgid "Lines %s " msgstr "" -#: src/lang.c:478 +#: src/lang.c:470 msgid "Message-ID: line " msgstr "" -#: src/lang.c:480 +#: src/lang.c:472 msgid "mailbox " msgstr "" -#: src/lang.c:481 +#: src/lang.c:473 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "" -#: src/lang.c:482 +#: src/lang.c:474 #, c-format msgid "Mailing log to %s\n" msgstr "" -#: src/lang.c:483 +#: src/lang.c:475 msgid "Mail bug report..." msgstr "" -#: src/lang.c:484 +#: src/lang.c:476 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "" -#: src/lang.c:485 +#: src/lang.c:477 msgid "Mailed" msgstr "" -#: src/lang.c:486 +#: src/lang.c:478 #, c-format msgid "Mailing to %s..." msgstr "" -#: src/lang.c:487 +#: src/lang.c:479 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:490 +#: src/lang.c:482 #, c-format msgid "%s marked as unread" msgstr "" -#: src/lang.c:491 +#: src/lang.c:483 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "" -#: src/lang.c:492 +#: src/lang.c:484 #, c-format msgid "Mark all articles as read%s?" msgstr "" -#: src/lang.c:493 +#: src/lang.c:485 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "" -#: src/lang.c:494 +#: src/lang.c:486 #, c-format -msgid "Mark group %.*s as read?" +msgid "Mark group %s as read?" msgstr "" -#: src/lang.c:495 +#: src/lang.c:487 #, c-format msgid "Mark thread as read%s?" msgstr "" -#: src/lang.c:496 +#: src/lang.c:488 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "" -#: src/lang.c:497 +#: src/lang.c:489 #, c-format msgid "Matching %s groups..." msgstr "" -#: src/lang.c:498 src/lang.c:502 +#: src/lang.c:490 src/lang.c:494 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" -#: src/lang.c:499 +#: src/lang.c:491 #, c-format msgid "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; %s=list " "thread" msgstr "" -#: src/lang.c:500 +#: src/lang.c:492 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" -#: src/lang.c:501 +#: src/lang.c:493 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "" -#: src/lang.c:503 +#: src/lang.c:495 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" -#: src/lang.c:504 +#: src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" -#: src/lang.c:505 +#: src/lang.c:497 #, c-format msgid "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" -#: src/lang.c:506 +#: src/lang.c:498 #, c-format msgid "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out" msgstr "" -#: src/lang.c:507 +#: src/lang.c:499 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" -#: src/lang.c:508 +#: src/lang.c:500 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" -#: src/lang.c:509 +#: src/lang.c:501 msgid "--More--" msgstr "" -#: src/lang.c:510 +#: src/lang.c:502 #, c-format msgid "Moving %s..." msgstr "" -#: src/lang.c:512 +#: src/lang.c:504 msgid ", name: " msgstr "" -#: src/lang.c:513 +#: src/lang.c:505 #, c-format msgid "Goto newsgroup [%s]> " msgstr "" -#: src/lang.c:514 +#: src/lang.c:506 msgid "newsgroups" msgstr "" -#: src/lang.c:515 +#: src/lang.c:507 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "" -#: src/lang.c:516 +#: src/lang.c:508 msgid "newsgroup" msgstr "" -#: src/lang.c:517 +#: src/lang.c:509 msgid "Try and save newsrc file again?" msgstr "" -#: src/lang.c:518 +#: src/lang.c:510 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" -#: src/lang.c:519 +#: src/lang.c:511 msgid "newsrc file saved successfully.\n" msgstr "" -#: src/lang.c:520 +#: src/lang.c:512 msgid "-- Next response --" msgstr "" -#: src/lang.c:521 +#: src/lang.c:513 #, c-format msgid "NNTP authorization password not found for %s" msgstr "NNTP authorisation password not found for %s" -#: src/lang.c:522 +#: src/lang.c:514 msgid "No " msgstr "" -#: src/lang.c:523 +#: src/lang.c:515 msgid "*** No articles ***" msgstr "" -#: src/lang.c:524 +#: src/lang.c:516 msgid "No articles have been posted" msgstr "" -#: src/lang.c:525 +#: src/lang.c:517 msgid "*** No description ***" msgstr "" -#: src/lang.c:526 +#: src/lang.c:518 msgid "No filename" msgstr "" -#: src/lang.c:527 +#: src/lang.c:519 msgid "No group" msgstr "" -#: src/lang.c:528 +#: src/lang.c:520 msgid "*** No groups ***" msgstr "" -#: src/lang.c:529 +#: src/lang.c:521 msgid "No more groups to read" msgstr "" -#: src/lang.c:530 +#: src/lang.c:522 msgid "No last message" msgstr "" -#: src/lang.c:531 +#: src/lang.c:523 msgid "No mail address" msgstr "" -#: src/lang.c:532 +#: src/lang.c:524 msgid "No articles marked for saving" msgstr "" -#: src/lang.c:533 +#: src/lang.c:525 msgid "No match" msgstr "" -#: src/lang.c:534 +#: src/lang.c:526 msgid "No more groups" msgstr "" -#: src/lang.c:535 +#: src/lang.c:527 msgid "No newsgroups" msgstr "" -#: src/lang.c:536 +#: src/lang.c:528 msgid "No next unread article" msgstr "" -#: src/lang.c:537 +#: src/lang.c:529 msgid "No previous group" msgstr "" -#: src/lang.c:538 +#: src/lang.c:530 msgid "No previous unread article" msgstr "" -#: src/lang.c:539 +#: src/lang.c:531 msgid "No responses" msgstr "" -#: src/lang.c:540 +#: src/lang.c:532 msgid "No responses to list in current thread" msgstr "" -#: src/lang.c:541 +#: src/lang.c:533 msgid "No search string" msgstr "" -#: src/lang.c:542 +#: src/lang.c:534 msgid "No subject" msgstr "" -#: src/lang.c:543 +#: src/lang.c:535 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "" -#: src/lang.c:544 +#: src/lang.c:536 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "" -#: src/lang.c:545 +#: src/lang.c:537 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "" -#: src/lang.c:546 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "" -#: src/lang.c:547 +#: src/lang.c:539 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" -#: src/lang.c:548 +#: src/lang.c:540 #, c-format msgid "No viewer found for %s/%s\n" msgstr "" -#: src/lang.c:549 +#: src/lang.c:541 msgid "Newsgroup does not exist on this server" msgstr "" -#: src/lang.c:550 +#: src/lang.c:542 #, c-format msgid "Group %s not found in active file" msgstr "" -#: src/lang.c:551 +#: src/lang.c:543 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:552 +#: src/lang.c:544 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:553 +#: src/lang.c:545 #, c-format msgid "# NNTP-server -> newsrc translation table and NNTP-server\n" "# shortname list for %s %s\n" @@ -2186,308 +2186,308 @@ msgid "# NNTP-server -> newsrc translati "#\n" msgstr "" -#: src/lang.c:560 +#: src/lang.c:552 msgid "Only" msgstr "" -#: src/lang.c:561 +#: src/lang.c:553 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "" -#: src/lang.c:562 +#: src/lang.c:554 msgid "Options Menu" msgstr "" -#: src/lang.c:565 +#: src/lang.c:557 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "" -#: src/lang.c:566 +#: src/lang.c:558 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "" -#: src/lang.c:567 +#: src/lang.c:559 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "" -#: src/lang.c:568 +#: src/lang.c:560 msgid "Post a followup..." msgstr "" #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:570 +#: src/lang.c:562 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:573 +#: src/lang.c:565 msgid "Posted articles history" msgstr "" -#: src/lang.c:574 +#: src/lang.c:566 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "" -#: src/lang.c:575 +#: src/lang.c:567 msgid "-- post processing started --" msgstr "" -#: src/lang.c:576 +#: src/lang.c:568 msgid "-- post processing completed --" msgstr "" -#: src/lang.c:577 +#: src/lang.c:569 #, c-format msgid "Post subject [%s]> " msgstr "" -#: src/lang.c:578 +#: src/lang.c:570 msgid "# Summary of mailed/posted messages viewable by 'W' command from within tin.\n" msgstr "" -#: src/lang.c:579 +#: src/lang.c:571 msgid "Posting article..." msgstr "" -#: src/lang.c:580 -msgid "Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): " +#: src/lang.c:572 +msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "" -#: src/lang.c:581 +#: src/lang.c:573 #, c-format msgid "Hot %s" msgstr "" -#: src/lang.c:582 +#: src/lang.c:574 #, c-format msgid "Tagged %s" msgstr "" -#: src/lang.c:583 +#: src/lang.c:575 #, c-format msgid "Untagged %s" msgstr "" -#: src/lang.c:584 +#: src/lang.c:576 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:585 +#: src/lang.c:577 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:586 +#: src/lang.c:578 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:587 +#: src/lang.c:579 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:588 +#: src/lang.c:580 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:590 +#: src/lang.c:582 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:591 +#: src/lang.c:583 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:592 +#: src/lang.c:584 msgid "Do you really want to quit?" msgstr "" -#: src/lang.c:593 -msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%.*s]: " +#: src/lang.c:585 +msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:594 +#: src/lang.c:586 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:595 +#: src/lang.c:587 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:596 +#: src/lang.c:588 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:597 +#: src/lang.c:589 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:598 +#: src/lang.c:590 msgid "Do you really want to quit without saving your configuration?" msgstr "" -#: src/lang.c:601 +#: src/lang.c:593 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:602 +#: src/lang.c:594 msgid "Do you want to abort this operation?" msgstr "" -#: src/lang.c:603 +#: src/lang.c:595 msgid "Do you want to exit tin immediately?" msgstr "" -#: src/lang.c:604 +#: src/lang.c:596 msgid "Read response> " msgstr "" -#: src/lang.c:605 +#: src/lang.c:597 msgid "Reading ('q' to quit)..." msgstr "" -#: src/lang.c:606 +#: src/lang.c:598 #, c-format msgid "Reading %sarticles..." msgstr "" -#: src/lang.c:607 +#: src/lang.c:599 #, c-format msgid "Reading %sattributes file...\n" msgstr "" -#: src/lang.c:608 +#: src/lang.c:600 #, c-format msgid "Reading %sconfig file...\n" msgstr "" -#: src/lang.c:609 +#: src/lang.c:601 msgid "Reading filter file...\n" msgstr "" -#: src/lang.c:610 +#: src/lang.c:602 #, c-format msgid "Reading %s groups..." msgstr "" -#: src/lang.c:611 +#: src/lang.c:603 msgid "Reading input history file...\n" msgstr "" -#: src/lang.c:612 +#: src/lang.c:604 msgid "Reading keymap file...\n" msgstr "" -#: src/lang.c:613 +#: src/lang.c:605 msgid "Reading groups from active file... " msgstr "" -#: src/lang.c:614 +#: src/lang.c:606 msgid "Reading groups from newsrc file... " msgstr "" -#: src/lang.c:615 +#: src/lang.c:607 msgid "Reading newsgroups file... " msgstr "" -#: src/lang.c:616 +#: src/lang.c:608 msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:617 +#: src/lang.c:609 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:618 +#: src/lang.c:610 #, c-format msgid "Error: rename %s to %s" msgstr "" -#: src/lang.c:619 +#: src/lang.c:611 msgid "Reply to author..." msgstr "" -#: src/lang.c:620 +#: src/lang.c:612 msgid "Repost" msgstr "" -#: src/lang.c:621 +#: src/lang.c:613 msgid "Reposting article..." msgstr "" -#: src/lang.c:622 +#: src/lang.c:614 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:623 +#: src/lang.c:615 msgid "Reset newsrc?" msgstr "" -#: src/lang.c:624 +#: src/lang.c:616 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:625 +#: src/lang.c:617 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:626 +#: src/lang.c:618 #, c-format msgid "RespNo %4d of %4d" msgstr "" -#: src/lang.c:627 +#: src/lang.c:619 msgid "Press to continue..." msgstr "" -#: src/lang.c:629 +#: src/lang.c:621 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:630 +#: src/lang.c:622 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:631 +#: src/lang.c:623 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:632 +#: src/lang.c:624 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:633 +#: src/lang.c:625 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:634 +#: src/lang.c:626 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:635 +#: src/lang.c:627 msgid "Select text pattern : " msgstr "" -#: src/lang.c:636 +#: src/lang.c:628 msgid "Select time in days : " msgstr "" -#: src/lang.c:637 +#: src/lang.c:629 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2499,216 +2499,216 @@ msgid "# %s server configuration file\n" "\n" msgstr "" -#: src/lang.c:643 +#: src/lang.c:635 msgid "Showing unread groups only" msgstr "" -#: src/lang.c:644 +#: src/lang.c:636 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:645 +#: src/lang.c:637 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:646 +#: src/lang.c:638 msgid "Save" msgstr "" -#: src/lang.c:647 +#: src/lang.c:639 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "" -#: src/lang.c:648 +#: src/lang.c:640 msgid "Save configuration before continuing?" msgstr "" -#: src/lang.c:649 +#: src/lang.c:641 msgid "Save filename> " msgstr "" -#: src/lang.c:650 +#: src/lang.c:642 msgid "Saved" msgstr "" -#: src/lang.c:651 +#: src/lang.c:643 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:652 +#: src/lang.c:644 #, c-format msgid "Saved %s...\n" msgstr "" -#: src/lang.c:653 +#: src/lang.c:645 msgid "Nothing was saved" msgstr "" -#: src/lang.c:654 +#: src/lang.c:646 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "" -#: src/lang.c:655 +#: src/lang.c:647 #, c-format msgid "-- %s saved to %s%s --" msgstr "" -#: src/lang.c:656 +#: src/lang.c:648 #, c-format msgid "-- %s saved to %s - %s --" msgstr "" -#: src/lang.c:657 +#: src/lang.c:649 msgid "Saving..." msgstr "" -#: src/lang.c:658 +#: src/lang.c:650 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Screen initialisation failed" -#: src/lang.c:659 +#: src/lang.c:651 #, c-format msgid "%s: screen is too small\n" msgstr "" -#: src/lang.c:660 +#: src/lang.c:652 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "" -#: src/lang.c:661 +#: src/lang.c:653 #, c-format msgid "Search backwards [%s]> " msgstr "" -#: src/lang.c:662 +#: src/lang.c:654 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:663 +#: src/lang.c:655 #, c-format msgid "Search forwards [%s]> " msgstr "" -#: src/lang.c:664 +#: src/lang.c:656 msgid "Searching..." msgstr "" -#: src/lang.c:665 +#: src/lang.c:657 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:666 +#: src/lang.c:658 msgid "Select article> " msgstr "" -#: src/lang.c:667 +#: src/lang.c:659 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" -#: src/lang.c:668 +#: src/lang.c:660 msgid "Select group> " msgstr "" -#: src/lang.c:669 +#: src/lang.c:661 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:670 +#: src/lang.c:662 msgid "Select thread > " msgstr "" -#: src/lang.c:671 +#: src/lang.c:663 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:672 +#: src/lang.c:664 msgid "servers active-file" msgstr "" -#: src/lang.c:673 +#: src/lang.c:665 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:674 +#: src/lang.c:666 msgid "" msgstr "" -#: src/lang.c:675 +#: src/lang.c:667 #, c-format msgid "Starting: (%s)" msgstr "" -#: src/lang.c:676 +#: src/lang.c:668 #, c-format msgid "List Thread (%d of %d)" msgstr "" -#: src/lang.c:677 +#: src/lang.c:669 #, c-format msgid "Thread (%.*s)" msgstr "" -#: src/lang.c:678 +#: src/lang.c:670 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:679 +#: src/lang.c:671 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:680 +#: src/lang.c:672 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:681 +#: src/lang.c:673 msgid "Subscribing... " msgstr "" -#: src/lang.c:682 -msgid "Repost or supersede article(s) [%%.*s]? (%s/%s/%s): " +#: src/lang.c:674 +msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:683 +#: src/lang.c:675 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:684 +#: src/lang.c:676 msgid "Superseding article ..." msgstr "" -#: src/lang.c:685 +#: src/lang.c:677 #, c-format msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:687 +#: src/lang.c:679 #, c-format msgid "%d days" msgstr "" -#: src/lang.c:688 +#: src/lang.c:680 msgid "" msgstr "" -#: src/lang.c:689 +#: src/lang.c:681 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:690 +#: src/lang.c:682 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" @@ -2718,323 +2718,323 @@ 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:703 +#: src/lang.c:695 msgid "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:704 +#: src/lang.c:696 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:705 +#: src/lang.c:697 msgid "There is no news\n" msgstr "" -#: src/lang.c:706 +#: src/lang.c:698 msgid "Thread" msgstr "" -#: src/lang.c:707 +#: src/lang.c:699 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:708 +#: src/lang.c:700 msgid "Thread deselected" msgstr "" -#: src/lang.c:709 +#: src/lang.c:701 msgid "Thread selected" msgstr "" -#: src/lang.c:710 +#: src/lang.c:702 msgid "threads" msgstr "" -#: src/lang.c:711 +#: src/lang.c:703 msgid "Thread range" msgstr "" -#: src/lang.c:712 +#: src/lang.c:704 msgid "thread" msgstr "" -#: src/lang.c:713 +#: src/lang.c:705 #, c-format msgid "Thread %4s of %4s" msgstr "" -#: src/lang.c:714 +#: src/lang.c:706 msgid "Threading articles..." msgstr "" -#: src/lang.c:715 +#: src/lang.c:707 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:716 +#: src/lang.c:708 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:717 +#: src/lang.c:709 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:718 +#: src/lang.c:710 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:719 +#: src/lang.c:711 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:720 +#: src/lang.c:712 #, c-format msgid "%d Trying to lock %s" msgstr "" -#: src/lang.c:721 +#: src/lang.c:713 msgid " h=help\n" msgstr "" -#: src/lang.c:723 +#: src/lang.c:715 msgid "Unlimited" msgstr "" -#: src/lang.c:724 +#: src/lang.c:716 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:725 +#: src/lang.c:717 #, c-format msgid "Error decoding %s : %s" msgstr "" -#: src/lang.c:726 +#: src/lang.c:718 msgid "No end." msgstr "" -#: src/lang.c:727 +#: src/lang.c:719 #, c-format msgid "%s successfully decoded." msgstr "" -#: src/lang.c:728 +#: src/lang.c:720 #, c-format msgid "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:729 +#: src/lang.c:721 msgid "unread " msgstr "" -#: src/lang.c:730 +#: src/lang.c:722 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:731 +#: src/lang.c:723 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:732 +#: src/lang.c:724 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:733 +#: src/lang.c:725 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:734 +#: src/lang.c:726 msgid "Updated" msgstr "" -#: src/lang.c:735 +#: src/lang.c:727 msgid "Updating" msgstr "" -#: src/lang.c:736 +#: src/lang.c:728 #, c-format msgid "Opening %s\n" msgstr "" -#: src/lang.c:737 +#: src/lang.c:729 msgid "No more URL's in this article" msgstr "" -#: src/lang.c:738 +#: src/lang.c:730 msgid "Use MIME display program for this message?" msgstr "" -#: src/lang.c:739 +#: src/lang.c:731 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr "" -#: src/lang.c:740 +#: src/lang.c:732 msgid " -Z return status indicating if any unread news (batch mode)" msgstr "" -#: src/lang.c:741 +#: src/lang.c:733 msgid " -q don't check for new newsgroups" msgstr "" -#: src/lang.c:742 +#: src/lang.c:734 msgid " -X don't save any files on quit" msgstr "" -#: src/lang.c:743 +#: src/lang.c:735 msgid " -d don't show newsgroup descriptions" msgstr "" -#: src/lang.c:744 +#: src/lang.c:736 msgid " -G limit get only limit articles/group" msgstr "" -#: src/lang.c:745 +#: src/lang.c:737 #, c-format msgid " -H help information about %s" msgstr "" -#: src/lang.c:746 +#: src/lang.c:738 msgid " -h this help message" msgstr "" -#: src/lang.c:747 +#: src/lang.c:739 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr "" -#: src/lang.c:748 +#: src/lang.c:740 msgid " -u update index files (batch mode)" msgstr "" -#: src/lang.c:749 +#: src/lang.c:741 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr "" -#: src/lang.c:750 +#: src/lang.c:742 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "" -#: src/lang.c:751 +#: src/lang.c:743 msgid " -N mail new news to your posts (batch mode)" msgstr "" -#: src/lang.c:752 +#: src/lang.c:744 msgid " -M user mail new news to specified user (batch mode)" msgstr "" -#: src/lang.c:753 +#: src/lang.c:745 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr "" -#: src/lang.c:754 +#: src/lang.c:746 msgid " -x no posting mode" msgstr "" -#: src/lang.c:755 +#: src/lang.c:747 msgid " -w post an article and exit" msgstr "" -#: src/lang.c:756 +#: src/lang.c:748 msgid " -o post all postponed articles and exit" msgstr "" -#: src/lang.c:757 +#: src/lang.c:749 msgid " -r read news remotely from default NNTP server" msgstr "" -#: src/lang.c:758 +#: src/lang.c:750 msgid " -R read news saved by -S option" msgstr "" -#: src/lang.c:759 +#: src/lang.c:751 #, c-format msgid " -s dir save news directory [default=%s]" msgstr "" -#: src/lang.c:760 +#: src/lang.c:752 msgid " -S save new news for later reading (batch mode)" msgstr "" -#: src/lang.c:761 +#: src/lang.c:753 msgid " -z start if any unread news" msgstr "" -#: src/lang.c:762 +#: src/lang.c:754 #, c-format msgid "A Usenet reader.\n" "\n" "Usage: %s [options] [newsgroup[,...]]" msgstr "" -#: src/lang.c:763 +#: src/lang.c:755 msgid " -v verbose output for batch mode options" msgstr "" -#: src/lang.c:764 +#: src/lang.c:756 msgid " -V print version & date information" msgstr "" -#: src/lang.c:765 +#: src/lang.c:757 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "" -#: src/lang.c:766 +#: src/lang.c:758 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "" -#: src/lang.c:768 +#: src/lang.c:760 #, c-format msgid "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:769 +#: src/lang.c:761 #, c-format msgid "View '%s' (%s/%s)?" msgstr "" -#: src/lang.c:771 +#: src/lang.c:763 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" "%-100s\n" msgstr "" -#: src/lang.c:772 +#: src/lang.c:764 msgid "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:773 +#: src/lang.c:765 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:774 +#: src/lang.c:766 msgid "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n" msgstr "" -#: src/lang.c:776 +#: src/lang.c:768 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:779 +#: src/lang.c:771 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3047,7 +3047,7 @@ msgid "Read carefully!\n" "\n" msgstr "" -#: src/lang.c:783 +#: src/lang.c:775 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" @@ -3055,7 +3055,7 @@ msgid "\n" " not be encoded properly.\n" msgstr "" -#: src/lang.c:788 +#: src/lang.c:780 #, c-format msgid "\n" "\n" @@ -3064,7 +3064,7 @@ msgid "\n" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:790 +#: src/lang.c:782 #, c-format msgid "\n" "\n" @@ -3072,7 +3072,7 @@ msgid "\n" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:793 +#: src/lang.c:785 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3081,18 +3081,18 @@ msgid "Warning: tin wrote fewer groups t "before you start tin once again!\n" msgstr "" -#: src/lang.c:797 +#: src/lang.c:789 #, c-format msgid "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:798 +#: src/lang.c:790 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:799 +#: src/lang.c:791 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3102,47 +3102,47 @@ msgid "\n" " possible.\n" msgstr "" -#: src/lang.c:803 +#: src/lang.c:795 #, c-format msgid "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:804 +#: src/lang.c:796 msgid "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:805 +#: src/lang.c:797 msgid "Writing attributes file..." msgstr "" -#: src/lang.c:807 +#: src/lang.c:799 #, c-format msgid "%d Responses" msgstr "" -#: src/lang.c:809 +#: src/lang.c:801 #, c-format msgid "Added %d %s" msgstr "" -#: src/lang.c:810 +#: src/lang.c:802 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:811 +#: src/lang.c:803 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:812 +#: src/lang.c:804 msgid "Yes " msgstr "" -#: src/lang.c:813 +#: src/lang.c:805 msgid " You have mail\n" msgstr "" -#: src/lang.c:818 +#: src/lang.c:810 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3154,16 +3154,16 @@ msgid "\n" " M)enu option.\n" msgstr "" -#: src/lang.c:829 +#: src/lang.c:821 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "" -#: src/lang.c:830 +#: src/lang.c:822 msgid " -D debug mode 1=NNTP 2=ALL" msgstr "" -#: src/lang.c:834 +#: src/lang.c:826 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3179,11 +3179,11 @@ msgid "Read carefully!\n" "\n" msgstr "" -#: src/lang.c:843 +#: src/lang.c:835 msgid "toggle color" msgstr "toggle colour" -#: src/lang.c:844 +#: src/lang.c:836 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" @@ -3203,339 +3203,339 @@ msgstr "# For colour-adjust use the foll "# background black)\n" "\n" -#: src/lang.c:852 +#: src/lang.c:844 msgid " -a toggle color flag" msgstr " -a toggle colour flag" -#: src/lang.c:856 +#: src/lang.c:848 msgid "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:857 +#: src/lang.c:849 #, c-format msgid "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:858 +#: src/lang.c:850 #, c-format msgid "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:860 +#: src/lang.c:852 msgid "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:861 +#: src/lang.c:853 #, c-format msgid "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:862 +#: src/lang.c:854 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:863 +#: src/lang.c:855 #, c-format msgid "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:867 +#: src/lang.c:859 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:868 +#: src/lang.c:860 msgid "Missing parts." msgstr "" -#: src/lang.c:869 +#: src/lang.c:861 msgid "No beginning." msgstr "" -#: src/lang.c:870 +#: src/lang.c:862 msgid "No data." msgstr "" -#: src/lang.c:871 +#: src/lang.c:863 msgid "Unknown error." msgstr "" -#: src/lang.c:873 +#: src/lang.c:865 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "" -#: src/lang.c:877 +#: src/lang.c:869 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:878 +#: src/lang.c:870 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:882 +#: src/lang.c:874 msgid "perform PGP operations on article" msgstr "" -#: src/lang.c:883 +#: src/lang.c:875 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:884 +#: src/lang.c:876 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "" -#: src/lang.c:885 +#: src/lang.c:877 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "" -#: src/lang.c:886 +#: src/lang.c:878 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:887 +#: src/lang.c:879 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:889 +#: src/lang.c:881 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:890 -msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: " +#: src/lang.c:882 +msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:891 -msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:883 +msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:893 +#: src/lang.c:885 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:894 -msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: " +#: src/lang.c:886 +msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:895 -msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:887 +msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:899 +#: src/lang.c:891 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:900 -msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: " +#: src/lang.c:892 +msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:901 -msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:893 +msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:903 +#: src/lang.c:895 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:904 -msgid "%s=quit, %s=edit, %s=send [%%.*s]: " +#: src/lang.c:896 +msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:905 -msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:897 +msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:914 +#: src/lang.c:906 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:915 +#: src/lang.c:907 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:916 +#: src/lang.c:908 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:917 +#: src/lang.c:909 #, c-format msgid "Connecting to %s:%d..." msgstr "" -#: src/lang.c:918 +#: src/lang.c:910 msgid "Disconnecting from server...\n" msgstr "" -#: src/lang.c:919 +#: src/lang.c:911 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "" -#: src/lang.c:920 +#: src/lang.c:912 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "" -#: src/lang.c:921 +#: src/lang.c:913 msgid "205 Closing connection" msgstr "" -#: src/lang.c:922 +#: src/lang.c:914 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "" -#: src/lang.c:923 +#: src/lang.c:915 msgid "Connection to news server has timed out. Reconnect?" msgstr "" -#: src/lang.c:924 +#: src/lang.c:916 #, c-format msgid "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "" -#: src/lang.c:925 +#: src/lang.c:917 msgid " -A force authentication on connect" msgstr "" -#: src/lang.c:926 +#: src/lang.c:918 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr "" -#: src/lang.c:927 +#: src/lang.c:919 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr "" -#: src/lang.c:928 +#: src/lang.c:920 msgid " -Q quick start. Same as -nqd" msgstr "" -#: src/lang.c:929 +#: src/lang.c:921 msgid " -l use only LIST instead of GROUP (-n) command" msgstr "" -#: src/lang.c:930 +#: src/lang.c:922 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr "" -#: src/lang.c:932 +#: src/lang.c:924 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "" -#: src/lang.c:935 +#: src/lang.c:927 msgid "\n" "socket or connect problem\n" msgstr "" -#: src/lang.c:937 +#: src/lang.c:929 #, c-format msgid "\n" "Connection to %s: " msgstr "" -#: src/lang.c:938 +#: src/lang.c:930 msgid "Giving up...\n" msgstr "" -#: src/lang.c:941 +#: src/lang.c:933 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:944 +#: src/lang.c:936 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "" -#: src/lang.c:947 +#: src/lang.c:939 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "" -#: src/lang.c:950 +#: src/lang.c:942 msgid " -Q quick start. Same as -qd" msgstr "" -#: src/lang.c:951 +#: src/lang.c:943 msgid " -l read only active file instead of scanning spool (-n) command" msgstr "" -#: src/lang.c:952 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from spool" msgstr "" -#: src/lang.c:953 +#: src/lang.c:945 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "" -#: src/lang.c:957 +#: src/lang.c:949 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "" -#: src/lang.c:958 +#: src/lang.c:950 msgid "It worked! Should I always use my built in inews from now on?" msgstr "" -#: src/lang.c:966 +#: src/lang.c:958 #, c-format msgid "%d %s printed" msgstr "" -#: src/lang.c:967 +#: src/lang.c:959 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "" -#: src/lang.c:968 +#: src/lang.c:960 msgid "Print" msgstr "" -#: src/lang.c:969 +#: src/lang.c:961 msgid "Printing..." msgstr "" -#: src/lang.c:973 +#: src/lang.c:965 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "" -#: src/lang.c:974 +#: src/lang.c:966 msgid "No command" msgstr "" -#: src/lang.c:975 +#: src/lang.c:967 msgid "Pipe" msgstr "" -#: src/lang.c:976 +#: src/lang.c:968 #, c-format msgid "Pipe to command [%.*s]> " msgstr "" -#: src/lang.c:977 +#: src/lang.c:969 msgid "Piping..." msgstr "" -#: src/lang.c:979 +#: src/lang.c:971 msgid "Piping not enabled." msgstr "" -#: src/lang.c:983 +#: src/lang.c:975 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3544,7 +3544,7 @@ msgid "\n" " newsgroup names.\n" msgstr "" -#: src/lang.c:988 +#: src/lang.c:980 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3552,7 +3552,7 @@ msgid "\n" " Please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:993 +#: src/lang.c:985 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3560,13 +3560,13 @@ msgid "\n" " To avoid trouble please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:997 +#: src/lang.c:989 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" msgstr "" -#: src/lang.c:1002 +#: src/lang.c:994 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3587,794 +3587,794 @@ msgid "\n" " likely to ignore it completely. It's a crowded net out there.\n" msgstr "" -#: src/lang.c:1015 +#: src/lang.c:1007 msgid "shell escape" msgstr "" -#: src/lang.c:1016 +#: src/lang.c:1008 #, c-format msgid "Shell Command (%s)" msgstr "" -#: src/lang.c:1017 +#: src/lang.c:1009 #, c-format msgid "Enter shell command [%s]> " msgstr "" -#: src/lang.c:1021 +#: src/lang.c:1013 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "" -#: src/lang.c:1025 +#: src/lang.c:1017 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "" -#: src/lang.c:1027 +#: src/lang.c:1019 #, c-format msgid "Group %.*s..." msgstr "" -#: src/lang.c:1031 +#: src/lang.c:1023 msgid "Server unavailable\n" msgstr "" -#: src/lang.c:1037 +#: src/lang.c:1029 #, 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:1038 +#: src/lang.c:1030 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1040 +#: src/lang.c:1032 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1041 +#: src/lang.c:1033 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1045 +#: src/lang.c:1037 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1046 +#: src/lang.c:1038 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1048 +#: src/lang.c:1040 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1049 +#: src/lang.c:1041 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1055 +#: src/lang.c:1047 msgid "Terminal does not support color" msgstr "Terminal does not support colour" -#: src/lang.c:1060 +#: src/lang.c:1052 #, c-format msgid "Trying %s" msgstr "" -#: src/lang.c:1074 src/lang.c:1099 src/lang.c:1115 src/lang.c:1294 src/refs.c:266 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:297 msgid "None" msgstr "" -#: src/lang.c:1075 +#: src/lang.c:1067 msgid "Subject" msgstr "" -#: src/lang.c:1076 +#: src/lang.c:1068 msgid "References" msgstr "" -#: src/lang.c:1077 +#: src/lang.c:1069 msgid "Both Subject and References" msgstr "" -#: src/lang.c:1078 +#: src/lang.c:1070 msgid "Multipart Subject" msgstr "" -#: src/lang.c:1090 src/lang.c:1201 +#: src/lang.c:1082 src/lang.c:1193 msgid "No" msgstr "" -#: src/lang.c:1091 src/lang.c:1203 +#: src/lang.c:1083 src/lang.c:1195 msgid "Yes" msgstr "" -#: src/lang.c:1092 +#: src/lang.c:1084 msgid "Hide All" msgstr "" -#: src/lang.c:1100 +#: src/lang.c:1092 msgid "Address" msgstr "" -#: src/lang.c:1101 +#: src/lang.c:1093 msgid "Full Name" msgstr "" -#: src/lang.c:1102 +#: src/lang.c:1094 msgid "Address and Name" msgstr "" -#: src/lang.c:1109 +#: src/lang.c:1101 msgid "Max" msgstr "" -#: src/lang.c:1110 +#: src/lang.c:1102 msgid "Sum" msgstr "" -#: src/lang.c:1111 +#: src/lang.c:1103 msgid "Average" msgstr "" -#: src/lang.c:1116 +#: src/lang.c:1108 msgid "Lines" msgstr "" -#: src/lang.c:1117 +#: src/lang.c:1109 msgid "Score" msgstr "" -#: src/lang.c:1118 +#: src/lang.c:1110 msgid "Lines & Score" msgstr "" -#: src/lang.c:1127 +#: src/lang.c:1119 msgid "Black" msgstr "" -#: src/lang.c:1128 +#: src/lang.c:1120 msgid "Red" msgstr "" -#: src/lang.c:1129 +#: src/lang.c:1121 msgid "Green" msgstr "" -#: src/lang.c:1130 +#: src/lang.c:1122 msgid "Brown" msgstr "" -#: src/lang.c:1131 +#: src/lang.c:1123 msgid "Blue" msgstr "" -#: src/lang.c:1132 +#: src/lang.c:1124 msgid "Pink" msgstr "" -#: src/lang.c:1133 +#: src/lang.c:1125 msgid "Cyan" msgstr "" -#: src/lang.c:1134 +#: src/lang.c:1126 msgid "White" msgstr "" -#: src/lang.c:1135 +#: src/lang.c:1127 msgid "Gray" msgstr "Grey" -#: src/lang.c:1136 +#: src/lang.c:1128 msgid "Light Red" msgstr "" -#: src/lang.c:1137 +#: src/lang.c:1129 msgid "Light Green" msgstr "" -#: src/lang.c:1138 +#: src/lang.c:1130 msgid "Yellow" msgstr "" -#: src/lang.c:1139 +#: src/lang.c:1131 msgid "Light Blue" msgstr "" -#: src/lang.c:1140 +#: src/lang.c:1132 msgid "Light Pink" msgstr "" -#: src/lang.c:1141 +#: src/lang.c:1133 msgid "Light Cyan" msgstr "" -#: src/lang.c:1142 +#: src/lang.c:1134 msgid "Light White" msgstr "" -#: src/lang.c:1150 src/lang.c:1207 src/lang.c:1221 +#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 msgid "Nothing" msgstr "" -#: src/lang.c:1151 +#: src/lang.c:1143 msgid "Mark" msgstr "" -#: src/lang.c:1152 +#: src/lang.c:1144 msgid "Space" msgstr "" -#: src/lang.c:1159 +#: src/lang.c:1151 msgid "Normal" msgstr "" -#: src/lang.c:1160 +#: src/lang.c:1152 msgid "Best highlighting" msgstr "" -#: src/lang.c:1161 +#: src/lang.c:1153 msgid "Underline" msgstr "" -#: src/lang.c:1162 +#: src/lang.c:1154 msgid "Reverse video" msgstr "" -#: src/lang.c:1163 +#: src/lang.c:1155 msgid "Blinking" msgstr "" -#: src/lang.c:1164 +#: src/lang.c:1156 msgid "Half bright" msgstr "" -#: src/lang.c:1165 +#: src/lang.c:1157 msgid "Bold" msgstr "" -#: src/lang.c:1170 +#: src/lang.c:1162 msgid "none" msgstr "" -#: src/lang.c:1171 +#: src/lang.c:1163 msgid "commands" msgstr "" -#: src/lang.c:1172 +#: src/lang.c:1164 msgid "select" msgstr "" -#: src/lang.c:1174 +#: src/lang.c:1166 msgid "commands & quit" msgstr "" -#: src/lang.c:1175 +#: src/lang.c:1167 msgid "commands & select" msgstr "" -#: src/lang.c:1176 +#: src/lang.c:1168 msgid "quit & select" msgstr "" -#: src/lang.c:1177 +#: src/lang.c:1169 msgid "commands & quit & select" msgstr "" -#: src/lang.c:1202 +#: src/lang.c:1194 msgid "Shell archive" msgstr "" -#: src/lang.c:1208 +#: src/lang.c:1200 msgid "Subject: (descending)" msgstr "" -#: src/lang.c:1209 +#: src/lang.c:1201 msgid "Subject: (ascending)" msgstr "" -#: src/lang.c:1210 +#: src/lang.c:1202 msgid "From: (descending)" msgstr "" -#: src/lang.c:1211 +#: src/lang.c:1203 msgid "From: (ascending)" msgstr "" -#: src/lang.c:1212 +#: src/lang.c:1204 msgid "Date: (descending)" msgstr "" -#: src/lang.c:1213 +#: src/lang.c:1205 msgid "Date: (ascending)" msgstr "" -#: src/lang.c:1214 src/lang.c:1222 +#: src/lang.c:1206 src/lang.c:1214 msgid "Score (descending)" msgstr "" -#: src/lang.c:1215 src/lang.c:1223 +#: src/lang.c:1207 src/lang.c:1215 msgid "Score (ascending)" msgstr "" -#: src/lang.c:1216 +#: src/lang.c:1208 msgid "Lines: (descending)" msgstr "" -#: src/lang.c:1217 +#: src/lang.c:1209 msgid "Lines: (ascending)" msgstr "" -#: src/lang.c:1228 +#: src/lang.c:1220 msgid "Always Keep" msgstr "" -#: src/lang.c:1229 +#: src/lang.c:1221 msgid "Always Remove" msgstr "" -#: src/lang.c:1230 +#: src/lang.c:1222 msgid "Mark with D on selection screen" msgstr "" -#: src/lang.c:1235 +#: src/lang.c:1227 msgid "Kill only unread arts" msgstr "" -#: src/lang.c:1236 +#: src/lang.c:1228 msgid "Kill all arts & show with K" msgstr "" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1237 +#: src/lang.c:1229 msgid "Kill all arts and never show" msgstr "" -#: src/lang.c:1242 +#: src/lang.c:1234 msgid "Nothing special" msgstr "" -#: src/lang.c:1243 +#: src/lang.c:1235 msgid "Compress quotes" msgstr "" -#: src/lang.c:1244 +#: src/lang.c:1236 msgid "Quote signatures" msgstr "" -#: src/lang.c:1245 +#: src/lang.c:1237 msgid "Compress quotes, quote sigs" msgstr "" -#: src/lang.c:1246 +#: src/lang.c:1238 msgid "Quote empty lines" msgstr "" -#: src/lang.c:1247 +#: src/lang.c:1239 msgid "Compress quotes, quote empty lines" msgstr "" -#: src/lang.c:1248 +#: src/lang.c:1240 msgid "Quote sigs & empty lines" msgstr "" -#: src/lang.c:1249 +#: src/lang.c:1241 msgid "Comp. q., quote sigs & empty lines" msgstr "" -#: src/lang.c:1287 +#: src/lang.c:1279 msgid "no" msgstr "" -#: src/lang.c:1288 +#: src/lang.c:1280 msgid "with headers" msgstr "" -#: src/lang.c:1289 +#: src/lang.c:1281 msgid "without headers" msgstr "" -#: src/lang.c:1296 src/lang.c:1302 +#: src/lang.c:1288 src/lang.c:1294 msgid "NFKC" msgstr "" -#: src/lang.c:1297 +#: src/lang.c:1289 msgid "NFKD" msgstr "" -#: src/lang.c:1298 +#: src/lang.c:1290 msgid "NFC" msgstr "" -#: src/lang.c:1299 +#: src/lang.c:1291 msgid "NFD" msgstr "" -#: src/lang.c:1310 +#: src/lang.c:1302 msgid "Display Options" msgstr "" -#: src/lang.c:1316 +#: src/lang.c:1308 msgid "Color Options" msgstr "Colour Options" -#: src/lang.c:1322 +#: src/lang.c:1314 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1328 +#: src/lang.c:1320 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1334 +#: src/lang.c:1326 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1340 +#: src/lang.c:1332 msgid "Expert Options" msgstr "" -#: src/lang.c:1346 +#: src/lang.c:1338 msgid "Filtering Options" msgstr "" -#: src/lang.c:1351 src/lang.c:1377 src/lang.c:1383 src/lang.c:1390 src/lang.c:1422 -#: src/lang.c:1428 src/lang.c:1436 src/lang.c:1456 src/lang.c:1531 src/lang.c:1693 -#: src/lang.c:1699 src/lang.c:1705 src/lang.c:1711 src/lang.c:1723 src/lang.c:1730 -#: src/lang.c:1781 src/lang.c:1790 src/lang.c:1796 src/lang.c:1802 src/lang.c:1808 -#: src/lang.c:1814 src/lang.c:1820 src/lang.c:1826 src/lang.c:1832 src/lang.c:1838 -#: src/lang.c:1844 src/lang.c:1850 src/lang.c:1856 src/lang.c:1862 src/lang.c:1868 -#: src/lang.c:1874 src/lang.c:1880 src/lang.c:1886 src/lang.c:1892 src/lang.c:1898 -#: src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 src/lang.c:1923 src/lang.c:1929 -#: src/lang.c:1936 src/lang.c:1947 src/lang.c:1953 src/lang.c:1959 src/lang.c:1965 -#: src/lang.c:1971 src/lang.c:1977 src/lang.c:1991 src/lang.c:2003 src/lang.c:2037 -#: src/lang.c:2089 src/lang.c:2096 src/lang.c:2102 src/lang.c:2127 src/lang.c:2144 -#: src/lang.c:2197 src/lang.c:2230 src/lang.c:2250 src/lang.c:2285 src/lang.c:2294 -#: src/lang.c:2319 src/lang.c:2331 src/lang.c:2350 +#: src/lang.c:1343 src/lang.c:1369 src/lang.c:1375 src/lang.c:1382 src/lang.c:1414 +#: src/lang.c:1420 src/lang.c:1428 src/lang.c:1448 src/lang.c:1523 src/lang.c:1685 +#: src/lang.c:1691 src/lang.c:1697 src/lang.c:1703 src/lang.c:1715 src/lang.c:1722 +#: src/lang.c:1773 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:1884 src/lang.c:1890 +#: src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1915 src/lang.c:1921 +#: src/lang.c:1928 src/lang.c:1939 src/lang.c:1945 src/lang.c:1951 src/lang.c:1957 +#: src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 src/lang.c:1995 src/lang.c:2029 +#: src/lang.c:2081 src/lang.c:2088 src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 +#: src/lang.c:2189 src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1352 +#: src/lang.c:1344 msgid "Show mini menu & posting etiquette :" msgstr "" -#: src/lang.c:1353 +#: src/lang.c:1345 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:1358 +#: src/lang.c:1350 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1359 +#: src/lang.c:1351 msgid "Show description of each newsgroup :" msgstr "" -#: src/lang.c:1360 +#: src/lang.c:1352 msgid "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1365 +#: src/lang.c:1357 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "" -#: src/lang.c:1366 +#: src/lang.c:1358 msgid "In group menu, show author by :" msgstr "" -#: src/lang.c:1367 +#: src/lang.c:1359 msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" msgstr "" -#: src/lang.c:1371 +#: src/lang.c:1363 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1372 +#: src/lang.c:1364 msgid "Draw -> instead of highlighted bar :" msgstr "" -#: src/lang.c:1373 +#: src/lang.c:1365 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1378 +#: src/lang.c:1370 msgid "Use inverse video for page headers :" msgstr "" -#: src/lang.c:1379 +#: src/lang.c:1371 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1384 +#: src/lang.c:1376 msgid "Thread articles by :" msgstr "" -#: src/lang.c:1385 +#: src/lang.c:1377 msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" msgstr "" -#: src/lang.c:1391 +#: src/lang.c:1383 msgid "Score of a thread :" msgstr "" -#: src/lang.c:1392 +#: src/lang.c:1384 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "" -#: src/lang.c:1396 +#: src/lang.c:1388 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1397 +#: src/lang.c:1389 msgid "Sort articles by :" msgstr "" -#: src/lang.c:1398 +#: src/lang.c:1390 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:1404 +#: src/lang.c:1396 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1405 +#: src/lang.c:1397 msgid "Sort threads by :" msgstr "" -#: src/lang.c:1406 +#: src/lang.c:1398 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" msgstr "" -#: src/lang.c:1410 +#: src/lang.c:1402 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1411 +#: src/lang.c:1403 msgid "Goto first unread article in group :" msgstr "" -#: src/lang.c:1412 +#: src/lang.c:1404 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1416 +#: src/lang.c:1408 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1417 +#: src/lang.c:1409 msgid "Show only unread articles :" msgstr "" -#: src/lang.c:1418 +#: src/lang.c:1410 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1423 +#: src/lang.c:1415 msgid "Show only groups with unread arts :" msgstr "" -#: src/lang.c:1424 +#: src/lang.c:1416 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1429 +#: src/lang.c:1421 msgid "Filter which articles :" msgstr "" -#: src/lang.c:1430 +#: src/lang.c:1422 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:1437 +#: src/lang.c:1429 msgid "Tab goes to next unread article :" msgstr "" -#: src/lang.c:1438 +#: src/lang.c:1430 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "" -#: src/lang.c:1442 +#: src/lang.c:1434 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "" -#: src/lang.c:1443 +#: src/lang.c:1435 msgid "Space goes to next unread article :" msgstr "" -#: src/lang.c:1444 +#: src/lang.c:1436 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:1449 +#: src/lang.c:1441 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "" -#: src/lang.c:1450 +#: src/lang.c:1442 msgid "PgDn goes to next unread article :" msgstr "" -#: src/lang.c:1451 +#: src/lang.c:1443 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:1457 +#: src/lang.c:1449 msgid "List thread using right arrow key :" msgstr "" -#: src/lang.c:1458 +#: src/lang.c:1450 msgid "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1462 +#: src/lang.c:1454 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1463 +#: src/lang.c:1455 msgid "Character to show deleted articles :" msgstr "" -#: src/lang.c:1464 +#: src/lang.c:1456 msgid "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1469 +#: src/lang.c:1461 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1470 +#: src/lang.c:1462 msgid "Character to show inrange articles :" msgstr "" -#: src/lang.c:1471 +#: src/lang.c:1463 msgid "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1476 +#: src/lang.c:1468 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1477 +#: src/lang.c:1469 msgid "Character to show returning arts :" msgstr "" -#: src/lang.c:1478 +#: src/lang.c:1470 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1483 +#: src/lang.c:1475 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1484 +#: src/lang.c:1476 msgid "Character to show selected articles:" msgstr "" -#: src/lang.c:1485 +#: src/lang.c:1477 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1490 +#: src/lang.c:1482 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1491 +#: src/lang.c:1483 msgid "Character to show recent articles :" msgstr "" -#: src/lang.c:1492 +#: src/lang.c:1484 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1497 +#: src/lang.c:1489 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1498 +#: src/lang.c:1490 msgid "Character to show unread articles :" msgstr "" -#: src/lang.c:1499 +#: src/lang.c:1491 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1504 +#: src/lang.c:1496 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1505 +#: src/lang.c:1497 msgid "Character to show read articles :" msgstr "" -#: src/lang.c:1506 +#: src/lang.c:1498 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1511 +#: src/lang.c:1503 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1512 +#: src/lang.c:1504 msgid "Character to show killed articles :" msgstr "" -#: src/lang.c:1513 +#: src/lang.c:1505 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:1518 +#: src/lang.c:1510 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1519 +#: src/lang.c:1511 msgid "Character to show readselected arts:" msgstr "" -#: src/lang.c:1520 +#: src/lang.c:1512 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:1525 +#: src/lang.c:1517 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1526 +#: src/lang.c:1518 msgid "Max. length of group names shown :" msgstr "" -#: src/lang.c:1527 +#: src/lang.c:1519 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1532 +#: src/lang.c:1524 msgid "Show lines/score in listings :" msgstr "" -#: src/lang.c:1533 +#: src/lang.c:1525 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:1538 +#: src/lang.c:1530 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1539 +#: src/lang.c:1531 msgid "Number of lines to scroll in pager :" msgstr "" -#: src/lang.c:1540 +#: src/lang.c:1532 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" @@ -4384,27 +4384,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:1547 +#: src/lang.c:1539 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1548 +#: src/lang.c:1540 msgid "Display signatures :" msgstr "" -#: src/lang.c:1549 +#: src/lang.c:1541 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1553 +#: src/lang.c:1545 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1554 +#: src/lang.c:1546 msgid "Display uue data as an attachment :" msgstr "" -#: src/lang.c:1555 +#: src/lang.c:1547 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" @@ -4413,28 +4413,28 @@ msgid "# Handling of uuencoded data in t "# into a tag line.\n" msgstr "" -#: src/lang.c:1564 +#: src/lang.c:1556 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1565 +#: src/lang.c:1557 msgid "Display \"a as Umlaut-a :" msgstr "" -#: src/lang.c:1566 +#: src/lang.c:1558 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1571 src/lang.c:1581 +#: src/lang.c:1563 src/lang.c:1573 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1572 +#: src/lang.c:1564 msgid "Display these header fields (or *) :" msgstr "" -#: src/lang.c:1573 +#: src/lang.c:1565 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" @@ -4443,11 +4443,11 @@ msgid "# Which news headers you wish to "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1582 +#: src/lang.c:1574 msgid "Do not display these header fields :" msgstr "" -#: src/lang.c:1583 +#: src/lang.c:1575 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 " @@ -4458,520 +4458,520 @@ msgid "# Same as 'news_headers_to_displa "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1593 +#: src/lang.c:1585 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1594 +#: src/lang.c:1586 msgid "Skip multipart/alternative parts :" msgstr "" -#: src/lang.c:1595 +#: src/lang.c:1587 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1600 +#: src/lang.c:1592 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1601 +#: src/lang.c:1593 msgid "Regex used to show quoted lines :" msgstr "" -#: src/lang.c:1602 +#: src/lang.c:1594 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:1608 +#: src/lang.c:1600 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1609 +#: src/lang.c:1601 msgid "Regex used to show twice quoted l. :" msgstr "" -#: src/lang.c:1610 +#: src/lang.c:1602 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:1616 +#: src/lang.c:1608 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1617 +#: src/lang.c:1609 msgid "Regex used to show >= 3 times q.l. :" msgstr "" -#: src/lang.c:1618 +#: src/lang.c:1610 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:1625 +#: src/lang.c:1617 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1626 +#: src/lang.c:1618 msgid "Regex used to highlight /slashes/ :" msgstr "" -#: src/lang.c:1627 +#: src/lang.c:1619 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:1633 +#: src/lang.c:1625 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1634 +#: src/lang.c:1626 msgid "Regex used to highlight *stars* :" msgstr "" -#: src/lang.c:1635 +#: src/lang.c:1627 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:1641 +#: src/lang.c:1633 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1642 +#: src/lang.c:1634 msgid "Regex used to highlight -strokes- :" msgstr "" -#: src/lang.c:1643 +#: src/lang.c:1635 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:1649 +#: src/lang.c:1641 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1650 +#: src/lang.c:1642 msgid "Regex used to highlight _underline_:" msgstr "" -#: src/lang.c:1651 +#: src/lang.c:1643 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:1657 +#: src/lang.c:1649 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1658 +#: src/lang.c:1650 msgid "Regex with Subject prefixes :" msgstr "" -#: src/lang.c:1659 +#: src/lang.c:1651 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:1664 +#: src/lang.c:1656 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1665 +#: src/lang.c:1657 msgid "Regex with Subject suffixes :" msgstr "" -#: src/lang.c:1666 +#: src/lang.c:1658 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:1671 +#: src/lang.c:1663 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1672 +#: src/lang.c:1664 msgid "MIME binary content viewer :" msgstr "" -#: src/lang.c:1673 +#: src/lang.c:1665 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:1680 +#: src/lang.c:1672 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1681 +#: src/lang.c:1673 msgid "Ask before using MIME viewer :" msgstr "" -#: src/lang.c:1682 +#: src/lang.c:1674 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:1687 +#: src/lang.c:1679 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1688 +#: src/lang.c:1680 msgid "Catchup read groups when quitting :" msgstr "" -#: src/lang.c:1689 +#: src/lang.c:1681 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1694 +#: src/lang.c:1686 msgid "Catchup group using left key :" msgstr "" -#: src/lang.c:1695 +#: src/lang.c:1687 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1700 +#: src/lang.c:1692 msgid "Catchup thread by using left key :" msgstr "" -#: src/lang.c:1706 +#: src/lang.c:1698 msgid "Which actions require confirmation :" msgstr "" -#: src/lang.c:1707 +#: src/lang.c:1699 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1712 +#: src/lang.c:1704 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1713 +#: src/lang.c:1705 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1709 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1718 +#: src/lang.c:1710 msgid "Program that opens URL's :" msgstr "" -#: src/lang.c:1719 +#: src/lang.c:1711 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1724 +#: src/lang.c:1716 msgid "Use mouse in xterm :" msgstr "" -#: src/lang.c:1725 +#: src/lang.c:1717 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1723 msgid "Use scroll keys on keypad :" msgstr "" -#: src/lang.c:1732 +#: src/lang.c:1724 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1729 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1730 msgid "Number of articles to get :" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1731 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:1744 +#: src/lang.c:1736 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1745 +#: src/lang.c:1737 msgid "Article recentness time limit :" msgstr "" -#: src/lang.c:1746 +#: src/lang.c:1738 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1742 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1751 +#: src/lang.c:1743 msgid "Wildcard matching :" msgstr "" -#: src/lang.c:1752 +#: src/lang.c:1744 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1748 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1757 +#: src/lang.c:1749 msgid "Score limit (kill) :" msgstr "" -#: src/lang.c:1758 +#: src/lang.c:1750 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1754 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1763 +#: src/lang.c:1755 msgid "Default score to kill articles :" msgstr "" -#: src/lang.c:1764 +#: src/lang.c:1756 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1760 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1761 msgid "Score limit (select) :" msgstr "" -#: src/lang.c:1770 +#: src/lang.c:1762 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1774 +#: src/lang.c:1766 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1775 +#: src/lang.c:1767 msgid "Default score to select articles :" msgstr "" -#: src/lang.c:1776 +#: src/lang.c:1768 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1782 +#: src/lang.c:1774 msgid "Use slrnface to show ''X-Face:''s :" msgstr "" -#: src/lang.c:1783 +#: src/lang.c:1775 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:1791 +#: src/lang.c:1783 msgid "Use ANSI color :" msgstr "Use ANSI colour :" -#: src/lang.c:1792 +#: src/lang.c:1784 msgid "# If ON using ANSI-color\n" msgstr "# If ON using ANSI-colour\n" -#: src/lang.c:1797 +#: src/lang.c:1789 msgid "Standard foreground color :" msgstr "Standard foreground colour :" -#: src/lang.c:1798 +#: src/lang.c:1790 msgid "# Standard foreground color\n" msgstr "# Standard foreground colour\n" -#: src/lang.c:1803 +#: src/lang.c:1795 msgid "Standard background color :" msgstr "Standard background colour :" -#: src/lang.c:1804 +#: src/lang.c:1796 msgid "# Standard-Background-Color\n" msgstr "# Standard-Background-Colour\n" -#: src/lang.c:1809 +#: src/lang.c:1801 msgid "Color for inverse text (background):" msgstr "Colour for inverse text (bg) :" -#: src/lang.c:1810 +#: src/lang.c:1802 msgid "# Color of background for inverse text\n" msgstr "# Colour of background for inverse text\n" -#: src/lang.c:1815 +#: src/lang.c:1807 msgid "Color for inverse text (foreground):" msgstr "Colour for inverse text (fg) :" -#: src/lang.c:1816 +#: src/lang.c:1808 msgid "# Color of foreground for inverse text\n" msgstr "# Colour of foreground for inverse text\n" -#: src/lang.c:1821 +#: src/lang.c:1813 msgid "Color of text lines :" msgstr "Colour of text lines :" -#: src/lang.c:1822 +#: src/lang.c:1814 msgid "# Color of text-lines\n" msgstr "# Colour of text-lines\n" -#: src/lang.c:1827 +#: src/lang.c:1819 msgid "Color of mini help menu :" msgstr "Colour of mini help menu :" -#: src/lang.c:1828 +#: src/lang.c:1820 msgid "# Color of mini help menu\n" msgstr "# Colour of mini help menu\n" -#: src/lang.c:1833 +#: src/lang.c:1825 msgid "Color of help text :" msgstr "Colour of help text :" -#: src/lang.c:1834 +#: src/lang.c:1826 msgid "# Color of help pages\n" msgstr "# Colour of help pages\n" -#: src/lang.c:1839 +#: src/lang.c:1831 msgid "Color of status messages :" msgstr "Colour of status messages :" -#: src/lang.c:1840 +#: src/lang.c:1832 msgid "# Color of messages in last line\n" msgstr "# Colour of messages in last line\n" -#: src/lang.c:1845 +#: src/lang.c:1837 msgid "Color of quoted lines :" msgstr "Colour of quoted lines :" -#: src/lang.c:1846 +#: src/lang.c:1838 msgid "# Color of quote-lines\n" msgstr "# Colour of quote-lines\n" -#: src/lang.c:1851 +#: src/lang.c:1843 msgid "Color of twice quoted line :" msgstr "Colour of twice quoted line :" -#: src/lang.c:1852 +#: src/lang.c:1844 msgid "# Color of twice quoted lines\n" msgstr "# Colour of twice quoted lines\n" -#: src/lang.c:1857 +#: src/lang.c:1849 msgid "Color of =>3 times quoted line :" msgstr "Colour of =>3 times quoted line :" -#: src/lang.c:1858 +#: src/lang.c:1850 msgid "# Color of >=3 times quoted lines\n" msgstr "# Colour of >=3 times quoted lines\n" -#: src/lang.c:1863 +#: src/lang.c:1855 msgid "Color of article header lines :" msgstr "Colour of article header lines :" -#: src/lang.c:1864 +#: src/lang.c:1856 msgid "# Color of header-lines\n" msgstr "# Colour of header-lines\n" -#: src/lang.c:1869 +#: src/lang.c:1861 msgid "Color of actual news header fields :" msgstr "Colour of actual news header fields:" -#: src/lang.c:1870 +#: src/lang.c:1862 msgid "# Color of actual news header fields\n" msgstr "# Colour of actual news header fields\n" -#: src/lang.c:1875 +#: src/lang.c:1867 msgid "Color of article subject lines :" msgstr "Colour of article subject lines :" -#: src/lang.c:1876 +#: src/lang.c:1868 msgid "# Color of article subject\n" msgstr "# Colour of article subject\n" -#: src/lang.c:1881 +#: src/lang.c:1873 msgid "Color of response counter :" msgstr "Colour of response counter :" -#: src/lang.c:1882 +#: src/lang.c:1874 msgid "# Color of response counter\n" msgstr "# Colour of response counter\n" -#: src/lang.c:1887 +#: src/lang.c:1879 msgid "Color of sender (From:) :" msgstr "Colour of sender (From:) :" -#: src/lang.c:1888 +#: src/lang.c:1880 msgid "# Color of sender (From:)\n" msgstr "# Colour of sender (From:)\n" -#: src/lang.c:1893 +#: src/lang.c:1885 msgid "Color of help/mail sign :" msgstr "Colour of help/mail sign :" -#: src/lang.c:1894 +#: src/lang.c:1886 msgid "# Color of Help/Mail-Sign\n" msgstr "# Colour of Help/Mail-Sign\n" -#: src/lang.c:1899 +#: src/lang.c:1891 msgid "Color of signatures :" msgstr "Colour of signatures :" -#: src/lang.c:1900 +#: src/lang.c:1892 msgid "# Color of signature\n" msgstr "# Colour of signature\n" -#: src/lang.c:1905 +#: src/lang.c:1897 msgid "Color of highlighted URLs :" msgstr "Colour of highlighted URLs :" -#: src/lang.c:1906 +#: src/lang.c:1898 msgid "# Color of highlighted URLs\n" msgstr "# Colour of highlighted URLs\n" -#: src/lang.c:1911 +#: src/lang.c:1903 msgid "Color of highlighting with *stars* :" msgstr "Colour of highlighting with *stars*:" -#: src/lang.c:1912 +#: src/lang.c:1904 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:1918 +#: src/lang.c:1910 msgid "Color of highlighting with _dash_ :" msgstr "Colour of highlighting with _dash_ :" -#: src/lang.c:1924 +#: src/lang.c:1916 msgid "Color of highlighting with /slash/ :" msgstr "Colour of highlighting with /slash/:" -#: src/lang.c:1930 +#: src/lang.c:1922 msgid "Color of highlighting with -stroke-:" msgstr "Colour of highlighting w. -stroke- :" -#: src/lang.c:1937 +#: src/lang.c:1929 msgid "Attr. of highlighting with *stars* :" msgstr "" -#: src/lang.c:1938 +#: src/lang.c:1930 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -4980,93 +4980,93 @@ msgid "# Attribute of word highlighting "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1948 +#: src/lang.c:1940 msgid "Attr. of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1946 msgid "Attr. of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1960 +#: src/lang.c:1952 msgid "Attr. of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1966 +#: src/lang.c:1958 msgid "URL highlighting in message body :" msgstr "" -#: src/lang.c:1967 +#: src/lang.c:1959 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:1972 +#: src/lang.c:1964 msgid "Word highlighting in message body :" msgstr "" -#: src/lang.c:1973 +#: src/lang.c:1965 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1978 +#: src/lang.c:1970 msgid "What to display instead of mark :" msgstr "" -#: src/lang.c:1979 +#: src/lang.c:1971 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:1985 +#: src/lang.c:1977 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1978 msgid "Page line wrap column :" msgstr "" -#: src/lang.c:1987 +#: src/lang.c:1979 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:1984 msgid "Wrap around threads on next unread :" msgstr "" -#: src/lang.c:1993 +#: src/lang.c:1985 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1997 +#: src/lang.c:1989 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1998 +#: src/lang.c:1990 msgid "Mail address (and fullname) :" msgstr "" -#: src/lang.c:1999 +#: src/lang.c:1991 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:2004 +#: src/lang.c:1996 msgid "Show empty Followup-To in editor :" msgstr "" -#: src/lang.c:2005 +#: src/lang.c:1997 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2009 +#: src/lang.c:2001 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2002 msgid "Create signature from path/command :" msgstr "" -#: src/lang.c:2011 +#: src/lang.c:2003 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 " @@ -5074,48 +5074,48 @@ msgid "# Signature path (random sigs)/fi "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2010 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2019 +#: src/lang.c:2011 msgid "Prepend signature with \"-- \" :" msgstr "" -#: src/lang.c:2020 +#: src/lang.c:2012 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2016 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2017 msgid "Add signature when reposting :" msgstr "" -#: src/lang.c:2026 +#: src/lang.c:2018 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2030 +#: src/lang.c:2022 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2023 msgid "Characters used as quote-marks :" msgstr "" -#: src/lang.c:2032 +#: src/lang.c:2024 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:2038 +#: src/lang.c:2030 msgid "Quoting behavior :" msgstr "Quoting behaviour :" -#: src/lang.c:2039 +#: src/lang.c:2031 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5127,49 +5127,49 @@ msgid "# How quoting should be handled w "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2051 src/lang.c:2059 src/lang.c:2065 +#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2052 +#: src/lang.c:2044 msgid "Quote line when following up :" msgstr "" -#: src/lang.c:2053 +#: src/lang.c:2045 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:2060 +#: src/lang.c:2052 msgid "Quote line when cross-posting :" msgstr "" -#: src/lang.c:2066 +#: src/lang.c:2058 msgid "Quote line when mailing :" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2063 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2072 +#: src/lang.c:2064 msgid "Insert 'User-Agent:'-header :" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2065 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2077 +#: src/lang.c:2069 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2078 +#: src/lang.c:2070 msgid "MM_CHARSET :" msgstr "" -#: src/lang.c:2079 +#: src/lang.c:2071 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" @@ -5178,27 +5178,27 @@ msgid "# Charset supported locally which "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2082 msgid "MM_NETWORK_CHARSET :" msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2083 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2097 +#: src/lang.c:2089 msgid "Mailbox format :" msgstr "" -#: src/lang.c:2098 +#: src/lang.c:2090 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2103 +#: src/lang.c:2095 msgid "MIME encoding in news messages :" msgstr "" -#: src/lang.c:2104 +#: src/lang.c:2096 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" @@ -5206,42 +5206,42 @@ msgid "# MIME encoding (8bit, base64, qu "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2112 src/lang.c:2133 +#: src/lang.c:2104 src/lang.c:2125 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2113 +#: src/lang.c:2105 msgid "Use 8bit characters in news headers:" msgstr "" -#: src/lang.c:2114 +#: src/lang.c:2106 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:2121 +#: src/lang.c:2113 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2122 +#: src/lang.c:2114 msgid "View post-processed files :" msgstr "" -#: src/lang.c:2123 +#: src/lang.c:2115 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2128 +#: src/lang.c:2120 msgid "MIME encoding in mail messages :" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2126 msgid "Use 8bit characters in mail headers:" msgstr "" -#: src/lang.c:2135 +#: src/lang.c:2127 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 " @@ -5251,383 +5251,383 @@ msgid "# If ON, 8bit characters in mail "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2137 msgid "Strip blanks from ends of lines :" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2138 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2151 +#: src/lang.c:2143 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2152 +#: src/lang.c:2144 msgid "Transliteration :" msgstr "" -#: src/lang.c:2153 +#: src/lang.c:2145 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:2160 +#: src/lang.c:2152 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2161 +#: src/lang.c:2153 msgid "Send you a cc automatically :" msgstr "" -#: src/lang.c:2162 +#: src/lang.c:2154 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "" -#: src/lang.c:2166 +#: src/lang.c:2158 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2159 msgid "Send you a blind cc automatically :" msgstr "" -#: src/lang.c:2168 +#: src/lang.c:2160 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2172 +#: src/lang.c:2164 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2165 msgid "Spamtrap warning address parts :" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2166 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:2179 +#: src/lang.c:2171 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2172 msgid "No. of days a filter entry is valid:" msgstr "" -#: src/lang.c:2181 +#: src/lang.c:2173 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2185 +#: src/lang.c:2177 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2186 +#: src/lang.c:2178 msgid "Add posted articles to filter :" msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2179 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2183 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2192 +#: src/lang.c:2184 msgid "Mail directory :" msgstr "" -#: src/lang.c:2193 +#: src/lang.c:2185 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2198 +#: src/lang.c:2190 msgid "Save articles in batch mode (-S) :" msgstr "" -#: src/lang.c:2199 +#: src/lang.c:2191 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:2204 +#: src/lang.c:2196 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2205 +#: src/lang.c:2197 msgid "Directory to save arts/threads in :" msgstr "" -#: src/lang.c:2206 +#: src/lang.c:2198 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2210 +#: src/lang.c:2202 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2203 msgid "Use Archive-name: header for save :" msgstr "" -#: src/lang.c:2212 +#: src/lang.c:2204 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:2217 +#: src/lang.c:2209 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2218 +#: src/lang.c:2210 msgid "Mark saved articles/threads as read:" msgstr "" -#: src/lang.c:2219 +#: src/lang.c:2211 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2223 +#: src/lang.c:2215 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2216 msgid "Post process saved articles :" msgstr "" -#: src/lang.c:2225 +#: src/lang.c:2217 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:2231 +#: src/lang.c:2223 msgid "Process only unread articles :" msgstr "" -#: src/lang.c:2232 +#: src/lang.c:2224 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "" -#: src/lang.c:2237 +#: src/lang.c:2229 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2238 +#: src/lang.c:2230 msgid "Print all headers when printing :" msgstr "" -#: src/lang.c:2239 +#: src/lang.c:2231 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2243 +#: src/lang.c:2235 msgid "The printer program with options that is to be used to print articles/threads." msgstr "" -#: src/lang.c:2244 +#: src/lang.c:2236 msgid "Printer program with options :" msgstr "" -#: src/lang.c:2245 +#: src/lang.c:2237 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2251 +#: src/lang.c:2243 msgid "Force redraw after certain commands:" msgstr "" -#: src/lang.c:2252 +#: src/lang.c:2244 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2256 +#: src/lang.c:2248 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2257 +#: src/lang.c:2249 msgid "Start editor with line offset :" msgstr "" -#: src/lang.c:2258 +#: src/lang.c:2250 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:2263 +#: src/lang.c:2255 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2264 +#: src/lang.c:2256 msgid "Invocation of your editor :" msgstr "" -#: src/lang.c:2265 +#: src/lang.c:2257 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2270 +#: src/lang.c:2262 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2271 +#: src/lang.c:2263 msgid "External inews :" msgstr "" -#: src/lang.c:2272 +#: src/lang.c:2264 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:2276 +#: src/lang.c:2268 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2277 +#: src/lang.c:2269 msgid "Invocation of your mail command :" msgstr "" -#: src/lang.c:2278 +#: src/lang.c:2270 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\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:2286 +#: src/lang.c:2278 msgid "Use interactive mail reader :" msgstr "" -#: src/lang.c:2287 +#: src/lang.c:2279 msgid "# Interactive mailreader:\n" "# 0 = no interactive mailreader\n" "# 1 = use interactive mailreader with headers in file\n" "# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2295 +#: src/lang.c:2287 msgid "Remove ~/.article after posting :" msgstr "" -#: src/lang.c:2296 +#: src/lang.c:2288 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2292 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2301 +#: src/lang.c:2293 msgid "Filename for posted articles :" msgstr "" -#: src/lang.c:2302 +#: src/lang.c:2294 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:2307 +#: src/lang.c:2299 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2308 +#: src/lang.c:2300 msgid "Keep failed arts in ~/dead.articles:" msgstr "" -#: src/lang.c:2309 +#: src/lang.c:2301 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2313 +#: src/lang.c:2305 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2314 +#: src/lang.c:2306 msgid "No unsubscribed groups in newsrc :" msgstr "" -#: src/lang.c:2315 +#: src/lang.c:2307 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2320 +#: src/lang.c:2312 msgid "Remove bogus groups from newsrc :" msgstr "" -#: src/lang.c:2321 +#: src/lang.c:2313 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:2325 +#: src/lang.c:2317 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2326 +#: src/lang.c:2318 msgid "Interval in secs to reread active :" msgstr "" -#: src/lang.c:2327 +#: src/lang.c:2319 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2332 +#: src/lang.c:2324 msgid "Reconnect to server automatically :" msgstr "" -#: src/lang.c:2333 +#: src/lang.c:2325 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2337 +#: src/lang.c:2329 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2338 +#: src/lang.c:2330 msgid "Cache NNTP overview files locally :" msgstr "" -#: src/lang.c:2339 +#: src/lang.c:2331 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2343 +#: src/lang.c:2335 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2344 +#: src/lang.c:2336 msgid "Format string for display of dates :" msgstr "" -#: src/lang.c:2345 +#: src/lang.c:2337 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2351 +#: src/lang.c:2343 msgid "Unicode normalization form :" msgstr "Unicode normalisation form :" -#: src/lang.c:2352 +#: src/lang.c:2344 msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "# Unicode normalisation form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" -#: src/main.c:586 +#: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" msgstr "" -#: src/main.c:589 +#: src/main.c:593 #, c-format msgid "Version: %s release %s (\"%s\")" msgstr "" @@ -5636,22 +5636,22 @@ msgstr "" msgid "Unreachable?\n" msgstr "" -#: src/nntplib.c:821 +#: src/nntplib.c:822 #, c-format msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:839 +#: src/nntplib.c:840 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:846 +#: src/nntplib.c:847 #, c-format msgid "Read (%s)\n" msgstr "" -#: src/nntplib.c:848 +#: src/nntplib.c:849 #, c-format msgid "Resend last command (%s)\n" msgstr "" @@ -5661,7 +5661,7 @@ msgstr "" msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1939 +#: src/post.c:1951 #, c-format msgid "Posting: %.*s ..." msgstr "" @@ -5681,15 +5681,15 @@ msgid "Draining\n" msgstr "" #. Don't hash the initial '<' -#: src/refs.c:220 +#: src/refs.c:251 msgid "unchanged" msgstr "" -#: src/refs.c:573 +#: src/refs.c:610 msgid "[- Unavailable -]" msgstr "" -#: src/save.c:975 +#: src/save.c:976 msgid "bytes" msgstr "" @@ -5701,7 +5701,7 @@ msgstr "" msgid "all" msgstr "" -#: src/select.c:525 src/select.c:527 +#: src/select.c:529 src/select.c:531 msgid " R" msgstr "" Binary files tin-1.7.3/po/et.gmo and tin-1.7.4/po/et.gmo differ diff -Nurp tin-1.7.3/po/et.po tin-1.7.4/po/et.po --- tin-1.7.3/po/et.po Sat Dec 20 18:45:14 2003 +++ tin-1.7.4/po/et.po Wed Feb 25 10:34:13 2004 @@ -4,7 +4,7 @@ # msgid "" msgstr "Project-Id-Version: tin 1.7.2\n" - "POT-Creation-Date: 2003-12-20 18:42+0100\n" + "POT-Creation-Date: 2004-02-25 10:33+0100\n" "PO-Revision-Date: 2003-01-07 18:45+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -12,7 +12,7 @@ msgstr "Project-Id-Version: tin 1.7.2\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1425 +#: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Vigane overview kirje (%d välja) '%s'" @@ -233,7 +233,7 @@ msgstr "(tundmatu)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:608 src/filter.c:616 +#: src/filter.c:612 src/filter.c:620 msgid "Removed from the previous rule: " msgstr "Eelmisest reeglist eemaldatud: " @@ -462,8 +462,8 @@ msgid "*** Beginning of article ***" msgstr "*** Artikli algus ***" #: 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): " +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:98 msgid "Cancelling article..." @@ -585,7 +585,7 @@ msgstr "Loon salvestatud gruppidele acti msgid "Creating newsrc file...\n" msgstr "Loon newsrc faili...\n" -#: src/lang.c:127 src/lang.c:1126 +#: src/lang.c:127 src/lang.c:1118 msgid "Default" msgstr "Vaikimisi" @@ -1215,9 +1215,10 @@ msgstr "Brausi artiklis olevaid URLe" msgid "0 - 9\t display article by number in current thread" msgstr "0 - 9\t näita jooksva teema numbri järgi valitud artiklit" +# TRANSLATION MISSING #: src/lang.c:283 -msgid "cancel (delete) current article; must have been posted by you" -msgstr "katkesta (kustuta) jooksev artikkel; peab olema teie postitus" +msgid "cancel (delete) or supersede (overwrite) current article" +msgstr "" #: src/lang.c:284 msgid "edit article (mail-groups only)" @@ -1263,7 +1264,7 @@ msgstr "näita järgmist artiklit" msgid "display first article in next thread" msgstr "näita järgmise teema esimest artiklit" -#: src/lang.c:295 src/lang.c:302 src/lang.c:361 src/lang.c:362 +#: src/lang.c:295 msgid "display next unread article" msgstr "näita järgmist lugemata artiklit" @@ -1275,7 +1276,7 @@ msgstr "mine artiklile, millele see arti msgid "display previous article" msgstr "näita eelmist artiklit" -#: src/lang.c:298 src/lang.c:364 +#: src/lang.c:298 msgid "display previous unread article" msgstr "näita eelmist lugemata artiklit" @@ -1291,191 +1292,195 @@ msgstr "vali kiiresti vaikeväärtusi kasu msgid "return to group selection level" msgstr "tagasi gruppide valikusse" -#: src/lang.c:303 +#: src/lang.c:302 msgid "reply through mail to author" msgstr "vasta autorile kirjaga" -#: src/lang.c:304 +#: src/lang.c:303 msgid "reply through mail (don't copy text) to author" msgstr "vasta autorile kirjaga (teksti ei kopeerita)" -#: src/lang.c:305 +#: src/lang.c:304 msgid "reply through mail to author quoting complete headers" msgstr "vasta autorile kirjaga, tsiteerides kõiki päiseid" -#: src/lang.c:306 src/lang.c:366 +#: src/lang.c:305 msgid "repost chosen article to another group" msgstr "postita valitud artikkel teise gruppi" -#: src/lang.c:307 +#: src/lang.c:306 msgid "search backwards within this article" msgstr "otsi artiklis tagaspidi" -#: src/lang.c:308 +#: src/lang.c:307 msgid "search forwards within this article" msgstr "otsi artiklis edaspidi" -#: src/lang.c:309 +#: src/lang.c:308 msgid "show article in raw-mode (including all headers)" msgstr "näita kogu artiklit (koos päistega)" -#: src/lang.c:310 +#: src/lang.c:309 msgid "skip next block of included text" msgstr "järgmisele tekstiblokile" -#: src/lang.c:311 +#: src/lang.c:310 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:312 +#: src/lang.c:311 msgid "toggle word highlighting on/off" msgstr "lülita sõnade märkimine sisse/välja" -#: src/lang.c:313 +#: src/lang.c:312 msgid "toggle ROT-13 (basic decode) for current article" msgstr "lülita jooksva artikli ROT-13 (lihtne dekodeering) kodeering" -#: src/lang.c:314 +#: src/lang.c:313 msgid "toggle tabwidth 4 <-> 8" msgstr "lülita tabulaatori laius 4 <-> 8" -#: src/lang.c:315 +#: src/lang.c:314 msgid "toggle german TeX style decoding for current article" msgstr "lülita jooksva artikli saksa TeX stiilis dekodeerimine" -#: src/lang.c:316 +#: src/lang.c:315 msgid "toggle display of uuencoded sections" msgstr "lülita uuenkodeeritud osade näitamine" -#: src/lang.c:317 +#: src/lang.c:316 msgid "View/save multimedia attachments" msgstr "Vaata/salvesta multimeedia lisasid" -#: src/lang.c:318 +#: src/lang.c:317 #, c-format msgid "report bug or comment via mail to %s" msgstr "saatke vearaport või kommentaar aadressile %s" -#: src/lang.c:319 +#: src/lang.c:318 msgid "choose range of articles to be affected by next command" msgstr "valige järgmise käsuga töödeldavate artiklite vahemik" -#: src/lang.c:320 +#: src/lang.c:319 msgid "escape from command prompt" msgstr "pääs käsuviibalt" -#: src/lang.c:321 +#: src/lang.c:320 msgid "get help" msgstr "anna abiinfot" -#: src/lang.c:322 +#: src/lang.c:321 msgid "display last article viewed" msgstr "näita viimasena vaadatud artiklit" -#: src/lang.c:323 +#: src/lang.c:322 msgid "down one line" msgstr "üks rida alla" -#: src/lang.c:324 +#: src/lang.c:323 msgid "up one line" msgstr "üles üks rida" -#: src/lang.c:325 +#: src/lang.c:324 msgid "go to article chosen by Message-ID" msgstr "liigu Message-ID poolt määratud artiklile" -#: src/lang.c:326 +#: src/lang.c:325 msgid "mail article/thread/hot/pattern/tagged articles to someone" msgstr "saada artikkel/teema/kuum/muster/märgitud kellelegi" -#: src/lang.c:327 +#: src/lang.c:326 msgid "menu of configurable options" msgstr "seadete menüü" -#: src/lang.c:328 +#: src/lang.c:327 msgid "down one page" msgstr "alla üks lehekülg" -#: src/lang.c:329 +#: src/lang.c:328 msgid "up one page" msgstr "üles üks lehekülg" -#: src/lang.c:330 +#: src/lang.c:329 msgid "post (write) article to current group" msgstr "postita (kirjuta) artikkel jooksvasse gruppi" -#: src/lang.c:331 +#: src/lang.c:330 msgid "post postponed articles" msgstr "postita ootel artiklid" -#: src/lang.c:332 +#: src/lang.c:331 msgid "list articles posted by you (from posted file)" msgstr "näita teie poolt postitatud artikleid (failist posted)" -#: src/lang.c:333 +#: src/lang.c:332 msgid "return to previous menu" msgstr "tagasi eelmisse menüüsse" -#: src/lang.c:334 +#: src/lang.c:333 msgid "quit tin immediately" msgstr "välju viivitamata tinist" -#: src/lang.c:335 +#: src/lang.c:334 msgid "redraw page" msgstr "värskenda lehekülge" -#: src/lang.c:336 +#: src/lang.c:335 msgid "save article/thread/hot/pattern/tagged articles to file" msgstr "salvesta artikkel/teema/kuum/muster/märgitud faili" -#: src/lang.c:337 +#: src/lang.c:336 msgid "save marked articles automatically without user prompts" msgstr "salvesta märgitud artiklid automaatselt, kasutajalt küsimata" -#: src/lang.c:338 +#: src/lang.c:337 msgid "search for articles by author backwards" msgstr "otsi artikleid autori järgi tagaspidi" -#: src/lang.c:339 +#: src/lang.c:338 msgid "search for articles by author forwards" msgstr "otsi artikleid autori järgi edaspidi" -#: src/lang.c:340 +#: src/lang.c:339 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:341 +#: src/lang.c:340 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:342 +#: src/lang.c:341 msgid "search for articles by Subject line backwards" msgstr "otsi artiklit teema järgi tagaspidi" -#: src/lang.c:343 +#: src/lang.c:342 msgid "search for articles by Subject line forwards" msgstr "otsi artiklit teema järgi edaspidi" -#: src/lang.c:344 +#: src/lang.c:343 msgid "repeat last search" msgstr "korda eelmist otsingut" -#: src/lang.c:345 +#: src/lang.c:344 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:346 +#: src/lang.c:345 msgid "toggle info message in last line (subject/description)" msgstr "lülita viimase rea infoteadet (teema/kirjeldus)" -#: src/lang.c:347 +#: src/lang.c:346 msgid "toggle inverse video" msgstr "lülita pööratud video" -#: src/lang.c:348 +#: src/lang.c:347 msgid "toggle mini help menu display" msgstr "abiinfo lülita ekraanil miniabi menüüd" +#: src/lang.c:348 +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:349 msgid "show version information" msgstr "esita info versioonist" @@ -1492,326 +1497,322 @@ msgstr "märgi artiklid loetuks, sisene j msgid "choose first thread in list" msgstr "vali loendist esimene teema" -#: src/lang.c:353 src/lang.c:384 -msgid "choose group by name" -msgstr "vali grupp nime järgi" - -#: src/lang.c:354 +#: src/lang.c:353 msgid "choose last thread in list" msgstr "vali loendist viimane teema" -#: src/lang.c:355 +#: src/lang.c:354 msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "artiklite loend jooksvas teemas (esita teema alam-menüü)" -#: src/lang.c:356 +#: src/lang.c:355 msgid "mark article as unread" msgstr "märgi artikkel loetuks" -#: src/lang.c:357 +#: src/lang.c:356 msgid "mark current thread or tagged threads as read" msgstr "märgi jooksev teema või märgitud teemad loetuks" -#: src/lang.c:358 +#: src/lang.c:357 msgid "mark thread as unread" msgstr "märgi teema loetuks" -#: src/lang.c:359 +#: src/lang.c:358 msgid "toggle display of all/selected articles" msgstr "lülita ekraanile kõik/valitud artiklid" -#: src/lang.c:360 +#: src/lang.c:359 msgid "display next group" msgstr "näita järgmist gruppi" -#: src/lang.c:363 +#: src/lang.c:360 msgid "display previous group" msgstr "näita eelmist gruppi" -#: src/lang.c:365 src/lang.c:413 -msgid "read chosen article" -msgstr "loe valitud artiklit" - -#: src/lang.c:367 +#: src/lang.c:361 msgid "toggle all selections (all articles)" msgstr "lülita kõiki valikuid (kõiki artikleid)" -#: src/lang.c:368 +#: src/lang.c:362 msgid "select group (make \"hot\")" msgstr "vali grupp (muuda \"kuumaks\")" -#: src/lang.c:369 +#: src/lang.c:363 msgid "select thread" msgstr "vali teema" -#: src/lang.c:370 +#: src/lang.c:364 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:371 +#: src/lang.c:365 msgid "select threads that match user specified pattern" msgstr "vali kasutaja määratud mustrile vastavad teemad" -#: src/lang.c:372 +#: src/lang.c:366 msgid "tag all parts of current multipart-message in order" msgstr "märgi jooksva mitmeosalise teate kõik osad" -#: src/lang.c:373 +#: src/lang.c:367 msgid "0 - 9\t choose thread by number" msgstr "0 - 9\t vali numbri järgi teema" -#: src/lang.c:374 +#: src/lang.c:368 msgid "toggle limit number of articles to get, and reload" msgstr "sea laetavate artiklite piirang ja lae uuesti" -#: src/lang.c:375 +#: src/lang.c:369 msgid "toggle display of all/unread articles" msgstr "lülita ekraanil kõik/lugemata artiklid" -#: src/lang.c:376 src/lang.c:414 -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:377 +#: src/lang.c:370 msgid "toggle selection of thread" msgstr "lülita teema valikut" -#: src/lang.c:378 +#: src/lang.c:371 msgid "cycle through threading options available" msgstr "erinevad teemade käsitlemise võtmed" -#: src/lang.c:379 +#: src/lang.c:372 msgid "undo all selections (all articles)" msgstr "ennista kõik valikud (kõik artiklid)" -#: src/lang.c:380 +#: src/lang.c:373 msgid "untag all tagged threads" msgstr "eemalda märgistus kõikidelt märgitud teemadelt" -#: src/lang.c:381 +#: src/lang.c:374 msgid "mark all articles in group as read" msgstr "märgi valitud grupis kõik artiklid loetuks" -#: src/lang.c:382 +#: src/lang.c:375 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:383 +#: src/lang.c:376 msgid "choose first group in list" msgstr "vali loetelust esimene grupp" -#: src/lang.c:385 +#: src/lang.c:377 +msgid "choose group by name" +msgstr "vali grupp nime järgi" + +#: src/lang.c:378 msgid "0 - 9\t choose group by number" msgstr "0 - 9\t vali grupp numbri järgi" -#: src/lang.c:386 +#: src/lang.c:379 msgid "choose range of groups to be affected by next command" msgstr "järgmise käsuga töödeldavate gruppide vahemik" -#: src/lang.c:387 +#: src/lang.c:380 msgid "choose last group in list" msgstr "vali loetelust viimane grupp" -#: src/lang.c:388 +#: src/lang.c:381 msgid "mark all articles in chosen group unread" msgstr "märgi valitud grupis kõik artiklid mitte-loetuks" -#: src/lang.c:389 +#: src/lang.c:382 msgid "move chosen group within list" msgstr "liiguta valitud gruppi loendis" -#: src/lang.c:390 +#: src/lang.c:383 msgid "choose next group with unread news" msgstr "vali järgmine lugemata artiklitega grupp" -#: src/lang.c:391 src/lang.c:1173 +#: src/lang.c:384 src/lang.c:1165 msgid "quit" msgstr "välju" -#: src/lang.c:392 +#: src/lang.c:385 msgid "quit without saving configuration changes" msgstr "välju muudetud seadeid salvestamata" -#: src/lang.c:393 +#: src/lang.c:386 msgid "read chosen group" msgstr "loe valitud gruppi" -#: src/lang.c:394 +#: src/lang.c:387 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr ".newsrc faili algväärtustamine (kõik artiklid mitte-loetuks)" -#: src/lang.c:395 +#: src/lang.c:388 msgid "search backwards for a group name" msgstr "otsi grupi nime tagaspidi" -#: src/lang.c:396 +#: src/lang.c:389 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:397 +#: src/lang.c:390 msgid "search forwards for a group name" msgstr "otsi grupi nime edaspidi" -#: src/lang.c:398 +#: src/lang.c:391 msgid "subscribe to chosen group" msgstr "telli valitud grupp" -#: src/lang.c:399 +#: src/lang.c:392 msgid "subscribe to groups that match pattern" msgstr "telli mustrile vastavaid gruppe" -#: src/lang.c:400 +#: src/lang.c:393 msgid "reread active file to check for any new news" msgstr "kontrolli aktiivsete gruppide faili - kas on uusi artikleid" -#: src/lang.c:401 +#: src/lang.c:394 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:402 +#: src/lang.c:395 msgid "toggle display to show all/unread subscribed groups" msgstr "vali ekraanile kõik/lugemata tellitud grupid" -#: src/lang.c:403 +#: src/lang.c:396 msgid "unsubscribe from chosen group" msgstr "loobu valitud grupist" -#: src/lang.c:404 +#: src/lang.c:397 msgid "unsubscribe from groups that match pattern" msgstr "loobu mustrile vastavatest gruppidest" -#: src/lang.c:405 +#: src/lang.c:398 msgid "sort the list of groups" msgstr "järjesta gruppide loend" -#: src/lang.c:406 +#: src/lang.c:399 msgid "toggle display to show all/subscribed groups" msgstr "näita ekraanil kõiki/tellitud gruppe" -#: src/lang.c:407 +#: src/lang.c:400 msgid "0 - 9\t choose article by number" msgstr "0 - 9\t vali numbri järgi artikkel" -#: src/lang.c:408 +#: src/lang.c:401 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:409 +#: src/lang.c:402 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:410 +#: src/lang.c:403 msgid "choose first article in list" msgstr "vali loendis esimene artikkel" -#: src/lang.c:411 +#: src/lang.c:404 msgid "choose last article in list" msgstr "vali loendis viimane artikkel" -#: src/lang.c:412 +#: src/lang.c:405 msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "märgi artikkel või märgitud artiklid loetuks, liigu järgm. lugemata artiklile" -#: src/lang.c:415 +#: src/lang.c:406 +msgid "read chosen article" +msgstr "loe valitud artiklit" + +#: src/lang.c:407 msgid "Display properties\n" "------------------" msgstr "Ekraani omadused\n" "----------------" -#: src/lang.c:416 +#: src/lang.c:408 msgid "Miscellaneous\n" "-------------" msgstr "Muud\n" "----" -#: src/lang.c:417 +#: src/lang.c:409 msgid "Moving around\n" "-------------" msgstr "Liikumine\n" "---------" -#: src/lang.c:418 +#: src/lang.c:410 msgid "Group/thread/article operations\n" "-------------------------------" msgstr "Grupi/teema/artikli operatsioonid\n" "---------------------------------" -#: src/lang.c:420 +#: src/lang.c:412 msgid "Group Level Commands" msgstr "Grupitaseme käsud" -#: src/lang.c:421 +#: src/lang.c:413 msgid "Kill filter added" msgstr "Surmamise filter lisatud" -#: src/lang.c:422 +#: src/lang.c:414 msgid "Auto-selection filter added" msgstr "Automaatse valiku filter lisatud" -#: src/lang.c:423 +#: src/lang.c:415 msgid "All parts tagged" msgstr "Kõik osad on märgitud" -#: src/lang.c:424 +#: src/lang.c:416 msgid "Storing article for later posting" msgstr "Salvestan artikli hiljem postitamiseks" -#: src/lang.c:425 +#: src/lang.c:417 msgid "Please enter a valid character" msgstr "Palun sisestage lubatud sümbol" -#: src/lang.c:426 +#: src/lang.c:418 #, c-format msgid "Missing part #%d" msgstr "Puudub osa nr: %d" -#: src/lang.c:427 +#: src/lang.c:419 msgid "*** No postponed articles ***" msgstr "*** Postitusootel artikleid pole ***" -#: src/lang.c:428 +#: src/lang.c:420 msgid "Not a multi-part message" msgstr "Ei ole mitmeosaline teade" -#: src/lang.c:429 +#: src/lang.c:421 msgid "You are not subscribed to this group" msgstr "Te pole seda gruppi tellinud" -#: src/lang.c:430 +#: src/lang.c:422 msgid "No previous expression" msgstr "Eelmist avaldist pole" -#: src/lang.c:431 +#: src/lang.c:423 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:433 +#: src/lang.c:425 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d ootel %s, kasutamiseks ^O...\n" -#: src/lang.c:434 +#: src/lang.c:426 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:436 +#: src/lang.c:428 #, 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:437 +#: src/lang.c:429 msgid "TeX2Iso encoded article" msgstr "TeX2Iso kodeeritud artikkel" -#: src/lang.c:438 +#: src/lang.c:430 msgid "incomplete " msgstr "mittetäielik " #. TODO: replace hardcoded key-names -#: src/lang.c:440 +#: src/lang.c:432 #, c-format msgid "\n" "Welcome to %s, a full screen threaded Netnews reader. It can read news " @@ -1869,129 +1870,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:456 +#: src/lang.c:448 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "Vigane From: %s rida. Lugege uuesti faili INSTALL." -#: src/lang.c:457 +#: src/lang.c:449 #, c-format msgid "Invalid Sender:-header %s" msgstr "Vigane Sender:-päis %s" -#: src/lang.c:458 +#: src/lang.c:450 msgid "Inverse video disabled" msgstr "Pööratud video keelatud" -#: src/lang.c:459 +#: src/lang.c:451 msgid "Inverse video enabled" msgstr "Pööratud video lubatud" -#: src/lang.c:461 +#: src/lang.c:453 #, c-format msgid "Missing definition for %s\n" msgstr "%s definitsioon puudub\n" -#: src/lang.c:462 +#: src/lang.c:454 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Vigane klahvi definitsioon '%s'\n" -#: src/lang.c:463 +#: src/lang.c:455 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Vigane klahvi nimi '%s'\n" -#: src/lang.c:464 +#: src/lang.c:456 #, 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:465 +#: src/lang.c:457 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "Surmake From: [%s] (j/e): " -#: src/lang.c:466 +#: src/lang.c:458 msgid "Kill Lines: (num): " msgstr "Surmake read: (num) : " -#: src/lang.c:467 +#: src/lang.c:459 msgid "Kill Article Menu" msgstr "Artuklite surmamise menüü" -#: src/lang.c:468 +#: src/lang.c:460 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "Surmake Msg-Id:[%s] (f/l/o/n): " -#: src/lang.c:469 +#: src/lang.c:461 msgid "Kill pattern scope : " msgstr "Surmamise mustri ulatus: " -#: src/lang.c:470 +#: src/lang.c:462 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Surmake teema: [%s] (j/e): " -#: src/lang.c:471 +#: src/lang.c:463 msgid "Kill text pattern : " msgstr "Surmake tekst mustriga : " -#: src/lang.c:472 +#: src/lang.c:464 msgid "Kill time in days : " msgstr "Surmamise aeg päevades : " -#: src/lang.c:474 +#: src/lang.c:466 msgid "Last" msgstr "Viimane" -#: src/lang.c:475 +#: src/lang.c:467 msgid "-- Last response --" msgstr "-- Viimane vastus --" -#: src/lang.c:476 +#: src/lang.c:468 #, c-format msgid "Lines %s " msgstr "Rida: %s " -#: src/lang.c:478 +#: src/lang.c:470 msgid "Message-ID: line " msgstr "Message-ID: rida " -#: src/lang.c:480 +#: src/lang.c:472 msgid "mailbox " msgstr "postkasti " -#: src/lang.c:481 +#: src/lang.c:473 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Saada artiklid aadressil [%.*s]> " -#: src/lang.c:482 +#: src/lang.c:474 #, c-format msgid "Mailing log to %s\n" msgstr "Saadan logi aadressil %s\n" -#: src/lang.c:483 +#: src/lang.c:475 msgid "Mail bug report..." msgstr "Saada vearaport..." -#: src/lang.c:484 +#: src/lang.c:476 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Saadan VEARAPORTI aadressil %s?" -#: src/lang.c:485 +#: src/lang.c:477 msgid "Mailed" msgstr "Saadetud" -#: src/lang.c:486 +#: src/lang.c:478 #, c-format msgid "Mailing to %s..." msgstr "Saadan aadressil %s..." -#: src/lang.c:487 +#: src/lang.c:479 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" @@ -2001,283 +2002,283 @@ msgstr "# [Saada/Salvesta] fail \"active "# Neljas väli on baaskataloog (näiteks ~/Mail või ~/News)\n" "#\n" -#: src/lang.c:490 +#: src/lang.c:482 #, c-format msgid "%s marked as unread" msgstr "%s märgitud loetuks" -#: src/lang.c:491 +#: src/lang.c:483 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "Märkisin %d (%d) märgitud %s loetuks" -#: src/lang.c:492 +#: src/lang.c:484 #, c-format msgid "Mark all articles as read%s?" msgstr "Märgin kõik artiklid loetuks%s?" -#: src/lang.c:493 +#: src/lang.c:485 #, 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:494 +#: src/lang.c:486 #, c-format -msgid "Mark group %.*s as read?" -msgstr "Märgin grupi %.*s loetuks?" +msgid "Mark group %s as read?" +msgstr "Märgin grupi %s loetuks?" -#: src/lang.c:495 +#: src/lang.c:487 #, c-format msgid "Mark thread as read%s?" msgstr "Märgin teema loetuks%s?" -#: src/lang.c:496 +#: src/lang.c:488 #, 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:497 +#: src/lang.c:489 #, c-format msgid "Matching %s groups..." msgstr "Otsin %s gruppe..." -#: src/lang.c:498 src/lang.c:502 +#: src/lang.c:490 src/lang.c:494 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=n jooksvaks grupiks; %s=järgmine lugemata; %s=otsi; %s=surma/vali;" -#: src/lang.c:499 +#: src/lang.c:491 #, 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:500 +#: src/lang.c:492 #, 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:501 +#: src/lang.c:493 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=otsi edaspidi; %s=otsi tagaspidi; %s=välju" -#: src/lang.c:503 +#: src/lang.c:495 #, 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:504 +#: src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=n jooksvaks grupiks; %s=järgmine lugemata; %s,%s=otsi; %s=loetud" -#: src/lang.c:505 +#: src/lang.c:497 #, 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:506 +#: src/lang.c:498 #, 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:507 +#: src/lang.c:499 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=jooksev n; %s=järgmine lugemata; %s=loetud; %s=ekraani lülit" -#: src/lang.c:508 +#: src/lang.c:500 #, 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:509 +#: src/lang.c:501 msgid "--More--" msgstr "--Veel--" -#: src/lang.c:510 +#: src/lang.c:502 #, c-format msgid "Moving %s..." msgstr "Tõstan %s..." -#: src/lang.c:512 +#: src/lang.c:504 msgid ", name: " msgstr ", nimi: " -#: src/lang.c:513 +#: src/lang.c:505 #, c-format msgid "Goto newsgroup [%s]> " msgstr "Mine gruppi [%s]> " -#: src/lang.c:514 +#: src/lang.c:506 msgid "newsgroups" msgstr "gruppidesse" -#: src/lang.c:515 +#: src/lang.c:507 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Positsioon %s gruppide nimistus (1,2,..,$) [%d]> " -#: src/lang.c:516 +#: src/lang.c:508 msgid "newsgroup" msgstr "gruppi" -#: src/lang.c:517 +#: src/lang.c:509 msgid "Try and save newsrc file again?" msgstr "Proovin newsrc faili uuesti salvestada?" -#: src/lang.c:518 +#: src/lang.c:510 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:519 +#: src/lang.c:511 msgid "newsrc file saved successfully.\n" msgstr "newsrc fail on edukalt salvestatud.\n" -#: src/lang.c:520 +#: src/lang.c:512 msgid "-- Next response --" msgstr "- Järgmine vastus -" -#: src/lang.c:521 +#: src/lang.c:513 #, c-format msgid "NNTP authorization password not found for %s" msgstr "Serverile %s vastavat NNTP autoriseerimise parooli pole" -#: src/lang.c:522 +#: src/lang.c:514 msgid "No " msgstr "Ei " -#: src/lang.c:523 +#: src/lang.c:515 msgid "*** No articles ***" msgstr "*** Artikleid pole ***" -#: src/lang.c:524 +#: src/lang.c:516 msgid "No articles have been posted" msgstr "Postitatud artikleid pole" -#: src/lang.c:525 +#: src/lang.c:517 msgid "*** No description ***" msgstr "*** Kirjeldus puudub ***" -#: src/lang.c:526 +#: src/lang.c:518 msgid "No filename" msgstr "Failil pole nime" -#: src/lang.c:527 +#: src/lang.c:519 msgid "No group" msgstr "Gruppi pole" -#: src/lang.c:528 +#: src/lang.c:520 msgid "*** No groups ***" msgstr "*** Gruppe pole ***" -#: src/lang.c:529 +#: src/lang.c:521 msgid "No more groups to read" msgstr "Lugemiseks rohkem gruppe pole" -#: src/lang.c:530 +#: src/lang.c:522 msgid "No last message" msgstr "Viimast teadet pole" -#: src/lang.c:531 +#: src/lang.c:523 msgid "No mail address" msgstr "E-posti aadressi pole" -#: src/lang.c:532 +#: src/lang.c:524 msgid "No articles marked for saving" msgstr "Salvestamiseks märgitud artikleid pole" -#: src/lang.c:533 +#: src/lang.c:525 msgid "No match" msgstr "Ei leia" -#: src/lang.c:534 +#: src/lang.c:526 msgid "No more groups" msgstr "Rohkem gruppe pole" -#: src/lang.c:535 +#: src/lang.c:527 msgid "No newsgroups" msgstr "Gruppe pole" -#: src/lang.c:536 +#: src/lang.c:528 msgid "No next unread article" msgstr "Järgmist lugemata artiklit pole" -#: src/lang.c:537 +#: src/lang.c:529 msgid "No previous group" msgstr "Eelmist gruppi pole" -#: src/lang.c:538 +#: src/lang.c:530 msgid "No previous unread article" msgstr "Eelmist lugemata artiklit pole" -#: src/lang.c:539 +#: src/lang.c:531 msgid "No responses" msgstr "Vastuseid pole" -#: src/lang.c:540 +#: src/lang.c:532 msgid "No responses to list in current thread" msgstr "Jooksvas teemas pole vastuseid" -#: src/lang.c:541 +#: src/lang.c:533 msgid "No search string" msgstr "Otsingusõne puudub" -#: src/lang.c:542 +#: src/lang.c:534 msgid "No subject" msgstr "Teema puudub" -#: src/lang.c:543 +#: src/lang.c:535 #, 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:544 +#: src/lang.c:536 #, 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:545 +#: src/lang.c:537 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminalil peab olema ekraanipuhastamise (cl) omadus\n" -#: src/lang.c:546 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal peab toetama kursori liigutamist (cm)\n" -#: src/lang.c:547 +#: src/lang.c:539 #, 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:548 +#: src/lang.c:540 #, c-format msgid "No viewer found for %s/%s\n" msgstr "%s/%s jaoks puudub vaatur\n" -#: src/lang.c:549 +#: src/lang.c:541 msgid "Newsgroup does not exist on this server" msgstr "Gruppi pole sellel serveril" -#: src/lang.c:550 +#: src/lang.c:542 #, c-format msgid "Group %s not found in active file" msgstr "Gruppi %s pole aktiivsete gruppide failis" -#: src/lang.c:551 +#: src/lang.c:543 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:552 +#: src/lang.c:544 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:553 +#: src/lang.c:545 #, c-format msgid "# NNTP-server -> newsrc translation table and NNTP-server\n" "# shortname list for %s %s\n" @@ -2304,40 +2305,40 @@ msgstr "# NNTP-server -> newsrc teisendu "# news.ka.nu /tmp/nrc-nu kanu nu\n" "#\n" -#: src/lang.c:560 +#: src/lang.c:552 msgid "Only" msgstr "Ainult" -#: src/lang.c:561 +#: src/lang.c:553 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Võti pole lubatud. Kasutage kompileerimisel %s." -#: src/lang.c:562 +#: src/lang.c:554 msgid "Options Menu" msgstr "Omaduste menüü" -#: src/lang.c:565 +#: src/lang.c:557 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Viga regulaaravaldises: %s positsioonil %d '%s'" -#: src/lang.c:566 +#: src/lang.c:558 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Viga regulaaravaldises: pcre sisemine viga %d" -#: src/lang.c:567 +#: src/lang.c:559 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Viga regulaaravaldises: uurimiseks - pcre sisemine viga %s" -#: src/lang.c:568 +#: src/lang.c:560 msgid "Post a followup..." msgstr "Postita vastus..." #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:570 +#: src/lang.c:562 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" @@ -2345,269 +2346,269 @@ 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:573 +#: src/lang.c:565 msgid "Posted articles history" msgstr "Postitatud artiklite ajalugu" -#: src/lang.c:574 +#: src/lang.c:566 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Postita gruppidesse [%s]> " -#: src/lang.c:575 +#: src/lang.c:567 msgid "-- post processing started --" msgstr "-- lõpptöötlus alustas --" -#: src/lang.c:576 +#: src/lang.c:568 msgid "-- post processing completed --" msgstr "-- lõpptöötlus lõpetas --" -#: src/lang.c:577 +#: src/lang.c:569 #, c-format msgid "Post subject [%s]> " msgstr "Postituse teema [%s]> " -#: src/lang.c:578 +#: src/lang.c:570 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:579 +#: src/lang.c:571 msgid "Posting article..." msgstr "Postitan artiklit..." -#: src/lang.c:580 -msgid "Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): " -msgstr "Postitan ootel artiklid [%%.*s]? (%s/%s/%s/%s/%s): " +#: src/lang.c:572 +msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " +msgstr "Postitan ootel artiklid [%%s]? (%s/%s/%s/%s/%s): " -#: src/lang.c:581 +#: src/lang.c:573 #, c-format msgid "Hot %s" msgstr "Kuum %s" -#: src/lang.c:582 +#: src/lang.c:574 #, c-format msgid "Tagged %s" msgstr "Märgitud %s" -#: src/lang.c:583 +#: src/lang.c:575 #, c-format msgid "Untagged %s" msgstr "Märkimata %s" -#: src/lang.c:584 +#: src/lang.c:576 msgid "Processing mail messages marked for deletion." msgstr "Töötlen kirju, mis on kustutamiseks märgitud." -#: src/lang.c:585 +#: src/lang.c:577 msgid "Processing saved articles marked for deletion." msgstr "Töötlen salvestatud ja kustutamiseks märgitud artikleid." -#: src/lang.c:586 +#: src/lang.c:578 #, 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:587 +#: src/lang.c:579 msgid "Article unchanged, abort mailing?" msgstr "Artiklit ei ole muudetud, katkestan saatmise?" -#: src/lang.c:588 +#: src/lang.c:580 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Kas soovite näha postitamisootel artikleid (%d)?" -#: src/lang.c:590 +#: src/lang.c:582 msgid "Add quick kill filter?" msgstr "Lisan kiirsurmamise filtri?" -#: src/lang.c:591 +#: src/lang.c:583 msgid "Add quick selection filter?" msgstr "Lisan kiirvaliku filtri?" -#: src/lang.c:592 +#: src/lang.c:584 msgid "Do you really want to quit?" msgstr "Kas te tõesti soovite väljuda?" -#: src/lang.c:593 -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:585 +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:594 +#: src/lang.c:586 msgid "You have tagged articles in this group - quit anyway?" msgstr "Teil on siin grupis märgitud artikleid - väljun siiski?" -#: src/lang.c:595 +#: src/lang.c:587 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=ootele: " -#: src/lang.c:596 +#: src/lang.c:588 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=välju %s=toimeta %s=salvesta surmamise kirjeldus: " -#: src/lang.c:597 +#: src/lang.c:589 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=välju %s=toimeta %s=salvesta valiku kirjeldus: " -#: src/lang.c:598 +#: src/lang.c:590 msgid "Do you really want to quit without saving your configuration?" msgstr "Kas te tõesti soovite seadeid salvestamata väljuda?" -#: src/lang.c:601 +#: src/lang.c:593 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Vigane vahemik - lubatud on '0-9.$' näiteks 1-$" -#: src/lang.c:602 +#: src/lang.c:594 msgid "Do you want to abort this operation?" msgstr "Kas soovite seda operatsiooni katkestada?" -#: src/lang.c:603 +#: src/lang.c:595 msgid "Do you want to exit tin immediately?" msgstr "Kas soovite viivitamata tinist väljuda?" -#: src/lang.c:604 +#: src/lang.c:596 msgid "Read response> " msgstr "Loen vastust> " -#: src/lang.c:605 +#: src/lang.c:597 msgid "Reading ('q' to quit)..." msgstr "Loen ('q' katkestamiseks)..." -#: src/lang.c:606 +#: src/lang.c:598 #, c-format msgid "Reading %sarticles..." msgstr "Loen %sartikleid..." -#: src/lang.c:607 +#: src/lang.c:599 #, c-format msgid "Reading %sattributes file...\n" msgstr "Loen %satribuutide faili...\n" -#: src/lang.c:608 +#: src/lang.c:600 #, c-format msgid "Reading %sconfig file...\n" msgstr "Loen %sseadete faili...\n" -#: src/lang.c:609 +#: src/lang.c:601 msgid "Reading filter file...\n" msgstr "Loen filtrite faili...\n" -#: src/lang.c:610 +#: src/lang.c:602 #, c-format msgid "Reading %s groups..." msgstr "Loen %s gruppe..." -#: src/lang.c:611 +#: src/lang.c:603 msgid "Reading input history file...\n" msgstr "Loen sisendi ajalugu...\n" -#: src/lang.c:612 +#: src/lang.c:604 msgid "Reading keymap file...\n" msgstr "Loen klahvitabeli faili...\n" -#: src/lang.c:613 +#: src/lang.c:605 msgid "Reading groups from active file... " msgstr "Loen aktiivseid gruppe... " -#: src/lang.c:614 +#: src/lang.c:606 msgid "Reading groups from newsrc file... " msgstr "Loen gruppe newsrc failist... " -#: src/lang.c:615 +#: src/lang.c:607 msgid "Reading newsgroups file... " msgstr "Loen gruppide kirjeldusi... " -#: src/lang.c:616 +#: src/lang.c:608 msgid "Reading newsrc file..." msgstr "Loen newsrc faili..." -#: src/lang.c:617 +#: src/lang.c:609 #, c-format msgid "Bogus group %s removed." msgstr "Vigane grupp %s on eemaldatud." -#: src/lang.c:618 +#: src/lang.c:610 #, c-format msgid "Error: rename %s to %s" msgstr "Viga: %s uus nimi %s" -#: src/lang.c:619 +#: src/lang.c:611 msgid "Reply to author..." msgstr "Vastan autorile..." -#: src/lang.c:620 +#: src/lang.c:612 msgid "Repost" msgstr "Uuesti postitus" -#: src/lang.c:621 +#: src/lang.c:613 msgid "Reposting article..." msgstr "Postitan artikli uuesti..." -#: src/lang.c:622 +#: src/lang.c:614 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Postitan artikli(d) gruppi(desse) [%s]> " -#: src/lang.c:623 +#: src/lang.c:615 msgid "Reset newsrc?" msgstr "Algväärtustan newsrc?" -#: src/lang.c:624 +#: src/lang.c:616 msgid "Responses have been directed to the following newsgroups" msgstr "Vastused edastatakse järgnevatesse gruppidesse" -#: src/lang.c:625 +#: src/lang.c:617 #, 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:626 +#: src/lang.c:618 #, c-format msgid "RespNo %4d of %4d" msgstr "Vastus %4d : %4d" -#: src/lang.c:627 +#: src/lang.c:619 msgid "Press to continue..." msgstr "Jätkamiseks vajutage ..." -#: src/lang.c:629 +#: src/lang.c:621 #, c-format msgid "Select From [%s] (y/n): " msgstr "Valige From [%s] (j/e): " -#: src/lang.c:630 +#: src/lang.c:622 msgid "Select Lines: (num): " msgstr "Valige read: (num): " -#: src/lang.c:631 +#: src/lang.c:623 msgid "Auto-select Article Menu" msgstr "Automaatselt valitavate artiklite menüü" -#: src/lang.c:632 +#: src/lang.c:624 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "Valige Msg-Id [%s] (f/l/o/n): " -#: src/lang.c:633 +#: src/lang.c:625 msgid "Select pattern scope: " msgstr "Valige mustri ulatus: " -#: src/lang.c:634 +#: src/lang.c:626 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Valige teema [%s] (j/e): " -#: src/lang.c:635 +#: src/lang.c:627 msgid "Select text pattern : " msgstr "Valige tekstimuster : " -#: src/lang.c:636 +#: src/lang.c:628 msgid "Select time in days : " msgstr "Valige aeg päevades : " -#: src/lang.c:637 +#: src/lang.c:629 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2626,218 +2627,218 @@ msgstr "# %s serveri seadete fail\n" "############################################################################\n" "\n" -#: src/lang.c:643 +#: src/lang.c:635 msgid "Showing unread groups only" msgstr "Näitan ainult lugemata gruppe" -#: src/lang.c:644 +#: src/lang.c:636 msgid "Subject: line (ignore case) " msgstr "Subject: rida (tõstutundetu)" -#: src/lang.c:645 +#: src/lang.c:637 msgid "Subject: line (case sensitive)" msgstr "Subject: rida (tõstutundlik)" -#: src/lang.c:646 +#: src/lang.c:638 msgid "Save" msgstr "Salvesta" -#: src/lang.c:647 +#: src/lang.c:639 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Salvestan '%s' (%s/%s)?" -#: src/lang.c:648 +#: src/lang.c:640 msgid "Save configuration before continuing?" msgstr "Salvestan seaded enne jätkamist?" -#: src/lang.c:649 +#: src/lang.c:641 msgid "Save filename> " msgstr "Fail salvestamiseks> " -#: src/lang.c:650 +#: src/lang.c:642 msgid "Saved" msgstr "Salvestatud" -#: src/lang.c:651 +#: src/lang.c:643 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d lugemata (%4d kuuma) %s grupis %s\n" -#: src/lang.c:652 +#: src/lang.c:644 #, c-format msgid "Saved %s...\n" msgstr "Salvestatud %s...\n" -#: src/lang.c:653 +#: src/lang.c:645 msgid "Nothing was saved" msgstr "Midagi ei salvestatud" -#: src/lang.c:654 +#: src/lang.c:646 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s %d grupist%s\n" -#: src/lang.c:655 +#: src/lang.c:647 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s salvestati %s%s --" -#: src/lang.c:656 +#: src/lang.c:648 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s salvestati %s - %s --" -#: src/lang.c:657 +#: src/lang.c:649 msgid "Saving..." msgstr "Salvestan..." -#: src/lang.c:658 +#: src/lang.c:650 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Ekraani initsialiseerimine ebaõnnestus" -#: src/lang.c:659 +#: src/lang.c:651 #, c-format msgid "%s: screen is too small\n" msgstr "%s: ekraan on liiga väike\n" -#: src/lang.c:660 +#: src/lang.c:652 #, 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:661 +#: src/lang.c:653 #, c-format msgid "Search backwards [%s]> " msgstr "Otsin tagurpidi [%s]> " -#: src/lang.c:662 +#: src/lang.c:654 #, c-format msgid "Search body [%s]> " msgstr "Otsi kehast [%s]> " -#: src/lang.c:663 +#: src/lang.c:655 #, c-format msgid "Search forwards [%s]> " msgstr "Otsi edaspidi [%s]> " -#: src/lang.c:664 +#: src/lang.c:656 msgid "Searching..." msgstr "Otsin..." -#: src/lang.c:665 +#: src/lang.c:657 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Otsin artiklit %d/%d ('q' katkestamiseks)..." -#: src/lang.c:666 +#: src/lang.c:658 msgid "Select article> " msgstr "Valige artikkel> " -#: src/lang.c:667 +#: src/lang.c:659 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "Valige teksti eest omaduse number või kasutage nooli ja . 'q' väljumiseks." -#: src/lang.c:668 +#: src/lang.c:660 msgid "Select group> " msgstr "Valige grupp> " -#: src/lang.c:669 +#: src/lang.c:661 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Sisestage valiku muster [%s]> " -#: src/lang.c:670 +#: src/lang.c:662 msgid "Select thread > " msgstr "Valige teema > " -#: src/lang.c:671 +#: src/lang.c:663 #, 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:672 +#: src/lang.c:664 msgid "servers active-file" msgstr "serveri aktiivsete gruppide fail" -#: src/lang.c:673 +#: src/lang.c:665 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Uutesse gruppidesse ei saa siseneda. Tellige kõigepealt..." -#: src/lang.c:674 +#: src/lang.c:666 msgid "" msgstr "" -#: src/lang.c:675 +#: src/lang.c:667 #, c-format msgid "Starting: (%s)" msgstr "Stardin: (%s)" -#: src/lang.c:676 +#: src/lang.c:668 #, c-format msgid "List Thread (%d of %d)" msgstr "Teemad (%d/%d)" -#: src/lang.c:677 +#: src/lang.c:669 #, c-format msgid "Thread (%.*s)" msgstr "Teema (%.*s)" -#: src/lang.c:678 +#: src/lang.c:670 msgid "Enter wildcard subscribe pattern> " msgstr "Sisestage tellimise muster> " -#: src/lang.c:679 +#: src/lang.c:671 #, c-format msgid "subscribed to %d groups" msgstr "%d gruppi on tellitud" -#: src/lang.c:680 +#: src/lang.c:672 #, c-format msgid "Subscribed to %s" msgstr "%s on tellitud" -#: src/lang.c:681 +#: src/lang.c:673 msgid "Subscribing... " msgstr "Tellin... " -#: src/lang.c:682 -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:674 +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:683 +#: src/lang.c:675 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Asendan artikli(d) gruppides [%s]> " -#: src/lang.c:684 +#: src/lang.c:676 msgid "Superseding article ..." msgstr "Asendan artikli ..." -#: src/lang.c:685 +#: src/lang.c:677 #, 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:687 +#: src/lang.c:679 #, c-format msgid "%d days" msgstr "%d päeva" -#: src/lang.c:688 +#: src/lang.c:680 msgid "" msgstr "" -#: src/lang.c:689 +#: src/lang.c:681 msgid "# Default action/prompt strings\n" msgstr "# Vaikimisi aktsioonide/viipade sõned\n" -#: src/lang.c:690 +#: src/lang.c:682 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" @@ -2854,261 +2855,261 @@ 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:703 +#: src/lang.c:695 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:704 +#: src/lang.c:696 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:705 +#: src/lang.c:697 msgid "There is no news\n" msgstr "Uudiseid pole\n" -#: src/lang.c:706 +#: src/lang.c:698 msgid "Thread" msgstr "Teema" -#: src/lang.c:707 +#: src/lang.c:699 msgid "Thread Level Commands" msgstr "Teemataseme käsud" -#: src/lang.c:708 +#: src/lang.c:700 msgid "Thread deselected" msgstr "Teema pole valitud" -#: src/lang.c:709 +#: src/lang.c:701 msgid "Thread selected" msgstr "Teema on valitud" -#: src/lang.c:710 +#: src/lang.c:702 msgid "threads" msgstr "teemad" -#: src/lang.c:711 +#: src/lang.c:703 msgid "Thread range" msgstr "Teemade vahemik" -#: src/lang.c:712 +#: src/lang.c:704 msgid "thread" msgstr "teema" -#: src/lang.c:713 +#: src/lang.c:705 #, c-format msgid "Thread %4s of %4s" msgstr "Teema %4s : %4s" -#: src/lang.c:714 +#: src/lang.c:706 msgid "Threading articles..." msgstr "Järjestan artiklid teemade kaupa..." -#: src/lang.c:715 +#: src/lang.c:707 #, c-format msgid "Toggled word highlighting %s" msgstr "Sõnade esiletõstmine lülitatud %s" -#: src/lang.c:716 +#: src/lang.c:708 msgid "Toggled rot13 encoding" msgstr "Lülitatud rot13 kodeerimine" -#: src/lang.c:717 +#: src/lang.c:709 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Lülitatud saksa TeX kodeering %s" -#: src/lang.c:718 +#: src/lang.c:710 #, c-format msgid "Toggled tab-width to %d" msgstr "Lülitatud tab-width väärtus %d" -#: src/lang.c:719 +#: src/lang.c:711 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Üritan punkt-lukustada %s" -#: src/lang.c:720 +#: src/lang.c:712 #, c-format msgid "%d Trying to lock %s" msgstr "%d Üritan lukustada %s" -#: src/lang.c:721 +#: src/lang.c:713 msgid " h=help\n" msgstr " h=appi\n" -#: src/lang.c:723 +#: src/lang.c:715 msgid "Unlimited" msgstr "Piiramata" -#: src/lang.c:724 +#: src/lang.c:716 msgid "Enter wildcard unsubscribe pattern> " msgstr "Sisestage loobumise muster> " -#: src/lang.c:725 +#: src/lang.c:717 #, c-format msgid "Error decoding %s : %s" msgstr "Viga %s dekodeerimisel: %s" -#: src/lang.c:726 +#: src/lang.c:718 msgid "No end." msgstr "Lõpp puudub." -#: src/lang.c:727 +#: src/lang.c:719 #, c-format msgid "%s successfully decoded." msgstr "%s on edukalt dekodeeritud." -#: src/lang.c:728 +#: src/lang.c:720 #, 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:729 +#: src/lang.c:721 msgid "unread " msgstr "lugemata " -#: src/lang.c:730 +#: src/lang.c:722 #, c-format msgid "unsubscribed from %d groups" msgstr "loobunud %d grupist" -#: src/lang.c:731 +#: src/lang.c:723 #, c-format msgid "Unsubscribed from %s" msgstr "Loobunud grupist %s" -#: src/lang.c:732 +#: src/lang.c:724 msgid "Unsubscribing... " msgstr "Loobun gruppidest... " -#: src/lang.c:733 +#: src/lang.c:725 msgid "Unthreading articles..." msgstr "Tükeldan teemad..." -#: src/lang.c:734 +#: src/lang.c:726 msgid "Updated" msgstr "Uuendatud" -#: src/lang.c:735 +#: src/lang.c:727 msgid "Updating" msgstr "Uuendan" -#: src/lang.c:736 +#: src/lang.c:728 #, c-format msgid "Opening %s\n" msgstr "Proovin %s\n" -#: src/lang.c:737 +#: src/lang.c:729 msgid "No more URL's in this article" msgstr "Selles artiklis pole rohkem URL'e" -#: src/lang.c:738 +#: src/lang.c:730 msgid "Use MIME display program for this message?" msgstr "Kasutan selle teate lugemiseks MIME näitamise programmi?" -#: src/lang.c:739 +#: src/lang.c:731 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:740 +#: src/lang.c:732 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:741 +#: src/lang.c:733 msgid " -q don't check for new newsgroups" msgstr " -q ära otsi uusi gruppe" -#: src/lang.c:742 +#: src/lang.c:734 msgid " -X don't save any files on quit" msgstr " -X töö lõpetamisel ära salvesta ühtegi faili" -#: src/lang.c:743 +#: src/lang.c:735 msgid " -d don't show newsgroup descriptions" msgstr " -d ära näita gruppide kirjeldusi" -#: src/lang.c:744 +#: src/lang.c:736 msgid " -G limit get only limit articles/group" msgstr " -G num loe aunult num artiklit/gruppi" -#: src/lang.c:745 +#: src/lang.c:737 #, c-format msgid " -H help information about %s" msgstr " -H %s kasutamise abiinfo" -#: src/lang.c:746 +#: src/lang.c:738 msgid " -h this help message" msgstr " -h see abitekst" -#: src/lang.c:747 +#: src/lang.c:739 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr " -I kat uudiste indeksfaili kataloog [vaikimisi=%s]" -#: src/lang.c:748 +#: src/lang.c:740 msgid " -u update index files (batch mode)" msgstr " -u värskenda indeksfaile (pakettmood)" -#: src/lang.c:749 +#: src/lang.c:741 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr " -m kat kirjakaustade kataloog [vaikimisi=%s]" -#: src/lang.c:750 +#: src/lang.c:742 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Saatke palun vea raport/kommentaarid aadressil %s" -#: src/lang.c:751 +#: src/lang.c:743 msgid " -N mail new news to your posts (batch mode)" msgstr " -N saada uued vastused teie postitustele (pakettmood)" -#: src/lang.c:752 +#: src/lang.c:744 msgid " -M user mail new news to specified user (batch mode)" msgstr " -M kasut saada uued artiklid näidatud kasutajale (pakettmood)" -#: src/lang.c:753 +#: src/lang.c:745 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f fail tellitud gruppide fail [vaikimisi=%s]" -#: src/lang.c:754 +#: src/lang.c:746 msgid " -x no posting mode" msgstr " -x postitamiseta mood" -#: src/lang.c:755 +#: src/lang.c:747 msgid " -w post an article and exit" msgstr " -w postita artikkel ja lõpeta töö" -#: src/lang.c:756 +#: src/lang.c:748 msgid " -o post all postponed articles and exit" msgstr " -o postita kõik postitamisootel artiklid ja lõpeta töö" -#: src/lang.c:757 +#: src/lang.c:749 msgid " -r read news remotely from default NNTP server" msgstr " -r loe artikleid kasutades vaikimisi NNTP serverit" -#: src/lang.c:758 +#: src/lang.c:750 msgid " -R read news saved by -S option" msgstr " -R loe artikleid, mis on salvestatud -S võtmega" -#: src/lang.c:759 +#: src/lang.c:751 #, c-format msgid " -s dir save news directory [default=%s]" msgstr " -s kat artiklite salvestamise kataloog [vaikimisi=%s]" -#: src/lang.c:760 +#: src/lang.c:752 msgid " -S save new news for later reading (batch mode)" msgstr " -S salvesta uued artiklid hilisemaks lugemiseks (pakettmood)" -#: src/lang.c:761 +#: src/lang.c:753 msgid " -z start if any unread news" msgstr " -z alusta tööd, kui on lugemata uudiseid" -#: src/lang.c:762 +#: src/lang.c:754 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3117,37 +3118,37 @@ msgstr "Usenet klient.\n" "\n" "Kasuta: %s [võtmed] [grupp[,...]]" -#: src/lang.c:763 +#: src/lang.c:755 msgid " -v verbose output for batch mode options" msgstr " -v esita pakettmoodi käskudega detailsemat informatsiooni" -#: src/lang.c:764 +#: src/lang.c:756 msgid " -V print version & date information" msgstr " -V esita versiooni ja kuupäeva informatsioon" -#: src/lang.c:765 +#: src/lang.c:757 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "%s on kasutatav ainult pakettmoodi käskudeta\n" -#: src/lang.c:766 +#: src/lang.c:758 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "%s on kasutatav ainult pakettmoodi käskudega\n" -#: src/lang.c:768 +#: src/lang.c:760 #, 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:769 +#: src/lang.c:761 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Vaatan '%s' (%s/%s)?" -#: src/lang.c:771 +#: src/lang.c:763 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3156,26 +3157,26 @@ msgstr "\n" "Hoiatus: postitus ületab %d veergu. Esimene pikk rida on rida %d:\n" "%-100s\n" -#: src/lang.c:772 +#: src/lang.c:764 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Hoiatus: artiklit ei ole toimetamise käigus muudetud\n" -#: src/lang.c:773 +#: src/lang.c:765 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Hoiatus: \"Subject:\" real on ainult tühikud.\n" -#: src/lang.c:774 +#: src/lang.c:766 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:776 +#: src/lang.c:768 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3183,7 +3184,7 @@ msgstr "\n" "Hoiatus: Artiklis on \"References:\" päis, aga \"Subject:\" ei alga fraasiga\n" " \"Re: \" ega sisalda \"(was:\".\n" -#: src/lang.c:779 +#: src/lang.c:771 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3203,7 +3204,7 @@ msgstr "Lugege hoolikalt!\n" "Siin on artikkel, mida te hakkate kustutama:\n" "\n" -#: src/lang.c:783 +#: src/lang.c:775 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" @@ -3215,7 +3216,7 @@ msgstr "\n" " lisab artiklile signatuuri, siis on võimalik, et seda ei kodeerita\n" " korrektselt.\n" -#: src/lang.c:788 +#: src/lang.c:780 #, c-format msgid "\n" "\n" @@ -3228,7 +3229,7 @@ msgstr "\n" "Väärtused failis %s on muutunud!\n" "Palun lugege faile WHATSNEW, jne...\n" -#: src/lang.c:790 +#: src/lang.c:782 #, c-format msgid "\n" "\n" @@ -3240,7 +3241,7 @@ msgstr "\n" "kasutatu!\n" "Mõningaid väärtusi failis %s võidakse ignoreerida, mõningaid võidakse muuta!\n" -#: src/lang.c:793 +#: src/lang.c:785 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3253,7 +3254,7 @@ msgstr "Hoiatus: tin kirjutas vähem grup "grupist%s, tähendab see viga ja te peaksite varundama oma %s\n" "enne, kui te tini uuesti käivitate!\n" -#: src/lang.c:797 +#: src/lang.c:789 #, c-format msgid "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" @@ -3261,12 +3262,12 @@ msgstr "\n" "Hoiatus: Leidsin %d '-- \\n' rida, mis võib tekitada osades inimestes " "segadust.\n" -#: src/lang.c:798 +#: src/lang.c:790 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Hoiatus: Salvestati ainult %d artiklit %d artiklist" -#: src/lang.c:799 +#: src/lang.c:791 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3281,48 +3282,48 @@ msgstr "\n" "võimalikult\n" " lühikesed.\n" -#: src/lang.c:803 +#: src/lang.c:795 #, 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?" -#: src/lang.c:804 +#: src/lang.c:796 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:805 +#: src/lang.c:797 msgid "Writing attributes file..." msgstr "Kirjutan atribuutide faili..." -#: src/lang.c:807 +#: src/lang.c:799 #, c-format msgid "%d Responses" msgstr "%d Vastust" -#: src/lang.c:809 +#: src/lang.c:801 #, c-format msgid "Added %d %s" msgstr "Lisatud %d %s" -#: src/lang.c:810 +#: src/lang.c:802 msgid "No unsubscribed groups to show" msgstr "Tellimata gruppe pole" -#: src/lang.c:811 +#: src/lang.c:803 msgid "Showing subscribed to groups only" msgstr "Näitan ainult tellitud gruppe" -#: src/lang.c:812 +#: src/lang.c:804 msgid "Yes " msgstr "Jah " -#: src/lang.c:813 +#: src/lang.c:805 msgid " You have mail\n" msgstr " Teil on kiri\n" -#: src/lang.c:818 +#: src/lang.c:810 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3341,16 +3342,16 @@ msgstr "\n" " MM_NETWORK_CHARSET. Viimast saate teostada kasutades valikut " "M)enüü.\n" -#: src/lang.c:829 +#: src/lang.c:821 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Klahvi %s uus definitsioon '%s' -> '%s'\n" -#: src/lang.c:830 +#: src/lang.c:822 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D silumismood 1=NNTP 2=KÕIK" -#: src/lang.c:834 +#: src/lang.c:826 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3374,11 +3375,11 @@ msgstr "Lugege hoolikalt!\n" "Siin on artikkel, mida te asute kustutama:\n" "\n" -#: src/lang.c:843 +#: src/lang.c:835 msgid "toggle color" msgstr "lülita värve" -#: src/lang.c:844 +#: src/lang.c:836 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" @@ -3398,44 +3399,44 @@ msgstr "# Värvide seadmiseks kasutage jä "# taust must)\n" "\n" -#: src/lang.c:852 +#: src/lang.c:844 msgid " -a toggle color flag" msgstr " -a lülita värvide kasutamist" -#: src/lang.c:856 +#: src/lang.c:848 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:857 +#: src/lang.c:849 #, 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:858 +#: src/lang.c:850 #, c-format msgid "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "\n" "Viga: \"%s\" ei ole lubatud grupp!\n" -#: src/lang.c:860 +#: src/lang.c:852 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:861 +#: src/lang.c:853 #, c-format 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:862 +#: src/lang.c:854 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" @@ -3443,308 +3444,308 @@ msgstr "\n" "Hoiatus: \"%s\" puudub teie newsrc failist, see võib olla selles serveris " "vigane!\n" -#: src/lang.c:863 +#: src/lang.c:855 #, c-format 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:867 +#: src/lang.c:859 #, c-format 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:868 +#: src/lang.c:860 msgid "Missing parts." msgstr "Osad puuduvad." -#: src/lang.c:869 +#: src/lang.c:861 msgid "No beginning." msgstr "Algus puudub." -#: src/lang.c:870 +#: src/lang.c:862 msgid "No data." msgstr "Andmeid pole." -#: src/lang.c:871 +#: src/lang.c:863 msgid "Unknown error." msgstr "Tundmatu viga." -#: src/lang.c:873 +#: src/lang.c:865 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\t%s kontrollsumma (%ld %s)" -#: src/lang.c:877 +#: src/lang.c:869 msgid "Reading mail active file... " msgstr "Loen aktiivsete kirjade kausta... " -#: src/lang.c:878 +#: src/lang.c:870 msgid "Reading mailgroups file... " msgstr "Loen kirjagruppide faili... " -#: src/lang.c:882 +#: src/lang.c:874 msgid "perform PGP operations on article" msgstr "kasuta artiklil PGP operatsioone" -#: src/lang.c:883 +#: src/lang.c:875 msgid "Add key(s) to public keyring?" msgstr "Lisan võtmed avalike võtmete hoidlasse?" -#: src/lang.c:884 +#: src/lang.c:876 #, 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:885 +#: src/lang.c:877 #, 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:886 +#: src/lang.c:878 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP pole seadistatud (ei saa avada %s)" -#: src/lang.c:887 +#: src/lang.c:879 msgid "Article not signed and no public keys found" msgstr "Artikkel pole allkirjastatud ja avalikke võtmeid pole" -#: src/lang.c:889 +#: src/lang.c:881 #, 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=ootele: " -#: src/lang.c:890 -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:882 +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:891 -msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:883 +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=ootele " - "[%%.*s]: " + "[%%s]: " -#: src/lang.c:893 +#: src/lang.c:885 #, 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=ootele: " -#: src/lang.c:894 -msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: " -msgstr "%s=välju, %s=toimeta, %s=pgp, %s=saada [%%.*s]: " +#: src/lang.c:886 +msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " +msgstr "%s=välju, %s=toimeta, %s=pgp, %s=saada [%%s]: " -#: src/lang.c:895 -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=ootele [%%.*s]: " +#: src/lang.c:887 +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=ootele [%%s]: " -#: src/lang.c:899 +#: src/lang.c:891 #, 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=ootele: " -#: src/lang.c:900 -msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: " -msgstr "%s=välju, %s=toimeta, %s=ispell, %s=saada [%%.*s]: " - -#: src/lang.c:901 -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=ootele [%%.*s]: " +#: src/lang.c:892 +msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " +msgstr "%s=välju, %s=toimeta, %s=ispell, %s=saada [%%s]: " + +#: src/lang.c:893 +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=ootele [%%s]: " -#: src/lang.c:903 +#: src/lang.c:895 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=ootele: " -#: src/lang.c:904 -msgid "%s=quit, %s=edit, %s=send [%%.*s]: " -msgstr "%s=välju, %s=toimeta, %s=saada [%%.*s]: " - -#: src/lang.c:905 -msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: " -msgstr "%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=ootele [%%.*s]: " +#: src/lang.c:896 +msgid "%s=quit, %s=edit, %s=send [%%s]: " +msgstr "%s=välju, %s=toimeta, %s=saada [%%s]: " + +#: src/lang.c:897 +msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " +msgstr "%s=välju, %s=toimeta, %s=menüü, %s=postita, %s=ootele [%%s]: " -#: src/lang.c:914 +#: src/lang.c:906 msgid "Try cache_overview_files to speed up things.\n" msgstr "Proovige asjade kiirendamiseks cache_overview_files.\n" -#: src/lang.c:915 +#: src/lang.c:907 msgid "Tin will use local index files instead.\n" msgstr "Tin kasutab hoopis kohalikke indeksfaile.\n" -#: src/lang.c:916 +#: src/lang.c:908 msgid "Cannot find NNTP server name" msgstr "Ei leia NNTP serveri nime" -#: src/lang.c:917 +#: src/lang.c:909 #, c-format msgid "Connecting to %s:%d..." msgstr "Loon ühendust serveriga %s:%d..." -#: src/lang.c:918 +#: src/lang.c:910 msgid "Disconnecting from server...\n" msgstr "Lõpetan ühenduse...\n" -#: src/lang.c:919 +#: src/lang.c:911 #, 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:920 +#: src/lang.c:912 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "NNTP serveriga %s ühenduse loomine ebaõnnestus. Lõpetan..." -#: src/lang.c:921 +#: src/lang.c:913 msgid "205 Closing connection" msgstr "205 Sulen ühendust" -#: src/lang.c:922 +#: src/lang.c:914 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:923 +#: src/lang.c:915 msgid "Connection to news server has timed out. Reconnect?" msgstr "Ühendus uudisegruppide serveriga aegus. ühendun uuesti?" -#: src/lang.c:924 +#: src/lang.c:916 #, 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:925 +#: src/lang.c:917 msgid " -A force authentication on connect" msgstr " -A sunni ühenduse loomisel autentima" -#: src/lang.c:926 +#: src/lang.c:918 #, 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:927 +#: src/lang.c:919 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr " -p port kasuta NNTP porti [vaikimisi=%d]" -#: src/lang.c:928 +#: src/lang.c:920 msgid " -Q quick start. Same as -nqd" msgstr " -Q kiirstart. Sama kui -nqd" -#: src/lang.c:929 +#: src/lang.c:921 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l kasuta LIST käsku GROUP (-n) käsu asemel" -#: src/lang.c:930 +#: src/lang.c:922 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr " -n loe NNTP serverist ainult tellitud .newsrc grupid" -#: src/lang.c:932 +#: src/lang.c:924 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp: Tundmatu teenus.\n" -#: src/lang.c:935 +#: src/lang.c:927 msgid "\n" "socket or connect problem\n" msgstr "\n" "Probleem pistikuga või ühendusega\n" -#: src/lang.c:937 +#: src/lang.c:929 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Loon ühendust serveriga %s: " -#: src/lang.c:938 +#: src/lang.c:930 msgid "Giving up...\n" msgstr "Annan alla...\n" -#: src/lang.c:941 +#: src/lang.c:933 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:944 +#: src/lang.c:936 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:947 +#: src/lang.c:939 #, 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:950 +#: src/lang.c:942 msgid " -Q quick start. Same as -qd" msgstr " -Q kiirstart. Sama kui -qd" -#: src/lang.c:951 +#: src/lang.c:943 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:952 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from spool" msgstr " -n loe poolist ainult tellitud .newsrc gruppe" -#: src/lang.c:953 +#: src/lang.c:945 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "Teie server ei paku Xref: päiserida NOV failides.\n" -#: src/lang.c:957 +#: src/lang.c:949 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:958 +#: src/lang.c:950 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:966 +#: src/lang.c:958 #, c-format msgid "%d %s printed" msgstr "%d %s trükitud" -#: src/lang.c:967 +#: src/lang.c:959 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "saada artikkel/teema/kuum/muster/märgitud trükkalile" -#: src/lang.c:968 +#: src/lang.c:960 msgid "Print" msgstr "Trüki" -#: src/lang.c:969 +#: src/lang.c:961 msgid "Printing..." msgstr "Trükin..." -#: src/lang.c:973 +#: src/lang.c:965 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "saada artikkel/teema/kuum/muster/märgitud toruga käsule" -#: src/lang.c:974 +#: src/lang.c:966 msgid "No command" msgstr "Käsku pole" -#: src/lang.c:975 +#: src/lang.c:967 msgid "Pipe" msgstr "Toru" -#: src/lang.c:976 +#: src/lang.c:968 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Toru käsku [%.*s]> " -#: src/lang.c:977 +#: src/lang.c:969 msgid "Piping..." msgstr "Saadan torusse..." -#: src/lang.c:979 +#: src/lang.c:971 msgid "Piping not enabled." msgstr "Toru kasutamine pole lubatud." -#: src/lang.c:983 +#: src/lang.c:975 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3756,7 +3757,7 @@ msgstr "\n" " tühik on see, mis eraldab koolonit (:) teistest komponentidest\n" " real. Gruppide eraldamiseks kasutage palun koma (,).\n" -#: src/lang.c:988 +#: src/lang.c:980 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3767,7 +3768,7 @@ msgstr "\n" " tühikuid, siis ei ole see lubatud. Palun kirjutage kõik grupid\n" " ühele reale.\n" -#: src/lang.c:993 +#: src/lang.c:985 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3778,14 +3779,14 @@ msgstr "\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:997 +#: src/lang.c:989 #, 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:1002 +#: src/lang.c:994 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3815,555 +3816,555 @@ 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:1015 +#: src/lang.c:1007 msgid "shell escape" msgstr "paojada käsureale" -#: src/lang.c:1016 +#: src/lang.c:1008 #, c-format msgid "Shell Command (%s)" msgstr "Käsurea käsk (%s)" -#: src/lang.c:1017 +#: src/lang.c:1009 #, c-format msgid "Enter shell command [%s]> " msgstr "Sisestage käsurea käsk [%s]> " -#: src/lang.c:1021 +#: src/lang.c:1013 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "%s: Ei saa TERM kirjet\n" -#: src/lang.c:1025 +#: src/lang.c:1017 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Grupp %.*s ('q' lõpetamiseks)... " -#: src/lang.c:1027 +#: src/lang.c:1019 #, c-format msgid "Group %.*s..." msgstr "Grupp %.*s... " -#: src/lang.c:1031 +#: src/lang.c:1023 msgid "Server unavailable\n" msgstr "Server ei vasta\n" -#: src/lang.c:1037 +#: src/lang.c:1029 #, 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:1038 +#: src/lang.c:1030 #, 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:1040 +#: src/lang.c:1032 #, 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:1041 +#: src/lang.c:1033 #, 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:1045 +#: src/lang.c:1037 #, 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:1046 +#: src/lang.c:1038 #, 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:1048 +#: src/lang.c:1040 #, 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:1049 +#: src/lang.c:1041 #, 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:1055 +#: src/lang.c:1047 msgid "Terminal does not support color" msgstr "Terminal ei toeta värve" -#: src/lang.c:1060 +#: src/lang.c:1052 #, c-format msgid "Trying %s" msgstr "Proovin %s" -#: src/lang.c:1074 src/lang.c:1099 src/lang.c:1115 src/lang.c:1294 src/refs.c:266 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:297 msgid "None" msgstr "Pole" -#: src/lang.c:1075 +#: src/lang.c:1067 msgid "Subject" msgstr "Teema" -#: src/lang.c:1076 +#: src/lang.c:1068 msgid "References" msgstr "Viited" -#: src/lang.c:1077 +#: src/lang.c:1069 msgid "Both Subject and References" msgstr "Nii teema kui viited" -#: src/lang.c:1078 +#: src/lang.c:1070 msgid "Multipart Subject" msgstr "Mitmeosaliste teema" -#: src/lang.c:1090 src/lang.c:1201 +#: src/lang.c:1082 src/lang.c:1193 msgid "No" msgstr "Ei" -#: src/lang.c:1091 src/lang.c:1203 +#: src/lang.c:1083 src/lang.c:1195 msgid "Yes" msgstr "Jah" -#: src/lang.c:1092 +#: src/lang.c:1084 msgid "Hide All" msgstr "Peida kõik" -#: src/lang.c:1100 +#: src/lang.c:1092 msgid "Address" msgstr "Aadress" -#: src/lang.c:1101 +#: src/lang.c:1093 msgid "Full Name" msgstr "Täisnimi" -#: src/lang.c:1102 +#: src/lang.c:1094 msgid "Address and Name" msgstr "Aadress ja nimi" -#: src/lang.c:1109 +#: src/lang.c:1101 msgid "Max" msgstr "Maksimum" -#: src/lang.c:1110 +#: src/lang.c:1102 msgid "Sum" msgstr "Summa" -#: src/lang.c:1111 +#: src/lang.c:1103 msgid "Average" msgstr "Keskmine" -#: src/lang.c:1116 +#: src/lang.c:1108 msgid "Lines" msgstr "Read" -#: src/lang.c:1117 +#: src/lang.c:1109 msgid "Score" msgstr "Kaal" -#: src/lang.c:1118 +#: src/lang.c:1110 msgid "Lines & Score" msgstr "Read & kaal" -#: src/lang.c:1127 +#: src/lang.c:1119 msgid "Black" msgstr "Must" -#: src/lang.c:1128 +#: src/lang.c:1120 msgid "Red" msgstr "Punane" -#: src/lang.c:1129 +#: src/lang.c:1121 msgid "Green" msgstr "Roheline" -#: src/lang.c:1130 +#: src/lang.c:1122 msgid "Brown" msgstr "Pruun" -#: src/lang.c:1131 +#: src/lang.c:1123 msgid "Blue" msgstr "Sinine" -#: src/lang.c:1132 +#: src/lang.c:1124 msgid "Pink" msgstr "Roosa" -#: src/lang.c:1133 +#: src/lang.c:1125 msgid "Cyan" msgstr "Lilla" -#: src/lang.c:1134 +#: src/lang.c:1126 msgid "White" msgstr "valge" -#: src/lang.c:1135 +#: src/lang.c:1127 msgid "Gray" msgstr "Hall" -#: src/lang.c:1136 +#: src/lang.c:1128 msgid "Light Red" msgstr "Helepunane" -#: src/lang.c:1137 +#: src/lang.c:1129 msgid "Light Green" msgstr "Heleroheline" -#: src/lang.c:1138 +#: src/lang.c:1130 msgid "Yellow" msgstr "Kollane" -#: src/lang.c:1139 +#: src/lang.c:1131 msgid "Light Blue" msgstr "Helesinine" -#: src/lang.c:1140 +#: src/lang.c:1132 msgid "Light Pink" msgstr "Heleroosa" -#: src/lang.c:1141 +#: src/lang.c:1133 msgid "Light Cyan" msgstr "Helelilla" -#: src/lang.c:1142 +#: src/lang.c:1134 msgid "Light White" msgstr "Helevalge" -#: src/lang.c:1150 src/lang.c:1207 src/lang.c:1221 +#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 msgid "Nothing" msgstr "Ei kasuta" -#: src/lang.c:1151 +#: src/lang.c:1143 msgid "Mark" msgstr "Märk" -#: src/lang.c:1152 +#: src/lang.c:1144 msgid "Space" msgstr "Tühik" -#: src/lang.c:1159 +#: src/lang.c:1151 msgid "Normal" msgstr "Tavaline" -#: src/lang.c:1160 +#: src/lang.c:1152 msgid "Best highlighting" msgstr "Parim esiletõstmine" -#: src/lang.c:1161 +#: src/lang.c:1153 msgid "Underline" msgstr "Allajoonitud" -#: src/lang.c:1162 +#: src/lang.c:1154 msgid "Reverse video" msgstr "Pööratud video" -#: src/lang.c:1163 +#: src/lang.c:1155 msgid "Blinking" msgstr "Plinkiv" -#: src/lang.c:1164 +#: src/lang.c:1156 msgid "Half bright" msgstr "Poolhele" -#: src/lang.c:1165 +#: src/lang.c:1157 msgid "Bold" msgstr "Paks" -#: src/lang.c:1170 +#: src/lang.c:1162 msgid "none" msgstr "pole" -#: src/lang.c:1171 +#: src/lang.c:1163 msgid "commands" msgstr "käsud" -#: src/lang.c:1172 +#: src/lang.c:1164 msgid "select" msgstr "valik" -#: src/lang.c:1174 +#: src/lang.c:1166 msgid "commands & quit" msgstr "käsud & välju" -#: src/lang.c:1175 +#: src/lang.c:1167 msgid "commands & select" msgstr "käsud & valik" -#: src/lang.c:1176 +#: src/lang.c:1168 msgid "quit & select" msgstr "välju & valik" -#: src/lang.c:1177 +#: src/lang.c:1169 msgid "commands & quit & select" msgstr "käsud & välju & valik" -#: src/lang.c:1202 +#: src/lang.c:1194 msgid "Shell archive" msgstr "Shelli arhiiv" -#: src/lang.c:1208 +#: src/lang.c:1200 msgid "Subject: (descending)" msgstr "Subject: (kahanevalt)" -#: src/lang.c:1209 +#: src/lang.c:1201 msgid "Subject: (ascending)" msgstr "Subject: (kasvavalt)" -#: src/lang.c:1210 +#: src/lang.c:1202 msgid "From: (descending)" msgstr "From: (kahanevalt)" -#: src/lang.c:1211 +#: src/lang.c:1203 msgid "From: (ascending)" msgstr "From: (kasvavalt)" -#: src/lang.c:1212 +#: src/lang.c:1204 msgid "Date: (descending)" msgstr "Date: (kahanevalt)" -#: src/lang.c:1213 +#: src/lang.c:1205 msgid "Date: (ascending)" msgstr "Date: (kasvavalt)" -#: src/lang.c:1214 src/lang.c:1222 +#: src/lang.c:1206 src/lang.c:1214 msgid "Score (descending)" msgstr "Kaal (kahanevalt)" -#: src/lang.c:1215 src/lang.c:1223 +#: src/lang.c:1207 src/lang.c:1215 msgid "Score (ascending)" msgstr "Kaal (kasvavalt)" -#: src/lang.c:1216 +#: src/lang.c:1208 msgid "Lines: (descending)" msgstr "Lines: (kahanevalt)" -#: src/lang.c:1217 +#: src/lang.c:1209 msgid "Lines: (ascending)" msgstr "Lines: (kasvavalt)" -#: src/lang.c:1228 +#: src/lang.c:1220 msgid "Always Keep" msgstr "Hoia alati" -#: src/lang.c:1229 +#: src/lang.c:1221 msgid "Always Remove" msgstr "Eemalda alati" -#: src/lang.c:1230 +#: src/lang.c:1222 msgid "Mark with D on selection screen" msgstr "Märgi valikuekraanil tähega D" -#: src/lang.c:1235 +#: src/lang.c:1227 msgid "Kill only unread arts" msgstr "Surma ainult lugemata artiklid" -#: src/lang.c:1236 +#: src/lang.c:1228 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:1237 +#: src/lang.c:1229 msgid "Kill all arts and never show" msgstr "Surma kõik artiklid ja ära näita" -#: src/lang.c:1242 +#: src/lang.c:1234 msgid "Nothing special" msgstr "Ei midagi erilist" -#: src/lang.c:1243 +#: src/lang.c:1235 msgid "Compress quotes" msgstr "Tihenda tsitaadid" -#: src/lang.c:1244 +#: src/lang.c:1236 msgid "Quote signatures" msgstr "Tsiteeri allkirju" -#: src/lang.c:1245 +#: src/lang.c:1237 msgid "Compress quotes, quote sigs" msgstr "Tihenda tsitaadid, tsiteeri allkirju" -#: src/lang.c:1246 +#: src/lang.c:1238 msgid "Quote empty lines" msgstr "Tsiteeri tühje ridu" -#: src/lang.c:1247 +#: src/lang.c:1239 msgid "Compress quotes, quote empty lines" msgstr "Tihenda tsitaadid, tsiteeri tühje ridu" -#: src/lang.c:1248 +#: src/lang.c:1240 msgid "Quote sigs & empty lines" msgstr "Tsiteeri allkirju ja tühje ridu" -#: src/lang.c:1249 +#: src/lang.c:1241 msgid "Comp. q., quote sigs & empty lines" msgstr "Tihenda tsitaate, tsiteeri allkirju ja tühje ridu" -#: src/lang.c:1287 +#: src/lang.c:1279 msgid "no" msgstr "ei" -#: src/lang.c:1288 +#: src/lang.c:1280 msgid "with headers" msgstr "päistega" -#: src/lang.c:1289 +#: src/lang.c:1281 msgid "without headers" msgstr "päisteta" # TRANSLATION MISSING -#: src/lang.c:1296 src/lang.c:1302 +#: src/lang.c:1288 src/lang.c:1294 msgid "NFKC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1297 +#: src/lang.c:1289 msgid "NFKD" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1298 +#: src/lang.c:1290 msgid "NFC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1299 +#: src/lang.c:1291 msgid "NFD" msgstr "" -#: src/lang.c:1310 +#: src/lang.c:1302 msgid "Display Options" msgstr "Ekraani seaded" -#: src/lang.c:1316 +#: src/lang.c:1308 msgid "Color Options" msgstr "Värvide seaded" -#: src/lang.c:1322 +#: src/lang.c:1314 msgid "Article-Limiting Options" msgstr "Artikli piirangute seaded" -#: src/lang.c:1328 +#: src/lang.c:1320 msgid "Posting/Mailing Options" msgstr "Postitamise/saatmise seaded" -#: src/lang.c:1334 +#: src/lang.c:1326 msgid "Saving/Printing Options" msgstr "Salvestamise/trükkimise seaded" -#: src/lang.c:1340 +#: src/lang.c:1332 msgid "Expert Options" msgstr "Ekspertseaded" -#: src/lang.c:1346 +#: src/lang.c:1338 msgid "Filtering Options" msgstr "Filtreerimise seaded" -#: src/lang.c:1351 src/lang.c:1377 src/lang.c:1383 src/lang.c:1390 src/lang.c:1422 -#: src/lang.c:1428 src/lang.c:1436 src/lang.c:1456 src/lang.c:1531 src/lang.c:1693 -#: src/lang.c:1699 src/lang.c:1705 src/lang.c:1711 src/lang.c:1723 src/lang.c:1730 -#: src/lang.c:1781 src/lang.c:1790 src/lang.c:1796 src/lang.c:1802 src/lang.c:1808 -#: src/lang.c:1814 src/lang.c:1820 src/lang.c:1826 src/lang.c:1832 src/lang.c:1838 -#: src/lang.c:1844 src/lang.c:1850 src/lang.c:1856 src/lang.c:1862 src/lang.c:1868 -#: src/lang.c:1874 src/lang.c:1880 src/lang.c:1886 src/lang.c:1892 src/lang.c:1898 -#: src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 src/lang.c:1923 src/lang.c:1929 -#: src/lang.c:1936 src/lang.c:1947 src/lang.c:1953 src/lang.c:1959 src/lang.c:1965 -#: src/lang.c:1971 src/lang.c:1977 src/lang.c:1991 src/lang.c:2003 src/lang.c:2037 -#: src/lang.c:2089 src/lang.c:2096 src/lang.c:2102 src/lang.c:2127 src/lang.c:2144 -#: src/lang.c:2197 src/lang.c:2230 src/lang.c:2250 src/lang.c:2285 src/lang.c:2294 -#: src/lang.c:2319 src/lang.c:2331 src/lang.c:2350 +#: src/lang.c:1343 src/lang.c:1369 src/lang.c:1375 src/lang.c:1382 src/lang.c:1414 +#: src/lang.c:1420 src/lang.c:1428 src/lang.c:1448 src/lang.c:1523 src/lang.c:1685 +#: src/lang.c:1691 src/lang.c:1697 src/lang.c:1703 src/lang.c:1715 src/lang.c:1722 +#: src/lang.c:1773 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:1884 src/lang.c:1890 +#: src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1915 src/lang.c:1921 +#: src/lang.c:1928 src/lang.c:1939 src/lang.c:1945 src/lang.c:1951 src/lang.c:1957 +#: src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 src/lang.c:1995 src/lang.c:2029 +#: src/lang.c:2081 src/lang.c:2088 src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 +#: src/lang.c:2189 src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 msgid " toggles, sets, cancels." msgstr " lülitab, seab, katkestab." -#: src/lang.c:1352 +#: src/lang.c:1344 msgid "Show mini menu & posting etiquette :" msgstr "Näita minimenüüd & post. etiketti :" -#: src/lang.c:1353 +#: src/lang.c:1345 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:1358 +#: src/lang.c:1350 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Näita gruppide lühikirjeldusi. lülitab ja seab." -#: src/lang.c:1359 +#: src/lang.c:1351 msgid "Show description of each newsgroup :" msgstr "Näita iga grupi lühikirjeldust :" -#: src/lang.c:1360 +#: src/lang.c:1352 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:1365 +#: src/lang.c:1357 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Näita grupimenüüs teema ja From (autor) välju. lülitab ja seab." -#: src/lang.c:1366 +#: src/lang.c:1358 msgid "In group menu, show author by :" msgstr "Näita grupimenüüs autorit :" -#: src/lang.c:1367 +#: src/lang.c:1359 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:1371 +#: src/lang.c:1363 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Märgi valik -> või heleda ribaga. lülitab, seab." -#: src/lang.c:1372 +#: src/lang.c:1364 msgid "Draw -> instead of highlighted bar :" msgstr "Joonista -> heleda riba asemel :" -#: src/lang.c:1373 +#: src/lang.c:1365 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:1378 +#: src/lang.c:1370 msgid "Use inverse video for page headers :" msgstr "Kasuta päistel pööratud videot :" -#: src/lang.c:1379 +#: src/lang.c:1371 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:1384 +#: src/lang.c:1376 msgid "Thread articles by :" msgstr "Artiklite teemadesse jagamine :" -#: src/lang.c:1385 +#: src/lang.c:1377 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:1391 +#: src/lang.c:1383 msgid "Score of a thread :" msgstr "Teema kaal :" -#: src/lang.c:1392 +#: src/lang.c:1384 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "# Teema kaal 0=(Maksimum) 1=(Summa) 2=(Keskmine)\n" -#: src/lang.c:1396 +#: src/lang.c:1388 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Järjesta artiklid Subject, From, Date, kaalu järgi. lülitab, " "seab." -#: src/lang.c:1397 +#: src/lang.c:1389 msgid "Sort articles by :" msgstr "Artiklite järjestus :" -#: src/lang.c:1398 +#: src/lang.c:1390 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" @@ -4371,57 +4372,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:1404 +#: src/lang.c:1396 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Järjesta teemad mitte millegi või kaalu järgi. lülitab, seab." -#: src/lang.c:1405 +#: src/lang.c:1397 msgid "Sort threads by :" msgstr "Teemade järjestus :" -#: src/lang.c:1406 +#: src/lang.c:1398 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:1410 +#: src/lang.c:1402 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "Vii kursor grupis esimesele/viimasele lugemata artiklile. lülitab, " " seab." -#: src/lang.c:1411 +#: src/lang.c:1403 msgid "Goto first unread article in group :" msgstr "Mine grupis esimesele lugemata art.:" -#: src/lang.c:1412 +#: src/lang.c:1404 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:1416 +#: src/lang.c:1408 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Näita kõiki või ainult lugemata artikleid. lülitab, seab." -#: src/lang.c:1417 +#: src/lang.c:1409 msgid "Show only unread articles :" msgstr "Näita ainult lugemata artikleid :" -#: src/lang.c:1418 +#: src/lang.c:1410 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:1423 +#: src/lang.c:1415 msgid "Show only groups with unread arts :" msgstr "Ainult lugemata artiklitega grupid :" -#: src/lang.c:1424 +#: src/lang.c:1416 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:1429 +#: src/lang.c:1421 msgid "Filter which articles :" msgstr "Filtreeri artikleid :" -#: src/lang.c:1430 +#: src/lang.c:1422 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" @@ -4429,212 +4430,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:1437 +#: src/lang.c:1429 msgid "Tab goes to next unread article :" msgstr "Tab viib järgmisele lugemata art. :" -#: src/lang.c:1438 +#: src/lang.c:1430 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:1442 +#: src/lang.c:1434 msgid "Scrolling with 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:1443 +#: src/lang.c:1435 msgid "Space goes to next unread article :" msgstr "Tühik viib järgmisele lugemata art.:" -#: src/lang.c:1444 +#: src/lang.c:1436 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:1449 +#: src/lang.c:1441 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "/noolega art. lõpust edasi kerimine hüppab järgmisele lugemata art." -#: src/lang.c:1450 +#: src/lang.c:1442 msgid "PgDn goes to next unread article :" msgstr "PgDn viib järgmisele lugemata art. :" -#: src/lang.c:1451 +#: src/lang.c:1443 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:1457 +#: src/lang.c:1449 msgid "List thread using right arrow key :" msgstr "Nool paremale näitab teema loendit :" -#: src/lang.c:1458 +#: src/lang.c:1450 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:1462 +#: src/lang.c:1454 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Sisestage sümbol kustutatud artiklite märkimiseks. seab, katkestab." -#: src/lang.c:1463 +#: src/lang.c:1455 msgid "Character to show deleted articles :" msgstr "Kustutatud artiklite marker :" -#: src/lang.c:1464 +#: src/lang.c:1456 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:1469 +#: src/lang.c:1461 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "Sisestage sümbol, mis märgib vahemikku kuuluvaid artikleid. seab, " "katkestab." -#: src/lang.c:1470 +#: src/lang.c:1462 msgid "Character to show inrange articles :" msgstr "Artiklite vahemiku marker :" -#: src/lang.c:1471 +#: src/lang.c:1463 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:1476 +#: src/lang.c:1468 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Sisestage tagasituleva artikli marker. seab, katkestab." -#: src/lang.c:1477 +#: src/lang.c:1469 msgid "Character to show returning arts :" msgstr "Tagasi tulnud artiklite marker :" -#: src/lang.c:1478 +#: src/lang.c:1470 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:1483 +#: src/lang.c:1475 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1484 +#: src/lang.c:1476 msgid "Character to show selected articles:" msgstr "Valitud artiklite marker :" -#: src/lang.c:1485 +#: src/lang.c:1477 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:1490 +#: src/lang.c:1482 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Sisestage värskeid artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1491 +#: src/lang.c:1483 msgid "Character to show recent articles :" msgstr "Värskete artiklite marker :" -#: src/lang.c:1492 +#: src/lang.c:1484 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:1497 +#: src/lang.c:1489 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Sisestage lugemata artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1498 +#: src/lang.c:1490 msgid "Character to show unread articles :" msgstr "Lugemata artiklite marker :" -#: src/lang.c:1499 +#: src/lang.c:1491 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:1504 +#: src/lang.c:1496 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Sisestage loetud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1505 +#: src/lang.c:1497 msgid "Character to show read articles :" msgstr "Loetud artiklite marker :" -#: src/lang.c:1506 +#: src/lang.c:1498 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:1511 +#: src/lang.c:1503 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Sisestage surmatud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1512 +#: src/lang.c:1504 msgid "Character to show killed articles :" msgstr "Surmatud artiklite marker :" -#: src/lang.c:1513 +#: src/lang.c:1505 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:1518 +#: src/lang.c:1510 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1519 +#: src/lang.c:1511 msgid "Character to show readselected arts:" msgstr "Lugemiseks valitud artiklite marker:" -#: src/lang.c:1520 +#: src/lang.c:1512 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:1525 +#: src/lang.c:1517 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Sisestage maksimaalne näidatav grupi nime pikkus. seab." -#: src/lang.c:1526 +#: src/lang.c:1518 msgid "Max. length of group names shown :" msgstr "Maksimaalne grupinime pikkus :" -#: src/lang.c:1527 +#: src/lang.c:1519 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maksimaalne grupi nime pikkus, mida näidatakse ekraanil\n" -#: src/lang.c:1532 +#: src/lang.c:1524 msgid "Show lines/score in listings :" msgstr "Näita loendis artikli kaalu/ridu :" -#: src/lang.c:1533 +#: src/lang.c:1525 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:1538 +#: src/lang.c:1530 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:1539 +#: src/lang.c:1531 msgid "Number of lines to scroll in pager :" msgstr "Lehitsejas keritavate ridade arv :" -#: src/lang.c:1540 +#: src/lang.c:1532 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" @@ -4644,27 +4645,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:1547 +#: src/lang.c:1539 msgid "Display signatures. toggles & sets." msgstr "Näita signatuure, lülitab, seab." -#: src/lang.c:1548 +#: src/lang.c:1540 msgid "Display signatures :" msgstr "Näita signatuure :" -#: src/lang.c:1549 +#: src/lang.c:1541 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:1553 +#: src/lang.c:1545 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Näita uuenkodeeritud andmeid märgitud lisadena. lülitab ja seab." -#: src/lang.c:1554 +#: src/lang.c:1546 msgid "Display uue data as an attachment :" msgstr "Näita uuenk. andmeid lisadena :" -#: src/lang.c:1555 +#: src/lang.c:1547 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" @@ -4679,30 +4680,30 @@ msgstr "# uuenkodeeritud andmete käsitle "# märgituna.\n" # -#: src/lang.c:1564 +#: src/lang.c:1556 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "Dekodeeri saksa TeX esituses tähed ISO koodideks. lülitab, seab." # -#: src/lang.c:1565 +#: src/lang.c:1557 msgid "Display \"a as Umlaut-a :" msgstr "Näita \"a kui Umlaut-a :" -#: src/lang.c:1566 +#: src/lang.c:1558 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:1571 src/lang.c:1581 +#: src/lang.c:1563 src/lang.c:1573 msgid "Space separated list of header fields" msgstr "Tühikuga eraldatud päised" -#: src/lang.c:1572 +#: src/lang.c:1564 msgid "Display these header fields (or *) :" msgstr "Näita neid päiseid (või *) :" -#: src/lang.c:1573 +#: src/lang.c:1565 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" @@ -4717,11 +4718,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:1582 +#: src/lang.c:1574 msgid "Do not display these header fields :" msgstr "Ära näita neid päiseridu :" -#: src/lang.c:1583 +#: src/lang.c:1575 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 " @@ -4739,28 +4740,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:1593 +#: src/lang.c:1585 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:1594 +#: src/lang.c:1586 msgid "Skip multipart/alternative parts :" msgstr "Jäta multipart/alternative osad :" -#: src/lang.c:1595 +#: src/lang.c:1587 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:1600 +#: src/lang.c:1592 msgid "A regex used to decide which lines to show in col_quote." msgstr "Regulaaravaldis otsustamaks, milliseid ridu tsitaatides näidata." -#: src/lang.c:1601 +#: src/lang.c:1593 msgid "Regex used to show quoted lines :" msgstr "Tsiteeritud ridade näitamise regex :" -#: src/lang.c:1602 +#: src/lang.c:1594 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" @@ -4768,15 +4769,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:1608 +#: src/lang.c:1600 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:1609 +#: src/lang.c:1601 msgid "Regex used to show twice quoted l. :" msgstr "Topelt tsiteeritud ridu näitav reg :" -#: src/lang.c:1610 +#: src/lang.c:1602 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" @@ -4785,15 +4786,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:1616 +#: src/lang.c:1608 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:1617 +#: src/lang.c:1609 msgid "Regex used to show >= 3 times q.l. :" msgstr ">= 3 tsiteeritud ridu näitav reg :" -#: src/lang.c:1618 +#: src/lang.c:1610 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" @@ -4802,15 +4803,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:1625 +#: src/lang.c:1617 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:1626 +#: src/lang.c:1618 msgid "Regex used to highlight /slashes/ :" msgstr "Regex et esile tõsta /kaldkriipse/ :" -#: src/lang.c:1627 +#: src/lang.c:1619 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" @@ -4818,15 +4819,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:1633 +#: src/lang.c:1625 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:1634 +#: src/lang.c:1626 msgid "Regex used to highlight *stars* :" msgstr "Regex et esile tõsta *tärne* :" -#: src/lang.c:1635 +#: src/lang.c:1627 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" @@ -4834,15 +4835,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:1641 +#: src/lang.c:1633 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:1642 +#: src/lang.c:1634 msgid "Regex used to highlight -strokes- :" msgstr "Regex et esile tõsta -kriipse- :" -#: src/lang.c:1643 +#: src/lang.c:1635 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" @@ -4850,15 +4851,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:1649 +#: src/lang.c:1641 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:1650 +#: src/lang.c:1642 msgid "Regex used to highlight _underline_:" msgstr "Regex et esile tõsta _alakriipse_ :" -#: src/lang.c:1651 +#: src/lang.c:1643 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" @@ -4866,44 +4867,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:1657 +#: src/lang.c:1649 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "Regulaaravaldis eemaldatava teema prefiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:1658 +#: src/lang.c:1650 msgid "Regex with Subject prefixes :" msgstr "Regex teema prefiksi leidmiseks :" -#: src/lang.c:1659 +#: src/lang.c:1651 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:1664 +#: src/lang.c:1656 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "Regulaaravaldis eemaldatava teema sufiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:1665 +#: src/lang.c:1657 msgid "Regex with Subject suffixes :" msgstr "Regex teema sufiksi leidmiseks :" -#: src/lang.c:1666 +#: src/lang.c:1658 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:1671 +#: src/lang.c:1663 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:1672 +#: src/lang.c:1664 msgid "MIME binary content viewer :" msgstr "MIME kahendsisu lehitseja :" -#: src/lang.c:1673 +#: src/lang.c:1665 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" @@ -4913,377 +4914,377 @@ 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:1680 +#: src/lang.c:1672 msgid "Confirm before starting non-text viewing program" msgstr "Küsi enne mitte-tekstiliste osade vaatamist kinnitust" -#: src/lang.c:1681 +#: src/lang.c:1673 msgid "Ask before using MIME viewer :" msgstr "Küsi MIME lehitseja kasutamise luba:" -#: src/lang.c:1682 +#: src/lang.c:1674 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:1687 +#: src/lang.c:1679 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "Küsi, kas märkida väljumisel grupid loetuks. lülitab ja seab." -#: src/lang.c:1688 +#: src/lang.c:1680 msgid "Catchup read groups when quitting :" msgstr "Väljumisel märkida grupid loetuks :" -#: src/lang.c:1689 +#: src/lang.c:1681 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:1694 +#: src/lang.c:1686 msgid "Catchup group using left key :" msgstr "Nool vasakule märgib grupi loetuks :" -#: src/lang.c:1695 +#: src/lang.c:1687 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:1700 +#: src/lang.c:1692 msgid "Catchup thread by using left key :" msgstr "Nool vasakule märgib teema loetuks :" -#: src/lang.c:1706 +#: src/lang.c:1698 msgid "Which actions require confirmation :" msgstr "Tegevused mis nõuavad kinnitust :" -#: src/lang.c:1707 +#: src/lang.c:1699 msgid "# What should we ask confirmation for.\n" msgstr "# Millele me peaksime küsima kinnitust.\n" -#: src/lang.c:1712 +#: src/lang.c:1704 msgid "'Mark article read' ignores tags :" msgstr "'Märgi art. loetuks' eirab märke :" -#: src/lang.c:1713 +#: src/lang.c:1705 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "# Kui väärtus on ON märgib 'Märgi artikkel loetuks' funktsioon ainult\n" "# jooksva artikli.\n" -#: src/lang.c:1717 +#: src/lang.c:1709 msgid "Program to run to open URL's, sets, cancels." msgstr "Programm URLide avamiseks, seab, katkestab." -#: src/lang.c:1718 +#: src/lang.c:1710 msgid "Program that opens URL's :" msgstr "Programm URLide avamiseks :" -#: src/lang.c:1719 +#: src/lang.c:1711 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:1724 +#: src/lang.c:1716 msgid "Use mouse in xterm :" msgstr "Kasuta xterm aknas hiirt :" -#: src/lang.c:1725 +#: src/lang.c:1717 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:1731 +#: src/lang.c:1723 msgid "Use scroll keys on keypad :" msgstr "Kasuta kerimisnuppe :" -#: src/lang.c:1732 +#: src/lang.c:1724 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:1737 +#: src/lang.c:1729 msgid "Enter maximum number of article to get. sets." msgstr "Sisestage suurim laetavate artiklite arv. seab." -#: src/lang.c:1738 +#: src/lang.c:1730 msgid "Number of articles to get :" msgstr "Laetavate artiklite arv :" -#: src/lang.c:1739 +#: src/lang.c:1731 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:1744 +#: src/lang.c:1736 msgid "Enter number of days article is considered recent. sets." msgstr "Sisestage artikli värskuse kestus. seab." -#: src/lang.c:1745 +#: src/lang.c:1737 msgid "Article recentness time limit :" msgstr "Artikli värskuse ajapiir :" -#: src/lang.c:1746 +#: src/lang.c:1738 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:1750 +#: src/lang.c:1742 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT tavalistele jokkeritele, REGEX täisregulaaravaldistega otsimisele." -#: src/lang.c:1751 +#: src/lang.c:1743 msgid "Wildcard matching :" msgstr "Jokkeritega otsimine :" -#: src/lang.c:1752 +#: src/lang.c:1744 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "# Jokkeritega otsimine 0=(wildmat) 1=(regex)\n" -#: src/lang.c:1756 +#: src/lang.c:1748 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Sisestage minimaalne kaal artikli surmamiseks. seab." -#: src/lang.c:1757 +#: src/lang.c:1749 msgid "Score limit (kill) :" msgstr "Kaalu alampiir (surmamine) :" -#: src/lang.c:1758 +#: src/lang.c:1750 msgid "# Score limit before an article is marked killed\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse surmatuks\n" -#: src/lang.c:1762 +#: src/lang.c:1754 msgid "Enter default score to kill articles. sets." msgstr "Sisestage vaikimisi kaal artiklite surmamiseks. seab." -#: src/lang.c:1763 +#: src/lang.c:1755 msgid "Default score to kill articles :" msgstr "Artiklite surmamise vaikimisi kaal :" -#: src/lang.c:1764 +#: src/lang.c:1756 msgid "# Default score to kill articles\n" msgstr "# Vaikimisi kaal artiklite surmamiseks\n" -#: src/lang.c:1768 +#: src/lang.c:1760 msgid "Enter minimal score before an article is marked hot. sets." msgstr "Sisestage minimaalne kaal, enne kui artikkel märgitakse kuumaks. seab." -#: src/lang.c:1769 +#: src/lang.c:1761 msgid "Score limit (select) :" msgstr "Kaalu alampiir (valik) :" -#: src/lang.c:1770 +#: src/lang.c:1762 msgid "# Score limit before an article is marked hot\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse muumaks\n" -#: src/lang.c:1774 +#: src/lang.c:1766 msgid "Enter default score to select articles. sets." msgstr "Sisestage vaikimisi kaal artiklite valimiseks. seab." -#: src/lang.c:1775 +#: src/lang.c:1767 msgid "Default score to select articles :" msgstr "Vaikimisi kaal artiklite valimiseks:" -#: src/lang.c:1776 +#: src/lang.c:1768 msgid "# Default score to select articles\n" msgstr "# Vaikimisi kaal artiklite valimiseks\n" -#: src/lang.c:1782 +#: src/lang.c:1774 msgid "Use slrnface to show ''X-Face:''s :" msgstr "''X-Face:'' näitamiseks slrnface :" -#: src/lang.c:1783 +#: src/lang.c:1775 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:1791 +#: src/lang.c:1783 msgid "Use ANSI color :" msgstr "Kasuta ANSI värve :" -#: src/lang.c:1792 +#: src/lang.c:1784 msgid "# If ON using ANSI-color\n" msgstr "# Kui väärtus on ON, kasuta ANSI värve\n" -#: src/lang.c:1797 +#: src/lang.c:1789 msgid "Standard foreground color :" msgstr "Standardne esiplaani värv :" -#: src/lang.c:1798 +#: src/lang.c:1790 msgid "# Standard foreground color\n" msgstr "# Standardne esiplaani värv\n" -#: src/lang.c:1803 +#: src/lang.c:1795 msgid "Standard background color :" msgstr "Standardne tagaplaani värv :" -#: src/lang.c:1804 +#: src/lang.c:1796 msgid "# Standard-Background-Color\n" msgstr "# Standardne tagaplaani värv\n" -#: src/lang.c:1809 +#: src/lang.c:1801 msgid "Color for inverse text (background):" msgstr "Pööratud teksti värv (tagaplaan) :" -#: src/lang.c:1810 +#: src/lang.c:1802 msgid "# Color of background for inverse text\n" msgstr "# Pööratud teksti tagaplaani värv\n" -#: src/lang.c:1815 +#: src/lang.c:1807 msgid "Color for inverse text (foreground):" msgstr "Pööratud teksti värv (esiplaan) :" -#: src/lang.c:1816 +#: src/lang.c:1808 msgid "# Color of foreground for inverse text\n" msgstr "# Pööratud teksti esiplaani värv\n" -#: src/lang.c:1821 +#: src/lang.c:1813 msgid "Color of text lines :" msgstr "Tekstiridade värv :" -#: src/lang.c:1822 +#: src/lang.c:1814 msgid "# Color of text-lines\n" msgstr "# Tekstiridade värv\n" -#: src/lang.c:1827 +#: src/lang.c:1819 msgid "Color of mini help menu :" msgstr "Miniabiinfo värv :" -#: src/lang.c:1828 +#: src/lang.c:1820 msgid "# Color of mini help menu\n" msgstr "# Miniabiinfo värv\n" -#: src/lang.c:1833 +#: src/lang.c:1825 msgid "Color of help text :" msgstr "Abiinfo värv :" -#: src/lang.c:1834 +#: src/lang.c:1826 msgid "# Color of help pages\n" msgstr "# Abiinfo värv\n" -#: src/lang.c:1839 +#: src/lang.c:1831 msgid "Color of status messages :" msgstr "Olekuteadete värv :" -#: src/lang.c:1840 +#: src/lang.c:1832 msgid "# Color of messages in last line\n" msgstr "# Viimasel real olevate teadete värv\n" -#: src/lang.c:1845 +#: src/lang.c:1837 msgid "Color of quoted lines :" msgstr "Tsitaadi värv :" -#: src/lang.c:1846 +#: src/lang.c:1838 msgid "# Color of quote-lines\n" msgstr "# Tsitaadi värv\n" -#: src/lang.c:1851 +#: src/lang.c:1843 msgid "Color of twice quoted line :" msgstr "Topelt tsiteeritud rea värv :" -#: src/lang.c:1852 +#: src/lang.c:1844 msgid "# Color of twice quoted lines\n" msgstr "# Topelt tsiteeritud rea värv\n" -#: src/lang.c:1857 +#: src/lang.c:1849 msgid "Color of =>3 times quoted line :" msgstr "=>3 korda tsiteeritud rea värv :" -#: src/lang.c:1858 +#: src/lang.c:1850 msgid "# Color of >=3 times quoted lines\n" msgstr "# =>3 korda tsiteeritud rea värv\n" -#: src/lang.c:1863 +#: src/lang.c:1855 msgid "Color of article header lines :" msgstr "Artikli päiseridade värv :" -#: src/lang.c:1864 +#: src/lang.c:1856 msgid "# Color of header-lines\n" msgstr "# Päiseridade värv\n" -#: src/lang.c:1869 +#: src/lang.c:1861 msgid "Color of actual news header fields :" msgstr "Artikli tegelike päiseridade värv :" -#: src/lang.c:1870 +#: src/lang.c:1862 msgid "# Color of actual news header fields\n" msgstr "# Artikli tegelike päiseridade värv\n" -#: src/lang.c:1875 +#: src/lang.c:1867 msgid "Color of article subject lines :" msgstr "Artikli teemarea värv :" -#: src/lang.c:1876 +#: src/lang.c:1868 msgid "# Color of article subject\n" msgstr "# Artikli teema värv\n" -#: src/lang.c:1881 +#: src/lang.c:1873 msgid "Color of response counter :" msgstr "Vastuste arvu loenduri värv :" -#: src/lang.c:1882 +#: src/lang.c:1874 msgid "# Color of response counter\n" msgstr "# Vastuste arvu loenduri värv\n" -#: src/lang.c:1887 +#: src/lang.c:1879 msgid "Color of sender (From:) :" msgstr "Saatja värv (From:) :" -#: src/lang.c:1888 +#: src/lang.c:1880 msgid "# Color of sender (From:)\n" msgstr "# Saatja värv (From:)\n" -#: src/lang.c:1893 +#: src/lang.c:1885 msgid "Color of help/mail sign :" msgstr "Abiinfo/kirja teate värv :" -#: src/lang.c:1894 +#: src/lang.c:1886 msgid "# Color of Help/Mail-Sign\n" msgstr "# Abiinfo/kirja teate värv\n" -#: src/lang.c:1899 +#: src/lang.c:1891 msgid "Color of signatures :" msgstr "Signatuuri värv :" -#: src/lang.c:1900 +#: src/lang.c:1892 msgid "# Color of signature\n" msgstr "# Signatuuri värv\n" # TRANSLATION MISSING -#: src/lang.c:1905 +#: src/lang.c:1897 msgid "Color of highlighted URLs :" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1906 +#: src/lang.c:1898 msgid "# Color of highlighted URLs\n" msgstr "" -#: src/lang.c:1911 +#: src/lang.c:1903 msgid "Color of highlighting with *stars* :" msgstr "*tärnidega* esiletõstmise värv :" -#: src/lang.c:1912 +#: src/lang.c:1904 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:1918 +#: src/lang.c:1910 msgid "Color of highlighting with _dash_ :" msgstr "_alakriipsudega_ esiletõstmise värv:" -#: src/lang.c:1924 +#: src/lang.c:1916 msgid "Color of highlighting with /slash/ :" msgstr "/Kaldkriipsude/ esiletõstmise värv :" -#: src/lang.c:1930 +#: src/lang.c:1922 msgid "Color of highlighting with -stroke-:" msgstr "-Kriipsudega- esiletõstmise värv :" -#: src/lang.c:1937 +#: src/lang.c:1929 msgid "Attr. of highlighting with *stars* :" msgstr "*tärnidega* esiletõstmise atribuut :" -#: src/lang.c:1938 +#: src/lang.c:1930 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5297,39 +5298,39 @@ 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:1948 +#: src/lang.c:1940 msgid "Attr. of highlighting with _dash_ :" msgstr "_alakriipsudega_ esiletõstmise atr.:" -#: src/lang.c:1954 +#: src/lang.c:1946 msgid "Attr. of highlighting with /slash/ :" msgstr "/Kaldkriipsude/ esiletõstmise atr. :" -#: src/lang.c:1960 +#: src/lang.c:1952 msgid "Attr. of highlighting with -stroke-:" msgstr "-Kriipsudega- esiletõstmise atr. :" -#: src/lang.c:1966 +#: src/lang.c:1958 msgid "URL highlighting in message body :" msgstr "Teate kehas URL esiletõstmine :" -#: src/lang.c:1967 +#: src/lang.c:1959 msgid "# Enable URL highlighting?\n" msgstr "# Luba URLide esiletõstmine?\n" -#: src/lang.c:1972 +#: src/lang.c:1964 msgid "Word highlighting in message body :" msgstr "Sõnade esiletõstmine teate kehas :" -#: src/lang.c:1973 +#: src/lang.c:1965 msgid "# Enable word highlighting?\n" msgstr "# Lubada sõnade esiletõstmine?\n" -#: src/lang.c:1978 +#: src/lang.c:1970 msgid "What to display instead of mark :" msgstr "Mida näidata märgi asemel :" -#: src/lang.c:1979 +#: src/lang.c:1971 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" @@ -5337,55 +5338,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:1985 +#: src/lang.c:1977 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Sisestage veerg, millelt lehitseja hakkab ridu murdma. seab." -#: src/lang.c:1986 +#: src/lang.c:1978 msgid "Page line wrap column :" msgstr "Rea murdmise veerg lehitsejas :" -#: src/lang.c:1987 +#: src/lang.c:1979 msgid "# Wrap article lines at column\n" msgstr "# Murra artikli read antud veerus\n" -#: src/lang.c:1992 +#: src/lang.c:1984 msgid "Wrap around threads on next unread :" msgstr "Liigu lugemata art-le ümber teemade:" -#: src/lang.c:1993 +#: src/lang.c:1985 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:1997 +#: src/lang.c:1989 msgid "Enter default mail address (and fullname). sets." msgstr "Sisestage oma e-posti aadress (ja oma nimi). seab." -#: src/lang.c:1998 +#: src/lang.c:1990 msgid "Mail address (and fullname) :" msgstr "E-posti aadress (ja teie nimi) :" -#: src/lang.c:1999 +#: src/lang.c:1991 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:2004 +#: src/lang.c:1996 msgid "Show empty Followup-To in editor :" msgstr "Näita toimetis tühja Followup-To :" -#: src/lang.c:2005 +#: src/lang.c:1997 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:2009 +#: src/lang.c:2001 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "Sisestage tee/! käsk/--none, et luua oma vaikimisi signatuur. seab." -#: src/lang.c:2010 +#: src/lang.c:2002 msgid "Create signature from path/command :" msgstr "Signatuuri loomiseks tee/käsk :" -#: src/lang.c:2011 +#: src/lang.c:2003 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 " @@ -5396,49 +5397,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:2018 +#: src/lang.c:2010 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Signatuurile eelnevale reale \"-- \". lülitab, seab." -#: src/lang.c:2019 +#: src/lang.c:2011 msgid "Prepend signature with \"-- \" :" msgstr "Lisa signatuuri ette \"-- \" :" -#: src/lang.c:2020 +#: src/lang.c:2012 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:2024 +#: src/lang.c:2016 msgid "Add signature when reposting articles. toggles & sets." msgstr "Lisa artikli uuestipostitamisel signatuur. lülitab, seab." -#: src/lang.c:2025 +#: src/lang.c:2017 msgid "Add signature when reposting :" msgstr "Lisa uuestipostitusel signatuur :" -#: src/lang.c:2026 +#: src/lang.c:2018 msgid "# If ON add signature to reposted articles\n" msgstr "# Kui väärtus on ON, lisa uuestipostitatud artiklile signatuur\n" -#: src/lang.c:2030 +#: src/lang.c:2022 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:2031 +#: src/lang.c:2023 msgid "Characters used as quote-marks :" msgstr "Tsiteerimise märgid :" -#: src/lang.c:2032 +#: src/lang.c:2024 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:2038 +#: src/lang.c:2030 msgid "Quoting behavior :" msgstr "Käitumine tsiteerimisel :" -#: src/lang.c:2039 +#: src/lang.c:2031 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5458,15 +5459,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:2051 src/lang.c:2059 src/lang.c:2065 +#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 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:2052 +#: src/lang.c:2044 msgid "Quote line when following up :" msgstr "Tsiteerimise rida vastamisel :" -#: src/lang.c:2053 +#: src/lang.c:2045 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" @@ -5474,35 +5475,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:2060 +#: src/lang.c:2052 msgid "Quote line when cross-posting :" msgstr "Tsiteerimise rida ristpostitusel :" -#: src/lang.c:2066 +#: src/lang.c:2058 msgid "Quote line when mailing :" msgstr "Tsiteerimise rida kirjutamisel :" -#: src/lang.c:2071 +#: src/lang.c:2063 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Kasuta User-Agent: päiserida. lülitab, seab." -#: src/lang.c:2072 +#: src/lang.c:2064 msgid "Insert 'User-Agent:'-header :" msgstr "Sisestage 'User-Agent:'-päis :" -#: src/lang.c:2073 +#: src/lang.c:2065 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:2077 +#: src/lang.c:2069 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "Sisestage MIME kooditabeli nimi (n. US-ASCII, ISO-8859-15, EUC-KR), seab." -#: src/lang.c:2078 +#: src/lang.c:2070 msgid "MM_CHARSET :" msgstr "MM_CHARSET :" -#: src/lang.c:2079 +#: src/lang.c:2071 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" @@ -5518,27 +5519,27 @@ msgstr "# Lokaalselt toetatud kooditabel "# loetakse mm_charset väärtusest erinev kooditabel mitte-näidatavaks\n" "# ja näitamisel kasutatakse '?'.\n" -#: src/lang.c:2090 +#: src/lang.c:2082 msgid "MM_NETWORK_CHARSET :" msgstr "MM_NETWORK_CHARSET :" -#: src/lang.c:2091 +#: src/lang.c:2083 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Postituste MIME (Content-Type) päises kasutatav kooditabel.\n" -#: src/lang.c:2097 +#: src/lang.c:2089 msgid "Mailbox format :" msgstr "Kirjade kataloog :" -#: src/lang.c:2098 +#: src/lang.c:2090 msgid "# Format of the mailbox.\n" msgstr "# Kirjade kataloog.\n" -#: src/lang.c:2103 +#: src/lang.c:2095 msgid "MIME encoding in news messages :" msgstr "Kasuta artiklites MIME kodeerimist :" -#: src/lang.c:2104 +#: src/lang.c:2096 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" @@ -5550,15 +5551,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:2112 src/lang.c:2133 +#: src/lang.c:2104 src/lang.c:2125 msgid "Don't change unless you know what you are doing. cancels." msgstr "Ärge muutke, kui te ei tea, mida teete. katkestab." -#: src/lang.c:2113 +#: src/lang.c:2105 msgid "Use 8bit characters in news headers:" msgstr "Kasuta artikli päises 8bit tähti :" -#: src/lang.c:2114 +#: src/lang.c:2106 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" @@ -5568,28 +5569,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:2121 +#: src/lang.c:2113 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Vaata töödeldud faile automaatselt lülitab, seab, " "katkestab." -#: src/lang.c:2122 +#: src/lang.c:2114 msgid "View post-processed files :" msgstr "Vaata töödeldud faile :" -#: src/lang.c:2123 +#: src/lang.c:2115 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:2128 +#: src/lang.c:2120 msgid "MIME encoding in mail messages :" msgstr "Kasuta kirjades MIME kodeerimist :" -#: src/lang.c:2134 +#: src/lang.c:2126 msgid "Use 8bit characters in mail headers:" msgstr "Kasuta kirja päises 8bit tähti :" -#: src/lang.c:2135 +#: src/lang.c:2127 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 " @@ -5604,25 +5605,25 @@ 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:2145 +#: src/lang.c:2137 msgid "Strip blanks from ends of lines :" msgstr "Eemalda tühikud realõppudest :" -#: src/lang.c:2146 +#: src/lang.c:2138 msgid "# If ON strip blanks from ends of lines for faster 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:2151 +#: src/lang.c:2143 msgid "If ON, use transliteration. toggles & sets." msgstr "Kui väärtus on ON, kasuta transliteratsiooni. lülitab, seab." -#: src/lang.c:2152 +#: src/lang.c:2144 msgid "Transliteration :" msgstr "Transliteratsioon :" -#: src/lang.c:2153 +#: src/lang.c:2145 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" @@ -5631,245 +5632,245 @@ msgstr "# Kui väärtus on ON, kasuta //TR "kasutades\n" "# üht või enamat sarnast sümbolit.\n" -#: src/lang.c:2160 +#: src/lang.c:2152 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Saada kasutajale automaatselt koopia. lülitab, seab." -#: src/lang.c:2161 +#: src/lang.c:2153 msgid "Send you a cc automatically :" msgstr "Saada automaatselt koopia :" -#: src/lang.c:2162 +#: src/lang.c:2154 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:2166 +#: src/lang.c:2158 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Saada automaatselt pimekoopia. lülitab, seab." -#: src/lang.c:2167 +#: src/lang.c:2159 msgid "Send you a blind cc automatically :" msgstr "Saada automaatselt pimekoopia :" -#: src/lang.c:2168 +#: src/lang.c:2160 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:2172 +#: src/lang.c:2164 msgid "Enter address elements about which you want to be warned. sets." msgstr "Sisestage aadressi komponendid, mille eest peaks hoiatama. seab." -#: src/lang.c:2173 +#: src/lang.c:2165 msgid "Spamtrap warning address parts :" msgstr "Rämpsposti hoiatus aadressi osadele:" -#: src/lang.c:2174 +#: src/lang.c:2166 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:2179 +#: src/lang.c:2171 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Sisestage kirje kehtivuse aeg päevades. seab." -#: src/lang.c:2180 +#: src/lang.c:2172 msgid "No. of days a filter entry is valid:" msgstr "Filtri kehtivus päevades :" -#: src/lang.c:2181 +#: src/lang.c:2173 msgid "# Number of days a short term filter will be active\n" msgstr "# lühiajalise filtri kehtivus päevades\n" -#: src/lang.c:2185 +#: src/lang.c:2177 msgid "Add posted articles to filter. toggles & sets." msgstr "Lisage postitatud artikkel filtrisse. lülitab, seab." -#: src/lang.c:2186 +#: src/lang.c:2178 msgid "Add posted articles to filter :" msgstr "Lisage postitatud artikkel filtrile:" -#: src/lang.c:2187 +#: src/lang.c:2179 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:2191 +#: src/lang.c:2183 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "Kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis." -#: src/lang.c:2192 +#: src/lang.c:2184 msgid "Mail directory :" msgstr "Kirjade kataloog :" -#: src/lang.c:2193 +#: src/lang.c:2185 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis\n" -#: src/lang.c:2198 +#: src/lang.c:2190 msgid "Save articles in batch mode (-S) :" msgstr "Salvesta artiklid pakettmoodis (-S):" -#: src/lang.c:2199 +#: src/lang.c:2191 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:2204 +#: src/lang.c:2196 msgid "The directory where you want articles/threads saved." msgstr "Kataloog, kuhu te soovite artikleid salvestada." -#: src/lang.c:2205 +#: src/lang.c:2197 msgid "Directory to save arts/threads in :" msgstr "Kataloog artiklite salvestamiseks :" -#: src/lang.c:2206 +#: src/lang.c:2198 msgid "# Directory where articles/threads are saved\n" msgstr "# Kataloog, kuhu salvestatakse artiklid/teemad\n" -#: src/lang.c:2210 +#: src/lang.c:2202 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "Salvesta artiklid Archive-name: päiserea järgi. lülitab, seab." -#: src/lang.c:2211 +#: src/lang.c:2203 msgid "Use Archive-name: header for save :" msgstr "Kasuta salvestamisel Archive-name: :" -#: src/lang.c:2212 +#: src/lang.c:2204 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:2217 +#: src/lang.c:2209 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "Märgi salvestatud artiklid loetuks. lülitab, seab, " "katkestab." -#: src/lang.c:2218 +#: src/lang.c:2210 msgid "Mark saved articles/threads as read:" msgstr "Märgi salvestatud artiklid loetuks :" -#: src/lang.c:2219 +#: src/lang.c:2211 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:2223 +#: src/lang.c:2215 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Teosta salvestatud artiklitel järeltöötlemist (nt. lisade eraldamist)." -#: src/lang.c:2224 +#: src/lang.c:2216 msgid "Post process saved articles :" msgstr "Salvestatud artikl. järeltöötlemine:" -#: src/lang.c:2225 +#: src/lang.c:2217 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:2231 +#: src/lang.c:2223 msgid "Process only unread articles :" msgstr "Töötle ainult lugemata artikleid :" -#: src/lang.c:2232 +#: src/lang.c:2224 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:2237 +#: src/lang.c:2229 msgid "Print all or just part of header. toggles & sets." msgstr "Trüki kõik või ainult osa päisest. lülitab, seab." -#: src/lang.c:2238 +#: src/lang.c:2230 msgid "Print all headers when printing :" msgstr "Trükkimisel trüki kõik päised :" -#: src/lang.c:2239 +#: src/lang.c:2231 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:2243 +#: src/lang.c:2235 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:2244 +#: src/lang.c:2236 msgid "Printer program with options :" msgstr "Trükikäsk koos võtmetega :" -#: src/lang.c:2245 +#: src/lang.c:2237 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:2251 +#: src/lang.c:2243 msgid "Force redraw after certain commands:" msgstr "Värskenda ekraani peale käske :" -#: src/lang.c:2252 +#: src/lang.c:2244 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:2256 +#: src/lang.c:2248 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "Käivita tekstitoimeti etteantud real. lülitab, seab, " "katkestab." -#: src/lang.c:2257 +#: src/lang.c:2249 msgid "Start editor with line offset :" msgstr "Käivita tekstitoimeti reanumbril :" -#: src/lang.c:2258 +#: src/lang.c:2250 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:2263 +#: src/lang.c:2255 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "Kasutage %E toimeti kohal, %F failinime kohal, %N reanumbrina, seab." -#: src/lang.c:2264 +#: src/lang.c:2256 msgid "Invocation of your editor :" msgstr "Teie tekstitoimeti :" -#: src/lang.c:2265 +#: src/lang.c:2257 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:2270 +#: src/lang.c:2262 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:2271 +#: src/lang.c:2263 msgid "External inews :" msgstr "Väline inews :" -#: src/lang.c:2272 +#: src/lang.c:2264 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:2276 +#: src/lang.c:2268 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "Kasutage %M programmi kohal, %S teema kohal, %T saaja kohal, %F failinime " "kohal, seab." -#: src/lang.c:2277 +#: src/lang.c:2269 msgid "Invocation of your mail command :" msgstr "Teie e-posti käsk :" -#: src/lang.c:2278 +#: src/lang.c:2270 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" @@ -5879,11 +5880,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:2286 +#: src/lang.c:2278 msgid "Use interactive mail reader :" msgstr "Kasuta interaktiivset e-posti :" -#: src/lang.c:2287 +#: src/lang.c:2279 msgid "# Interactive mailreader:\n" "# 0 = no interactive mailreader\n" "# 1 = use interactive mailreader with headers in file\n" @@ -5893,125 +5894,125 @@ msgstr "# Interaktiivne e-posti programm "# 1 = kasuta interaktiivset e-posti programmi koos päistega failiga\n" "# 2 = kasuta interaktiivset e-posti programmi koos päisteta failiga\n" -#: src/lang.c:2295 +#: src/lang.c:2287 msgid "Remove ~/.article after posting :" msgstr "Eemalda ~/.article peale postitust :" -#: src/lang.c:2296 +#: src/lang.c:2288 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Kui väärtus on ON, kustuta ~/.article peale postitust.\n" -#: src/lang.c:2300 +#: src/lang.c:2292 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "Failinimi postitatud artiklitele. seab. Nime puudumisel ei salvestata." -#: src/lang.c:2301 +#: src/lang.c:2293 msgid "Filename for posted articles :" msgstr "Failinimi postitatud artiklitele :" -#: src/lang.c:2302 +#: src/lang.c:2294 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:2307 +#: src/lang.c:2299 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "Hoia ebaõnnestunud postitused failis ~/dead.articles. lülitab ja " "seab." -#: src/lang.c:2308 +#: src/lang.c:2300 msgid "Keep failed arts in ~/dead.articles:" msgstr "Vigased artiklid ~/dead.articles :" -#: src/lang.c:2309 +#: src/lang.c:2301 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:2313 +#: src/lang.c:2305 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Kas te soovite eemaldada tellimata grupid .newsrc failist" -#: src/lang.c:2314 +#: src/lang.c:2306 msgid "No unsubscribed groups in newsrc :" msgstr "newsrcs ainult tellitud grupid :" -#: src/lang.c:2315 +#: src/lang.c:2307 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Kui väärtus on ON, eemalda tellimata grupid newsrc failist\n" -#: src/lang.c:2320 +#: src/lang.c:2312 msgid "Remove bogus groups from newsrc :" msgstr "Eemalda olematud grupid newsrcst :" -#: src/lang.c:2321 +#: src/lang.c:2313 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:2325 +#: src/lang.c:2317 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Sisestage aktiivsete faili lugemise intervall sekundites. seab." -#: src/lang.c:2326 +#: src/lang.c:2318 msgid "Interval in secs to reread active :" msgstr "Aktiivsete faili lugemise intervall:" -#: src/lang.c:2327 +#: src/lang.c:2319 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:2332 +#: src/lang.c:2324 msgid "Reconnect to server automatically :" msgstr "Taasta automaatselt NNTP ühendus :" -#: src/lang.c:2333 +#: src/lang.c:2325 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:2337 +#: src/lang.c:2329 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Loo NNTP overview failidest lokaalne koopia. lülitab ja seab." -#: src/lang.c:2338 +#: src/lang.c:2330 msgid "Cache NNTP overview files locally :" msgstr "Puhverda NNTP overview lokaalselt :" -#: src/lang.c:2339 +#: src/lang.c:2331 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/lang.c:2343 +#: src/lang.c:2335 msgid "Enter format string. sets, cancels." msgstr "Sisestage vormingusõne. seab, katkestab." -#: src/lang.c:2344 +#: src/lang.c:2336 msgid "Format string for display of dates :" msgstr "Kuupäevade esitamise vormingusõne :" -#: src/lang.c:2345 +#: src/lang.c:2337 msgid "# Format string for date representation\n" msgstr "# Vormingusõne kuupäevade esitamiseks\n" # TRANSLATION MISSING -#: src/lang.c:2351 +#: src/lang.c:2343 msgid "Unicode normalization form :" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2352 +#: src/lang.c:2344 msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" -#: src/main.c:586 +#: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" msgstr "Versioon: %s väljalase %s (\"%s\") %s %s" -#: src/main.c:589 +#: src/main.c:593 #, c-format msgid "Version: %s release %s (\"%s\")" msgstr "Versioon: %s väljalase %s (\"%s\")" @@ -6020,23 +6021,23 @@ msgstr "Versioon: %s väljalase %s (\"%s\ msgid "Unreachable?\n" msgstr "Kättesaamatu?\n" -#: src/nntplib.c:821 +#: src/nntplib.c:822 #, c-format msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "\n" "Ühendus serveriga aegus, proovin taastada, katse %d\n" -#: src/nntplib.c:839 +#: src/nntplib.c:840 msgid "Rejoin current group\n" msgstr "Taasühinen jooksva grupiga\n" -#: src/nntplib.c:846 +#: src/nntplib.c:847 #, c-format msgid "Read (%s)\n" msgstr "Lugesin (%s)\n" -#: src/nntplib.c:848 +#: src/nntplib.c:849 #, c-format msgid "Resend last command (%s)\n" msgstr "Saada viimane käsk uuesti (%s)\n" @@ -6046,7 +6047,7 @@ msgstr "Saada viimane käsk uuesti (%s)\n msgid "couldn't expand %s\n" msgstr "ei saa laiendada %s\n" -#: src/post.c:1939 +#: src/post.c:1951 #, c-format msgid "Posting: %.*s ..." msgstr "Postitan: %.*s ..." @@ -6066,15 +6067,15 @@ msgid "Draining\n" msgstr "Tühjendan\n" #. Don't hash the initial '<' -#: src/refs.c:220 +#: src/refs.c:251 msgid "unchanged" msgstr "muutmata" -#: src/refs.c:573 +#: src/refs.c:610 msgid "[- Unavailable -]" msgstr "[- Pole kasutatav -]" -#: src/save.c:975 +#: src/save.c:976 msgid "bytes" msgstr "baiti" @@ -6086,7 +6087,7 @@ msgstr "lugemata" msgid "all" msgstr "kõik" -#: src/select.c:525 src/select.c:527 +#: src/select.c:529 src/select.c:531 msgid " R" msgstr " L" Binary files tin-1.7.3/po/fr.gmo and tin-1.7.4/po/fr.gmo differ diff -Nurp tin-1.7.3/po/fr.po tin-1.7.4/po/fr.po --- tin-1.7.3/po/fr.po Sat Dec 20 18:45:16 2003 +++ tin-1.7.4/po/fr.po Wed Feb 25 10:34:14 2004 @@ -1,20 +1,20 @@ # French translation for tin -# Matt Anton , 2003 +# Matt Anton , 2003-2004 # msgid "" -msgstr "Project-Id-Version: 1.7.0\n" - "POT-Creation-Date: 2003-12-20 18:42+0100\n" - "PO-Revision-Date: 2003-07-04 04:15+0200\n" +msgstr "Project-Id-Version: 1.7.4\n" + "POT-Creation-Date: 2004-02-25 10:33+0100\n" + "PO-Revision-Date: 2004-01-28 09:50+0100\n" "Last-Translator: Matt Anton \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/art.c:1425 +#: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" -msgstr "" +msgstr "%d Mauvais overview (%d champs) '%s'" #: src/attrib.c:585 msgid "# Do not edit this comment block\n" @@ -232,7 +232,7 @@ msgstr "(inconnu)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:608 src/filter.c:616 +#: src/filter.c:612 src/filter.c:620 msgid "Removed from the previous rule: " msgstr "Effacé de la règle précédente : " @@ -461,8 +461,8 @@ msgid "*** Beginning of article ***" msgstr "*** Début de l'article ***" #: 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) : " +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:98 msgid "Cancelling article..." @@ -548,7 +548,7 @@ msgstr "Vérification de articles..." #: 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 : " +msgstr "Traiter %s=non, %s=oui, %s=shar, %s=quitter : " #: src/lang.c:118 msgid "ANSI color disabled" @@ -584,7 +584,7 @@ msgstr "Création du fichier active des g msgid "Creating newsrc file...\n" msgstr "Création du fichier newsrc...\n" -#: src/lang.c:127 src/lang.c:1126 +#: src/lang.c:127 src/lang.c:1118 msgid "Default" msgstr "Défaut" @@ -924,7 +924,7 @@ msgstr "Pas la permission d'aller dans % msgid "\n" "Error: From: line missing.\n" msgstr "\n" - "Erreur : Ligne De: manquante.\n" + "Erreur : Ligne From: manquante.\n" #: src/lang.c:206 #, c-format @@ -1058,17 +1058,45 @@ msgid "# Format:\n" "# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" "# time=NUM Optional. time_t value when rule expires\n" "#\n" -msgstr "" +msgstr "# Format :\n" + "# comment=TERME\tFacultatif. Plusieurs lignes acceptées.\n" + "#\t\t\tLes commentaires doivent êtres placés au\n" + "#\t\t\tdébut de la règle, sinon ils seront déplacés\n" + "#\t\t\tà la règle suivante. '#' n'est pas un mot-clé\n" + "#\t\t\tvalide pour un commentaire !\n" + "# group=TERME\tOgligatoire. Liste de groupe (pe. fr.comp.*,!*sources*).\n" + "# case=NUM\t\tOgligatoire. Casse sensible=0 / casse insensible=1.\n" + "# score=NUM|TERME\tObligatoire. Score à attribuer. Soit :\n" + "# score=NUM\t- Un numéro (pe. 70). Ou :\n" + "# score=TERME\t- Un des deux mots-clé suivants : 'hot' ou 'kill'.\n" + "# subj=TERME\t\tFacultatif. Ligne Subject: (pe. Comment devenir un " + "gourou).\n" + "# from=TERME\t\tFacultatif. Ligne From: (pe. *Craig Shergold*).\n" + "# msgid=TERME\tFacultatif. Ligne Message-ID: (pe. <123@ether.net>) avec\n" + "#\t\t\tréférence complète.\n" + "# msgid_last=TERME\tFacultatif. Comme ci-dessus mais avec juste le dernier " + "MID.\n" + "# msgid_only=TERME\tFacultatif. Comme ci-dessus mais sans les références.\n" + "# refs_only=TERME\tFacultatif. Ligne References: (pe. <123@ether.net>) " + "sans\n" + "#\t\t\tla ligne Message-ID:\n" + "# lines=[<>]?NUM\tFacultatif. Ligne Lines:. '<' ou '>' sont optionnels.\n" + "# gnksa=[<>]?NUM\tFacultatif. Résultat du 'parse_from' du GNKSA. '<' ou " + "'>'\n" + "#\t\t\tsont optionnels.\n" + "# xref=CHAÎNE\tFacultatif. Chaîne à filtrer (pe. alt.flame*)\n" + "# time=NUM\t\tFacultatif. Valeur de time_t indique la durée de la règle.\n" + "#\n" #: src/lang.c:250 #, c-format msgid "Enter score for rule (default=%d): " -msgstr "" +msgstr "Entrez le score de cette règle (défaut=%d) : " #: src/lang.c:251 #, c-format msgid "Enter the score weight (range 0 < score <= %d)" -msgstr "" +msgstr "Entrez la valeur du score (0 < score <= %d)" #. SCORE_MAX #: src/lang.c:252 @@ -1085,11 +1113,11 @@ msgstr "Appliquer le réglage à : " #: src/lang.c:255 msgid "From: line (ignore case) " -msgstr "Ligne De : (ignorer la casse) " +msgstr "Ligne From: (ignorer la casse) " #: src/lang.c:256 msgid "From: line (case sensitive) " -msgstr "Ligne De : (casse sensible) " +msgstr "Ligne From: (casse sensible) " #: src/lang.c:258 #, c-format @@ -1122,7 +1150,7 @@ msgstr "groupes" #: src/lang.c:264 #, c-format msgid "Rereading %s..." -msgstr "" +msgstr "Relecture de %s..." #: src/lang.c:265 msgid "Top Level Commands" @@ -1130,7 +1158,7 @@ msgstr "Commandes niveau supérieur" #: src/lang.c:266 msgid "Group Selection" -msgstr "Sélection de groupe" +msgstr "Sélection du groupe" #: src/lang.c:267 msgid "group" @@ -1194,8 +1222,8 @@ msgid "0 - 9\t display article by numbe msgstr "0 - 9\t affiche les articles par numéro du fil actuel" #: src/lang.c:283 -msgid "cancel (delete) current article; must have been posted by you" -msgstr "annuler (effacer) l'article actuel; a dû être posté par vous" +msgid "cancel (delete) or supersede (overwrite) current article" +msgstr "annuler (effacer) ou remplacer (écraser) l'article actuel" #: src/lang.c:284 msgid "edit article (mail-groups only)" @@ -1241,7 +1269,7 @@ msgstr "afficher l'article suivant" msgid "display first article in next thread" msgstr "afficher le 1er article du fil suivant" -#: src/lang.c:295 src/lang.c:302 src/lang.c:361 src/lang.c:362 +#: src/lang.c:295 msgid "display next unread article" msgstr "afficher le prochain article non lu" @@ -1253,7 +1281,7 @@ msgstr "aller à l'article parent" msgid "display previous article" msgstr "afficher l'article précédent" -#: src/lang.c:298 src/lang.c:364 +#: src/lang.c:298 msgid "display previous unread article" msgstr "afficher l'article précédent non lu" @@ -1269,191 +1297,195 @@ msgstr "sélection auto. (hot) un article msgid "return to group selection level" msgstr "retourner à la vue sélection de groupe" -#: src/lang.c:303 +#: src/lang.c:302 msgid "reply through mail to author" msgstr "répondre par email à l'auteur" -#: src/lang.c:304 +#: src/lang.c:303 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:305 +#: src/lang.c:304 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:306 src/lang.c:366 +#: src/lang.c:305 msgid "repost chosen article to another group" msgstr "reposter l'article choisi dans un autre groupe" -#: src/lang.c:307 +#: src/lang.c:306 msgid "search backwards within this article" msgstr "recherche arrière dans cet article" -#: src/lang.c:308 +#: src/lang.c:307 msgid "search forwards within this article" msgstr "recherche avant dans cet article" -#: src/lang.c:309 +#: src/lang.c:308 msgid "show article in raw-mode (including all headers)" msgstr "afficher la source des articles (incluant les en-têtes)" -#: src/lang.c:310 +#: src/lang.c:309 msgid "skip next block of included text" msgstr "passer au bloc suivant incluant du texte" -#: src/lang.c:311 +#: src/lang.c:310 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:312 +#: src/lang.c:311 msgid "toggle word highlighting on/off" msgstr "(dés)activer la surbrillance des mots" -#: src/lang.c:313 +#: src/lang.c:312 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:314 +#: src/lang.c:313 msgid "toggle tabwidth 4 <-> 8" msgstr "(dés)activer taille de tabulation 4 <-> 8" -#: src/lang.c:315 +#: src/lang.c:314 msgid "toggle german TeX style decoding for current article" msgstr "(dés)activer le décodage de type TeX allemand pour l'article actuel" -#: src/lang.c:316 +#: src/lang.c:315 msgid "toggle display of uuencoded sections" -msgstr "" +msgstr "(dés)activer l'affichage des sections uuencodées" -#: src/lang.c:317 +#: src/lang.c:316 msgid "View/save multimedia attachments" msgstr "Voir/enregistrer les pj multimédia" -#: src/lang.c:318 +#: src/lang.c:317 #, 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:319 +#: src/lang.c:318 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:320 +#: src/lang.c:319 msgid "escape from command prompt" msgstr "quitter le prompt" -#: src/lang.c:321 +#: src/lang.c:320 msgid "get help" -msgstr "avoir de l'aide" +msgstr "voir l'aide" -#: src/lang.c:322 +#: src/lang.c:321 msgid "display last article viewed" msgstr "afficher le dernier article lu" -#: src/lang.c:323 +#: src/lang.c:322 msgid "down one line" msgstr "descendre d'une ligne" -#: src/lang.c:324 +#: src/lang.c:323 msgid "up one line" msgstr "monter d'une ligne" -#: src/lang.c:325 +#: src/lang.c:324 msgid "go to article chosen by Message-ID" msgstr "aller à l'article via son Message-ID" -#: src/lang.c:326 +#: src/lang.c:325 msgid "mail article/thread/hot/pattern/tagged articles to someone" msgstr "envoyer article/fil/sél./articles marqués à une personne" -#: src/lang.c:327 +#: src/lang.c:326 msgid "menu of configurable options" msgstr "menu des options réglables" -#: src/lang.c:328 +#: src/lang.c:327 msgid "down one page" msgstr "descendre d'une page" -#: src/lang.c:329 +#: src/lang.c:328 msgid "up one page" msgstr "monter d'une page" -#: src/lang.c:330 +#: src/lang.c:329 msgid "post (write) article to current group" msgstr "poster (écrire) l'article dans le groupe actuel" -#: src/lang.c:331 +#: src/lang.c:330 msgid "post postponed articles" msgstr "poster les brouillons" -#: src/lang.c:332 +#: src/lang.c:331 msgid "list articles posted by you (from posted file)" msgstr "lister les articles postés par vous (fichier posted)" -#: src/lang.c:333 +#: src/lang.c:332 msgid "return to previous menu" msgstr "retourner au menu précédent" -#: src/lang.c:334 +#: src/lang.c:333 msgid "quit tin immediately" msgstr "quitter tin immédiatement" -#: src/lang.c:335 +#: src/lang.c:334 msgid "redraw page" msgstr "redessiner la page" -#: src/lang.c:336 +#: src/lang.c:335 msgid "save article/thread/hot/pattern/tagged articles to file" msgstr "enregistrer article/fil/sél./articles marqués dans un fichier" -#: src/lang.c:337 +#: src/lang.c:336 msgid "save marked articles automatically without user prompts" msgstr "enregistrement auto. des articles marqués sans demander" -#: src/lang.c:338 +#: src/lang.c:337 msgid "search for articles by author backwards" msgstr "recherche arrière d'articles par auteur" -#: src/lang.c:339 +#: src/lang.c:338 msgid "search for articles by author forwards" msgstr "recherche avant d'articles par auteur" -#: src/lang.c:340 +#: src/lang.c:339 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:341 +#: src/lang.c:340 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:342 +#: src/lang.c:341 msgid "search for articles by Subject line backwards" msgstr "recherche arrière d'articles par Sujet" -#: src/lang.c:343 +#: src/lang.c:342 msgid "search for articles by Subject line forwards" msgstr "recherche avant d'articles par Sujet" -#: src/lang.c:344 +#: src/lang.c:343 msgid "repeat last search" msgstr "répéter la dernière recherche" -#: src/lang.c:345 +#: src/lang.c:344 msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "marquer article pour repostage/envoi/passer/imprimer/enregistrer" -#: src/lang.c:346 +#: src/lang.c:345 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:347 +#: src/lang.c:346 msgid "toggle inverse video" msgstr "(dés)activer vidéo inversée" -#: src/lang.c:348 +#: src/lang.c:347 msgid "toggle mini help menu display" msgstr "(dés)activer vue du mini menu aide" +#: src/lang.c:348 +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:349 msgid "show version information" msgstr "afficher la version de tin" @@ -1470,307 +1502,303 @@ msgstr "tout marquer comme lu et entrer msgid "choose first thread in list" msgstr "choisir le 1er fil de la liste" -#: src/lang.c:353 src/lang.c:384 -msgid "choose group by name" -msgstr "choisir le groupe par nom" - -#: src/lang.c:354 +#: src/lang.c:353 msgid "choose last thread in list" msgstr "choisir le dernier fil de la liste" -#: src/lang.c:355 +#: src/lang.c:354 msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "lister les articles du fil actuel (sous-menu fil)" -#: src/lang.c:356 +#: src/lang.c:355 msgid "mark article as unread" msgstr "marquer l'article comme non lu" -#: src/lang.c:357 +#: src/lang.c:356 msgid "mark current thread or tagged threads as read" msgstr "" -#: src/lang.c:358 +#: src/lang.c:357 msgid "mark thread as unread" msgstr "marquer le fil comme non lu" -#: src/lang.c:359 +#: src/lang.c:358 msgid "toggle display of all/selected articles" msgstr "(dés)activer la vue de tout article/articles sélectionnés" -#: src/lang.c:360 +#: src/lang.c:359 msgid "display next group" msgstr "afficher le groupe suivant" -#: src/lang.c:363 +#: src/lang.c:360 msgid "display previous group" msgstr "afficher le groupe précédent" -#: src/lang.c:365 src/lang.c:413 -msgid "read chosen article" -msgstr "lire l'article choisi" - -#: src/lang.c:367 +#: src/lang.c:361 msgid "toggle all selections (all articles)" msgstr "(dés)activer toutes les sélections (tout article)" -#: src/lang.c:368 +#: src/lang.c:362 msgid "select group (make \"hot\")" msgstr "sélection du groupe (utiliser \"hot\")" -#: src/lang.c:369 +#: src/lang.c:363 msgid "select thread" msgstr "sélectionner le fil" -#: src/lang.c:370 +#: src/lang.c:364 msgid "select threads if at least one unread article is selected" msgstr "sél. les fils si au moins un article non lu est sélectionné" -#: src/lang.c:371 +#: src/lang.c:365 msgid "select threads that match user specified pattern" msgstr "sélectionner les fils qui correspondent au critère choisi" -#: src/lang.c:372 +#: src/lang.c:366 msgid "tag all parts of current multipart-message in order" msgstr "marquer dans l'ordre toutes parties du message multiparties" -#: src/lang.c:373 +#: src/lang.c:367 msgid "0 - 9\t choose thread by number" msgstr "0 - 9\t choisir le fil par numéro" -#: src/lang.c:374 +#: src/lang.c:368 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:375 +#: src/lang.c:369 msgid "toggle display of all/unread articles" msgstr "(dés)activer l'affichage de tout article/articles non lus" -#: src/lang.c:376 src/lang.c:414 -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:377 +#: src/lang.c:370 msgid "toggle selection of thread" msgstr "(dés)activer sélection du fil" -#: src/lang.c:378 +#: src/lang.c:371 msgid "cycle through threading options available" msgstr "voir toutes les options de groupage disponibles" -#: src/lang.c:379 +#: src/lang.c:372 msgid "undo all selections (all articles)" msgstr "annuler toutes sélections (tout article)" -#: src/lang.c:380 +#: src/lang.c:373 msgid "untag all tagged threads" msgstr "démarquer tout fil marqué" -#: src/lang.c:381 +#: src/lang.c:374 msgid "mark all articles in group as read" msgstr "marquer lu tous les articles du groupe" # TRANSLATION TOO LONG (71 chars max) -#: src/lang.c:382 +#: src/lang.c:375 msgid "mark all articles in group as read and move to next unread group" msgstr "marquer tout article dans groupe comme lu et aller au groupe non lu suivant" -#: src/lang.c:383 +#: src/lang.c:376 msgid "choose first group in list" msgstr "choisir 1er groupe de la liste" -#: src/lang.c:385 +#: src/lang.c:377 +msgid "choose group by name" +msgstr "choisir le groupe par nom" + +#: src/lang.c:378 msgid "0 - 9\t choose group by number" msgstr "0 - 9\t choisir groupe par numéro" -#: src/lang.c:386 +#: src/lang.c:379 msgid "choose range of groups to be affected by next command" msgstr "choisir les groupes affectés par la commande suivante" -#: src/lang.c:387 +#: src/lang.c:380 msgid "choose last group in list" msgstr "choisir dernier groupe de la liste" -#: src/lang.c:388 +#: src/lang.c:381 msgid "mark all articles in chosen group unread" msgstr "marquer non lu tout article dans le groupe choisi" -#: src/lang.c:389 +#: src/lang.c:382 msgid "move chosen group within list" msgstr "déplacer dans la liste le groupe choisi" -#: src/lang.c:390 +#: src/lang.c:383 msgid "choose next group with unread news" msgstr "choisir groupe suivant ayant articles non lus" -#: src/lang.c:391 src/lang.c:1173 +#: src/lang.c:384 src/lang.c:1165 msgid "quit" msgstr "quitter" -#: src/lang.c:392 +#: src/lang.c:385 msgid "quit without saving configuration changes" msgstr "quitter sans enregistrer les changements" -#: src/lang.c:393 +#: src/lang.c:386 msgid "read chosen group" msgstr "lire le groupe choisi" -#: src/lang.c:394 +#: src/lang.c:387 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:395 +#: src/lang.c:388 msgid "search backwards for a group name" msgstr "recherche arrière d'un groupe" -#: src/lang.c:396 +#: src/lang.c:389 msgid " \t (all searches are case-insensitive and wrap around)" msgstr " \t (les recherches sont sensibles à la casse)" -#: src/lang.c:397 +#: src/lang.c:390 msgid "search forwards for a group name" msgstr "recherche avant d'un groupe" -#: src/lang.c:398 +#: src/lang.c:391 msgid "subscribe to chosen group" msgstr "abonnement au groupe choisi" -#: src/lang.c:399 +#: src/lang.c:392 msgid "subscribe to groups that match pattern" msgstr "abonnement aux groupes correspondant au critère" -#: src/lang.c:400 +#: src/lang.c:393 msgid "reread active file to check for any new news" msgstr "relire le fichier active pour vérifier nouveaux articles" -#: src/lang.c:401 +#: src/lang.c:394 msgid "toggle display of group name only or group name plus description" msgstr "" -#: src/lang.c:402 +#: src/lang.c:395 msgid "toggle display to show all/unread subscribed groups" msgstr "afficher ou non tous les groupes abonnés non lu" -#: src/lang.c:403 +#: src/lang.c:396 msgid "unsubscribe from chosen group" msgstr "désabonnement du groupe choisi" -#: src/lang.c:404 +#: src/lang.c:397 msgid "unsubscribe from groups that match pattern" msgstr "désabonnement aux groupes correspondant au critère" -#: src/lang.c:405 +#: src/lang.c:398 msgid "sort the list of groups" msgstr "trier la liste des groupes" -#: src/lang.c:406 +#: src/lang.c:399 msgid "toggle display to show all/subscribed groups" msgstr "afficher ou non tous les groupes abonnés" -#: src/lang.c:407 +#: src/lang.c:400 msgid "0 - 9\t choose article by number" msgstr "0 - 9\t choisir article par numéro" -#: src/lang.c:408 +#: src/lang.c:401 msgid "mark thread as read and return to group index page" msgstr "marquer le fil comme lu et revenir à la liste des groupes" -#: src/lang.c:409 +#: src/lang.c:402 msgid "mark thread as read and enter next unread thread or group" msgstr "marquer le fil comme lu et aller dans le fil ou groupe non lu suivant" -#: src/lang.c:410 +#: src/lang.c:403 msgid "choose first article in list" msgstr "choisir le 1er article dans la liste" -#: src/lang.c:411 +#: src/lang.c:404 msgid "choose last article in list" msgstr "choisir le dernier article dans la liste" -#: src/lang.c:412 +#: src/lang.c:405 msgid "mark article or tagged articles as read and move cursor to next unread article" msgstr "" -#: src/lang.c:415 +#: src/lang.c:406 +msgid "read chosen article" +msgstr "lire l'article choisi" + +#: src/lang.c:407 msgid "Display properties\n" "------------------" msgstr "Propriétés de l'affichage\n" "-------------------------" -#: src/lang.c:416 +#: src/lang.c:408 msgid "Miscellaneous\n" "-------------" msgstr "Divers\n" "------" -#: src/lang.c:417 +#: src/lang.c:409 msgid "Moving around\n" "-------------" msgstr "Navigation\n" "----------" -#: src/lang.c:418 +#: src/lang.c:410 msgid "Group/thread/article operations\n" "-------------------------------" msgstr "Opérations sur les Groupes/fils/articles\n" "----------------------------------------" -#: src/lang.c:420 +#: src/lang.c:412 msgid "Group Level Commands" msgstr "Commandes du niveau Groupe" -#: src/lang.c:421 +#: src/lang.c:413 msgid "Kill filter added" msgstr "Filtre ajouté" -#: src/lang.c:422 +#: src/lang.c:414 msgid "Auto-selection filter added" msgstr "Filtre à auto-sélection ajouté" -#: src/lang.c:423 +#: src/lang.c:415 msgid "All parts tagged" msgstr "Toutes les parties sont marquées" -#: src/lang.c:424 +#: src/lang.c:416 msgid "Storing article for later posting" -msgstr "Stockage de l'article afin de la poster plus tard" +msgstr "Stockage de l'article afin de le poster plus tard" -#: src/lang.c:425 +#: src/lang.c:417 msgid "Please enter a valid character" msgstr "Entrez un caractère valide svp" -#: src/lang.c:426 +#: src/lang.c:418 #, c-format msgid "Missing part #%d" msgstr "Partie manquante #%d" -#: src/lang.c:427 +#: src/lang.c:419 msgid "*** No postponed articles ***" msgstr "*** Pas de brouillons ***" -#: src/lang.c:428 +#: src/lang.c:420 msgid "Not a multi-part message" msgstr "N'est pas un message en plusieurs parties" -#: src/lang.c:429 +#: src/lang.c:421 msgid "You are not subscribed to this group" msgstr "Vous n'êtes pas abonné à ce groupe" -#: src/lang.c:430 +#: src/lang.c:422 msgid "No previous expression" msgstr "Pas d'expression précédente" -#: src/lang.c:431 +#: src/lang.c:423 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:433 +#: src/lang.c:425 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d brouillon(s) %s, réutilisez-les avec ^O...\n" -#: src/lang.c:434 +#: src/lang.c:426 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" @@ -1778,21 +1806,21 @@ msgstr "X-Conversion-Note : contenus mul "dans\n" " le Menu Option.\n" -#: src/lang.c:436 +#: src/lang.c:428 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Enregistrer le fichier sous %s %s est une bàl. PJ non enregistrée" -#: src/lang.c:437 +#: src/lang.c:429 msgid "TeX2Iso encoded article" msgstr "Article encodé en TeX2Iso" -#: src/lang.c:438 +#: src/lang.c:430 msgid "incomplete " msgstr "incomplet " #. TODO: replace hardcoded key-names -#: src/lang.c:440 +#: src/lang.c:432 #, c-format msgid "\n" "Welcome to %s, a full screen threaded Netnews reader. It can read news " @@ -1827,7 +1855,7 @@ msgid "\n" "files.\n" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "\n" - "Bienvenue dans %s, un lecteur de forums UseNet. Pouvant également lire un " + "Bienvenue dans %s, un lecteur de groupes UseNet. Pouvant également lire un " "spool local\n" "(p.e. /news) ou depuis un serveur NNTP (Network News Transport " "Protocol) distant (avec l'option -r). L'option -h liste les options " @@ -1855,129 +1883,129 @@ msgstr "\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:456 +#: src/lang.c:448 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "Ligne From: %s invalide. Lisez le fichier INSTALL une 2e fois." -#: src/lang.c:457 +#: src/lang.c:449 #, c-format msgid "Invalid Sender:-header %s" msgstr "En-tête Sender: %s invalide" -#: src/lang.c:458 +#: src/lang.c:450 msgid "Inverse video disabled" msgstr "Vidéo inversée désactivée" -#: src/lang.c:459 +#: src/lang.c:451 msgid "Inverse video enabled" msgstr "Vidéo inversée activée" -#: src/lang.c:461 +#: src/lang.c:453 #, c-format msgid "Missing definition for %s\n" msgstr "Définition manquante pour %s\n" -#: src/lang.c:462 +#: src/lang.c:454 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Définition de clé invalide '%s'\n" -#: src/lang.c:463 +#: src/lang.c:455 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Nom de clé invalide '%s'\n" -#: src/lang.c:464 +#: src/lang.c:456 #, 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:465 +#: src/lang.c:457 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "" -#: src/lang.c:466 +#: src/lang.c:458 msgid "Kill Lines: (num): " msgstr "" -#: src/lang.c:467 +#: src/lang.c:459 msgid "Kill Article Menu" msgstr "" -#: src/lang.c:468 +#: src/lang.c:460 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:469 +#: src/lang.c:461 msgid "Kill pattern scope : " msgstr "" -#: src/lang.c:470 +#: src/lang.c:462 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "" -#: src/lang.c:471 +#: src/lang.c:463 msgid "Kill text pattern : " msgstr "" -#: src/lang.c:472 +#: src/lang.c:464 msgid "Kill time in days : " msgstr "" -#: src/lang.c:474 +#: src/lang.c:466 msgid "Last" msgstr "Dernier" -#: src/lang.c:475 +#: src/lang.c:467 msgid "-- Last response --" msgstr "-- Dernière réponse --" -#: src/lang.c:476 +#: src/lang.c:468 #, c-format msgid "Lines %s " msgstr "Ligne %s " -#: src/lang.c:478 +#: src/lang.c:470 msgid "Message-ID: line " msgstr "" -#: src/lang.c:480 +#: src/lang.c:472 msgid "mailbox " msgstr "bàl" -#: src/lang.c:481 +#: src/lang.c:473 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Envoyer article(s) à [%.*s]> " -#: src/lang.c:482 +#: src/lang.c:474 #, c-format msgid "Mailing log to %s\n" msgstr "Envoi de l'historique à %s\n" -#: src/lang.c:483 +#: src/lang.c:475 msgid "Mail bug report..." msgstr "Envoi d'un rapport de bug..." -#: src/lang.c:484 +#: src/lang.c:476 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Envoyer RAPPORT DE BUG à %s ?" -#: src/lang.c:485 +#: src/lang.c:477 msgid "Mailed" msgstr "Envoyé" -#: src/lang.c:486 +#: src/lang.c:478 #, c-format msgid "Mailing to %s..." msgstr "Envoi à %s..." -#: src/lang.c:487 +#: src/lang.c:479 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" @@ -1988,283 +2016,283 @@ msgstr "# [Envoyer/Enregistrer] fichier "# Le 4ème champ est le répertoire racine utilisé\n" "# (p.e. ~/Mail ou ~/News)\n" -#: src/lang.c:490 +#: src/lang.c:482 #, c-format msgid "%s marked as unread" msgstr "%s marqué comme non lu" -#: src/lang.c:491 +#: src/lang.c:483 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "%d marqué(s) sur %d sélectionné(s) %s comme lu(s)" -#: src/lang.c:492 +#: src/lang.c:484 #, c-format msgid "Mark all articles as read%s?" msgstr "Marquer tous les articles comme lus%s ?" -#: src/lang.c:493 +#: src/lang.c:485 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "Marquer %s=art. marqués, %s=article actuel, %s=quitter : " -#: src/lang.c:494 +#: src/lang.c:486 #, c-format -msgid "Mark group %.*s as read?" -msgstr "Marquer le groupe %.*s comme lu ?" +msgid "Mark group %s as read?" +msgstr "Marquer le groupe %s comme lu ?" -#: src/lang.c:495 +#: src/lang.c:487 #, c-format msgid "Mark thread as read%s?" msgstr "Marquer le fil comme lu%s ?" -#: src/lang.c:496 +#: src/lang.c:488 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "Marquer %s=art./fils marqués, %s=fil actuel, %s=quitter : " -#: src/lang.c:497 +#: src/lang.c:489 #, c-format msgid "Matching %s groups..." msgstr "%s groupes correspondants..." -#: src/lang.c:498 src/lang.c:502 +#: src/lang.c:490 src/lang.c:494 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=régler l'actuel à n; %s=non lu suivant; %s=rech. terme; %s=filtrer/sél." -#: src/lang.c:499 +#: src/lang.c:491 #, 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=bas; %s=haut; %s=marquer lu; %s=voir fil" -#: src/lang.c:500 +#: src/lang.c:492 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=haut; %s=bas; %s=haut de page; %s=bas de page; %s=haut; %s=bas" -#: src/lang.c:501 +#: src/lang.c:493 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=recherche avant; %s=recherche arrière; %s=quitter" -#: src/lang.c:503 +#: src/lang.c:495 #, 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" -#: src/lang.c:504 +#: src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=passer actuel à n; %s=non lu suivant; %s,%s=rech. terme; %s=tout lu" -#: src/lang.c:505 +#: src/lang.c:497 #, c-format msgid "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "%s=bas; %s=haut; %s=aide; %s=déplacer; %s=quitter; %s=voir lu/non lu" -#: src/lang.c:506 +#: src/lang.c:498 #, 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:507 +#: src/lang.c:499 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=passer l'actuel à n; %s=non lu suivant; %s=tout lu; %s=basculer " "l'affichage" -#: src/lang.c:508 +#: src/lang.c:500 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=aide; %s=bas; %s=haut; %s=quitter; %s=marquer; %s=marquer non lu" -#: src/lang.c:509 +#: src/lang.c:501 msgid "--More--" msgstr "-- Plus --" -#: src/lang.c:510 +#: src/lang.c:502 #, c-format msgid "Moving %s..." msgstr "Déplacement de %s..." -#: src/lang.c:512 +#: src/lang.c:504 msgid ", name: " msgstr ", nom : " -#: src/lang.c:513 +#: src/lang.c:505 #, c-format msgid "Goto newsgroup [%s]> " msgstr "Aller dans le groupe [%s]> " -#: src/lang.c:514 +#: src/lang.c:506 msgid "newsgroups" msgstr "groupes" -#: src/lang.c:515 +#: src/lang.c:507 #, 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:516 +#: src/lang.c:508 msgid "newsgroup" msgstr "groupe" -#: src/lang.c:517 +#: src/lang.c:509 msgid "Try and save newsrc file again?" msgstr "Encore essayer et enregistrer le newsrc ?" -#: src/lang.c:518 +#: src/lang.c:510 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:519 +#: src/lang.c:511 msgid "newsrc file saved successfully.\n" msgstr "le newsrc a été enregistré avec succès.\n" -#: src/lang.c:520 +#: src/lang.c:512 msgid "-- Next response --" msgstr "-- Réponse suivante --" -#: src/lang.c:521 +#: src/lang.c:513 #, c-format msgid "NNTP authorization password not found for %s" msgstr "Mot de passe NNTP introuvable pour %s" -#: src/lang.c:522 +#: src/lang.c:514 msgid "No " msgstr "Non " -#: src/lang.c:523 +#: src/lang.c:515 msgid "*** No articles ***" msgstr "*** Pas d'articles ***" -#: src/lang.c:524 +#: src/lang.c:516 msgid "No articles have been posted" msgstr "Aucun article n'a été posté" -#: src/lang.c:525 +#: src/lang.c:517 msgid "*** No description ***" msgstr "*** Pas de description ***" -#: src/lang.c:526 +#: src/lang.c:518 msgid "No filename" msgstr "Pas de nom de fichier" -#: src/lang.c:527 +#: src/lang.c:519 msgid "No group" msgstr "Pas de groupe" -#: src/lang.c:528 +#: src/lang.c:520 msgid "*** No groups ***" msgstr "*** Pas de groupes ***" -#: src/lang.c:529 +#: src/lang.c:521 msgid "No more groups to read" msgstr "Plus de groupes à lire" -#: src/lang.c:530 +#: src/lang.c:522 msgid "No last message" msgstr "Pas de dernier message" -#: src/lang.c:531 +#: src/lang.c:523 msgid "No mail address" msgstr "Pas d'adresse email" -#: src/lang.c:532 +#: src/lang.c:524 msgid "No articles marked for saving" msgstr "Pas d'articles marqués à enregistrer" -#: src/lang.c:533 +#: src/lang.c:525 msgid "No match" msgstr "Pas de résultat" -#: src/lang.c:534 +#: src/lang.c:526 msgid "No more groups" msgstr "Plus de groupes" -#: src/lang.c:535 +#: src/lang.c:527 msgid "No newsgroups" msgstr "Pas de groupes" -#: src/lang.c:536 +#: src/lang.c:528 msgid "No next unread article" msgstr "Pas d'article non lu suivant" -#: src/lang.c:537 +#: src/lang.c:529 msgid "No previous group" msgstr "Pas de groupe précédent" -#: src/lang.c:538 +#: src/lang.c:530 msgid "No previous unread article" msgstr "Pas d'article non lu précédent" -#: src/lang.c:539 +#: src/lang.c:531 msgid "No responses" msgstr "Pas de réponses" -#: src/lang.c:540 +#: src/lang.c:532 msgid "No responses to list in current thread" msgstr "Pas de réponses à afficher dans le fil actuel" -#: src/lang.c:541 +#: src/lang.c:533 msgid "No search string" msgstr "Pas de termes à rechercher" -#: src/lang.c:542 +#: src/lang.c:534 msgid "No subject" msgstr "Pas de sujet" -#: src/lang.c:543 +#: src/lang.c:535 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Terminal doit avoir la fonction clear to end-of-line (ce)\n" -#: src/lang.c:544 +#: src/lang.c:536 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: Terminal doit avoir la fonction clear to end-of-screen (cd)\n" -#: src/lang.c:545 +#: src/lang.c:537 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminal doit avoir la fonction clearscreen (cl)\n" -#: src/lang.c:546 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal doit avoir la fonction cursor motion (cm)\n" -#: src/lang.c:547 +#: src/lang.c:539 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s: la variable TERM doit être utilisée pour utiliser les fonctions\n" -#: src/lang.c:548 +#: src/lang.c:540 #, c-format msgid "No viewer found for %s/%s\n" msgstr "Visualiseur introuvable pour %s/%s\n" -#: src/lang.c:549 +#: src/lang.c:541 msgid "Newsgroup does not exist on this server" msgstr "Groupe inexistant sur ce serveur" -#: src/lang.c:550 +#: src/lang.c:542 #, c-format msgid "Group %s not found in active file" msgstr "Groupe %s introuvable dans le fichier active" -#: src/lang.c:551 +#: src/lang.c:543 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:552 +#: src/lang.c:544 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:553 +#: src/lang.c:545 #, c-format msgid "# NNTP-server -> newsrc translation table and NNTP-server\n" "# shortname list for %s %s\n" @@ -2292,40 +2320,40 @@ msgstr "# Serveur-NNTP -> tableau de cor "# news.ka.nu /tmp/nrc-nu kanu nu\n" "#\n" -#: src/lang.c:560 +#: src/lang.c:552 msgid "Only" msgstr "Uniquement" -#: src/lang.c:561 +#: src/lang.c:553 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Option non activée. Recompilez avec %s." -#: src/lang.c:562 +#: src/lang.c:554 msgid "Options Menu" msgstr "Menu Options" -#: src/lang.c:565 +#: src/lang.c:557 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Erreur dans la regex : %s à %d '%s'" -#: src/lang.c:566 +#: src/lang.c:558 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Erreur dans la regex : erreur pcre interne %d" -#: src/lang.c:567 +#: src/lang.c:559 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Erreur dans la regex : study - erreur pcre interne %s" -#: src/lang.c:568 +#: src/lang.c:560 msgid "Post a followup..." msgstr "Postage du suivi..." #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:570 +#: src/lang.c:562 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" @@ -2333,270 +2361,270 @@ 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:573 +#: src/lang.c:565 msgid "Posted articles history" msgstr "Historique des articles postés" -#: src/lang.c:574 +#: src/lang.c:566 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Poster dans groupe(s) [%s]> " -#: src/lang.c:575 +#: src/lang.c:567 msgid "-- post processing started --" msgstr "-- post-traitement lancé --" -#: src/lang.c:576 +#: src/lang.c:568 msgid "-- post processing completed --" msgstr "-- post-traitement terminé --" -#: src/lang.c:577 +#: src/lang.c:569 #, c-format msgid "Post subject [%s]> " msgstr "Poster le sujet [%s]> " -#: src/lang.c:578 +#: src/lang.c:570 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:579 +#: src/lang.c:571 msgid "Posting article..." msgstr "Postage de l'article..." -#: src/lang.c:580 -msgid "Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): " -msgstr "Poster les brouillons [%%.*s] ? (%s/%s/%s/%s/%s) : " +#: src/lang.c:572 +msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " +msgstr "Poster les brouillons [%%s] ? (%s/%s/%s/%s/%s) : " -#: src/lang.c:581 +#: src/lang.c:573 #, c-format msgid "Hot %s" msgstr "%s sélectionné" -#: src/lang.c:582 +#: src/lang.c:574 #, c-format msgid "Tagged %s" msgstr "%s marqué" -#: src/lang.c:583 +#: src/lang.c:575 #, c-format msgid "Untagged %s" msgstr "%s non marqué" -#: src/lang.c:584 +#: src/lang.c:576 msgid "Processing mail messages marked for deletion." msgstr "Traitement des emails enregistrés marqués pour effacement." -#: src/lang.c:585 +#: src/lang.c:577 msgid "Processing saved articles marked for deletion." msgstr "Traitement des articles enregistrés marqués pour effacement." -#: src/lang.c:586 +#: src/lang.c:578 #, 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:587 +#: src/lang.c:579 msgid "Article unchanged, abort mailing?" msgstr "Article inchangé, annuler l'envoi ?" -#: src/lang.c:588 +#: src/lang.c:580 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Voulez-vous voir les brouillons (%d) ?" -#: src/lang.c:590 +#: src/lang.c:582 msgid "Add quick kill filter?" msgstr "Ajout rapide d'un filtre d'élimination ?" -#: src/lang.c:591 +#: src/lang.c:583 msgid "Add quick selection filter?" msgstr "Ajout rapide d'un filtre de sélection ?" -#: src/lang.c:592 +#: src/lang.c:584 msgid "Do you really want to quit?" msgstr "Voulez-vous réellement quitter ?" -#: src/lang.c:593 -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:585 +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:594 +#: src/lang.c:586 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:595 +#: src/lang.c:587 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=brouillon : " -#: src/lang.c:596 +#: src/lang.c:588 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=quitter, %s=éditer, %s=enregistrer description du filtre : " -#: src/lang.c:597 +#: src/lang.c:589 #, 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:598 +#: src/lang.c:590 msgid "Do you really want to quit without saving your configuration?" msgstr "Voulez-vous réellement quitter sans enregistrer votre configuration ?" -#: src/lang.c:601 +#: src/lang.c:593 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Champ invalide - '0-9.$' pe. 1-$ est valide" -#: src/lang.c:602 +#: src/lang.c:594 msgid "Do you want to abort this operation?" msgstr "Voulez-vous annuler cette opération ?" -#: src/lang.c:603 +#: src/lang.c:595 msgid "Do you want to exit tin immediately?" msgstr "Voulez-vous quitter tin immédiatement ?" -#: src/lang.c:604 +#: src/lang.c:596 msgid "Read response> " msgstr "Lire la réponse> " -#: src/lang.c:605 +#: src/lang.c:597 msgid "Reading ('q' to quit)..." msgstr "Lecture ('q' pour quitter)..." -#: src/lang.c:606 +#: src/lang.c:598 #, c-format msgid "Reading %sarticles..." msgstr "Lecture de %sarticles..." -#: src/lang.c:607 +#: src/lang.c:599 #, c-format msgid "Reading %sattributes file...\n" msgstr "Lecture du fichier %sattributes...\n" -#: src/lang.c:608 +#: src/lang.c:600 #, c-format msgid "Reading %sconfig file...\n" msgstr "Lecture du fichier %sconfig...\n" -#: src/lang.c:609 +#: src/lang.c:601 msgid "Reading filter file...\n" msgstr "Lecture du fichier filter...\n" -#: src/lang.c:610 +#: src/lang.c:602 #, c-format msgid "Reading %s groups..." msgstr "Lecture de %s groupes..." -#: src/lang.c:611 +#: src/lang.c:603 msgid "Reading input history file...\n" msgstr "Lecture du fichier d'historique...\n" -#: src/lang.c:612 +#: src/lang.c:604 msgid "Reading keymap file...\n" msgstr "Lecture du fichier keymap...\n" -#: src/lang.c:613 +#: src/lang.c:605 msgid "Reading groups from active file... " msgstr "Lecture des groupes depuis le fichier active... " -#: src/lang.c:614 +#: src/lang.c:606 msgid "Reading groups from newsrc file... " msgstr "Lecture des groupes depuis le fichier newsrc... " -#: src/lang.c:615 +#: src/lang.c:607 msgid "Reading newsgroups file... " msgstr "Lecture du fichier newsgroups... " -#: src/lang.c:616 +#: src/lang.c:608 msgid "Reading newsrc file..." msgstr "Lecture du fichier newsrc..." -#: src/lang.c:617 +#: src/lang.c:609 #, c-format msgid "Bogus group %s removed." msgstr "Effacement du groupe corrompu %s." -#: src/lang.c:618 +#: src/lang.c:610 #, c-format msgid "Error: rename %s to %s" msgstr "Erreur : renommer %s à %s" -#: src/lang.c:619 +#: src/lang.c:611 msgid "Reply to author..." msgstr "Répondre à l'auteur..." -#: src/lang.c:620 +#: src/lang.c:612 msgid "Repost" msgstr "Reposter" -#: src/lang.c:621 +#: src/lang.c:613 msgid "Reposting article..." msgstr "Repostage de l'article..." -#: src/lang.c:622 +#: src/lang.c:614 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Reposter article(s) dans groupe(s) [%s]> " -#: src/lang.c:623 +#: src/lang.c:615 msgid "Reset newsrc?" msgstr "Réinitialiser newsrc ?" -#: src/lang.c:624 +#: src/lang.c:616 msgid "Responses have been directed to the following newsgroups" msgstr "Les réponses ont été redirigées vers les groupes suivants" -#: src/lang.c:625 +#: src/lang.c:617 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "Les réponses ont été redirigées à l'auteur. %s=mail, %s=poster, %s=quitter : " -#: src/lang.c:626 +#: src/lang.c:618 #, c-format msgid "RespNo %4d of %4d" msgstr "Nbre rép. %4d/%4d" -#: src/lang.c:627 +#: src/lang.c:619 msgid "Press to continue..." msgstr "Appuyez sur pour continuer..." -#: src/lang.c:629 +#: src/lang.c:621 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:630 +#: src/lang.c:622 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:631 +#: src/lang.c:623 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:632 +#: src/lang.c:624 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:633 +#: src/lang.c:625 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:634 +#: src/lang.c:626 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Sél. Sujet [%s] (o/n) : " -#: src/lang.c:635 +#: src/lang.c:627 msgid "Select text pattern : " msgstr "" -#: src/lang.c:636 +#: src/lang.c:628 msgid "Select time in days : " msgstr "Durée en jours : " -#: src/lang.c:637 +#: src/lang.c:629 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2606,221 +2634,227 @@ msgid "# %s server configuration file\n" "# Do not edit at all if you don't know what you do.\n" "############################################################################\n" "\n" -msgstr "" +msgstr "# Fichier de configuration serveur de %s\n" + "# Ce fichier a été automatiquement enregistré par %s %s %s (\"%s\")\n" + "#\n" + "# N'éditez pas ce fichier lorsque %s est ouvert, car tout changement apporté\n" + "# sera écrasé lorsque vous quitterez %s.\n" + "# Enfin, ne touchez pas à ce fichier si vous ne savez pas quoi y faire.\n" + "############################################################################\n" -#: src/lang.c:643 +#: src/lang.c:635 msgid "Showing unread groups only" msgstr "Afficher uniquement les groupes non lus" -#: src/lang.c:644 +#: src/lang.c:636 msgid "Subject: line (ignore case) " -msgstr "Ligne Sujet: (casse insensible)" +msgstr "Ligne Subject: (casse insensible)" -#: src/lang.c:645 +#: src/lang.c:637 msgid "Subject: line (case sensitive)" -msgstr "Ligne Sujet: (casse sensible) " +msgstr "Ligne Subject: (casse sensible) " -#: src/lang.c:646 +#: src/lang.c:638 msgid "Save" msgstr "Enregistrer" -#: src/lang.c:647 +#: src/lang.c:639 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Enregistrer '%s' (%s/%s) ?" -#: src/lang.c:648 +#: src/lang.c:640 msgid "Save configuration before continuing?" msgstr "Enregistrer la configuration avant de continuer ?" -#: src/lang.c:649 +#: src/lang.c:641 msgid "Save filename> " msgstr "Enregistrer sous le nom de fichier> " -#: src/lang.c:650 +#: src/lang.c:642 msgid "Saved" msgstr "Enregistré" -#: src/lang.c:651 +#: src/lang.c:643 #, 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:652 +#: src/lang.c:644 #, c-format msgid "Saved %s...\n" msgstr "Enregistrement de %s...\n" -#: src/lang.c:653 +#: src/lang.c:645 msgid "Nothing was saved" msgstr "Rien n'a été enregistré" -#: src/lang.c:654 +#: src/lang.c:646 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s de %d %s\n" -#: src/lang.c:655 +#: src/lang.c:647 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s enregistré dans %s%s --" -#: src/lang.c:656 +#: src/lang.c:648 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s enregistré dans %s - %s --" -#: src/lang.c:657 +#: src/lang.c:649 msgid "Saving..." msgstr "Enregistrement..." -#: src/lang.c:658 +#: src/lang.c:650 #, c-format msgid "%s: Screen initialization failed" msgstr "%s : Échec de l'initialisation de l'écran" -#: src/lang.c:659 +#: src/lang.c:651 #, c-format msgid "%s: screen is too small\n" msgstr "%s : l'écran est trop petit\n" -#: src/lang.c:660 +#: src/lang.c:652 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "l'écran est trop petit, %s quitte\n" -#: src/lang.c:661 +#: src/lang.c:653 #, c-format msgid "Search backwards [%s]> " msgstr "Recherche arrière [%s]> " -#: src/lang.c:662 +#: src/lang.c:654 #, c-format msgid "Search body [%s]> " msgstr "Rechercher dans le corps [%s]> " -#: src/lang.c:663 +#: src/lang.c:655 #, c-format msgid "Search forwards [%s]> " msgstr "Recherche avant [%s]> " -#: src/lang.c:664 +#: src/lang.c:656 msgid "Searching..." msgstr "Recherche..." -#: src/lang.c:665 +#: src/lang.c:657 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Recherche article %d sur %d ('q' pour annuler)..." -#: src/lang.c:666 +#: src/lang.c:658 msgid "Select article> " msgstr "Sélectionner l'article> " # TRANSLATION TOO LONG (75 chars max) -#: src/lang.c:667 +#: src/lang.c:659 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "Sélection n° avant le texte ou utiliser les flèches et . 'q' pour quitter." -#: src/lang.c:668 +#: src/lang.c:660 msgid "Select group> " msgstr "Sélectionner le groupe> " -#: src/lang.c:669 +#: src/lang.c:661 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Entrez le critère de sélection [%s]> " -#: src/lang.c:670 +#: src/lang.c:662 msgid "Select thread > " msgstr "Sélectionner le fil > " -#: src/lang.c:671 +#: src/lang.c:663 #, 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:672 +#: src/lang.c:664 msgid "servers active-file" msgstr "fichier active des serveurs" -#: src/lang.c:673 +#: src/lang.c:665 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Déplacement dans nouveaux groupes impossible. Abonnez-vous d'abord..." -#: src/lang.c:674 +#: src/lang.c:666 msgid "" msgstr "" -#: src/lang.c:675 +#: src/lang.c:667 #, c-format msgid "Starting: (%s)" msgstr "Démarrage : (%s)" -#: src/lang.c:676 +#: src/lang.c:668 #, c-format msgid "List Thread (%d of %d)" msgstr "Afficher le fil (%d sur %d)" -#: src/lang.c:677 +#: src/lang.c:669 #, c-format msgid "Thread (%.*s)" msgstr "Fil (%.*s)" -#: src/lang.c:678 +#: src/lang.c:670 msgid "Enter wildcard subscribe pattern> " msgstr "Entrer un caractère joker comme critère> " -#: src/lang.c:679 +#: src/lang.c:671 #, c-format msgid "subscribed to %d groups" msgstr "Abonné à %d groupes" -#: src/lang.c:680 +#: src/lang.c:672 #, c-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: src/lang.c:681 +#: src/lang.c:673 msgid "Subscribing... " msgstr "Abonnement..." -#: src/lang.c:682 -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:674 +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:683 +#: src/lang.c:675 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Remplacer le(s) article(s) du(es) groupe(s) [%s]> " -#: src/lang.c:684 +#: src/lang.c:676 msgid "Superseding article ..." msgstr "Remplacement de l'article..." -#: src/lang.c:685 +#: src/lang.c:677 #, c-format msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "\n" "Arrêté. Tapez 'fg' pour relancer %s\n" -#: src/lang.c:687 +#: src/lang.c:679 #, c-format msgid "%d days" msgstr "%d jours" -#: src/lang.c:688 +#: src/lang.c:680 msgid "" msgstr "" -#: src/lang.c:689 +#: src/lang.c:681 msgid "# Default action/prompt strings\n" msgstr "# Termes action/prompt par défaut\n" -#: src/lang.c:690 +#: src/lang.c:682 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" @@ -2838,266 +2872,266 @@ msgstr "# Réglages par défaut pour les f "# 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:703 +#: src/lang.c:695 msgid "# If ON use print current subject or newsgroup description in the last line\n" msgstr "# Si ON affiche le sujet actuel ou la description du groupe dans la dernière " "ligne\n" -#: src/lang.c:704 +#: src/lang.c:696 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "# Info sur l'hôte & l'heure utilisées pour détecter les nouveaux groupes (ne " "pas toucher)\n" -#: src/lang.c:705 +#: src/lang.c:697 msgid "There is no news\n" msgstr "Rien de neuf\n" -#: src/lang.c:706 +#: src/lang.c:698 msgid "Thread" msgstr "Fil" -#: src/lang.c:707 +#: src/lang.c:699 msgid "Thread Level Commands" msgstr "Commandes pour fil" -#: src/lang.c:708 +#: src/lang.c:700 msgid "Thread deselected" msgstr "Fil désélectionné" -#: src/lang.c:709 +#: src/lang.c:701 msgid "Thread selected" msgstr "Fil sélectionné" -#: src/lang.c:710 +#: src/lang.c:702 msgid "threads" msgstr "fils" -#: src/lang.c:711 +#: src/lang.c:703 msgid "Thread range" msgstr "Champ du fil" -#: src/lang.c:712 +#: src/lang.c:704 msgid "thread" msgstr "fil" -#: src/lang.c:713 +#: src/lang.c:705 #, c-format msgid "Thread %4s of %4s" msgstr "Fil %4s de %4s" -#: src/lang.c:714 +#: src/lang.c:706 msgid "Threading articles..." msgstr "Regroupement des articles..." -#: src/lang.c:715 +#: src/lang.c:707 #, c-format msgid "Toggled word highlighting %s" msgstr "(Dés)activer surbrillance %s" -#: src/lang.c:716 +#: src/lang.c:708 msgid "Toggled rot13 encoding" msgstr "(Dés)activer codage rot13" -#: src/lang.c:717 +#: src/lang.c:709 #, c-format msgid "Toggled german TeX encoding %s" msgstr "(Dés)activer codage TeX Allemand %s" -#: src/lang.c:718 +#: src/lang.c:710 #, c-format msgid "Toggled tab-width to %d" msgstr "(Dés)activer largeur de tabulation à %d" -#: src/lang.c:719 +#: src/lang.c:711 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d essaye de déverrouiller %s" -#: src/lang.c:720 +#: src/lang.c:712 #, c-format msgid "%d Trying to lock %s" msgstr "%d essaye de verrouiller %s" -#: src/lang.c:721 +#: src/lang.c:713 msgid " h=help\n" msgstr " h=aide\n" -#: src/lang.c:723 +#: src/lang.c:715 msgid "Unlimited" msgstr "Illimité" -#: src/lang.c:724 +#: src/lang.c:716 msgid "Enter wildcard unsubscribe pattern> " msgstr "Terme joker pour se désabonner> " -#: src/lang.c:725 +#: src/lang.c:717 #, c-format msgid "Error decoding %s : %s" msgstr "Erreur lors du décodage de %s : %s" -#: src/lang.c:726 +#: src/lang.c:718 msgid "No end." msgstr "Pas de fin." -#: src/lang.c:727 +#: src/lang.c:719 #, c-format msgid "%s successfully decoded." msgstr "%s décodé avec succès." -#: src/lang.c:728 +#: src/lang.c:720 #, 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:729 +#: src/lang.c:721 msgid "unread " msgstr "non lu" -#: src/lang.c:730 +#: src/lang.c:722 #, c-format msgid "unsubscribed from %d groups" msgstr "désabonné de %d groupes" -#: src/lang.c:731 +#: src/lang.c:723 #, c-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: src/lang.c:732 +#: src/lang.c:724 msgid "Unsubscribing... " msgstr "Désabonnement..." -#: src/lang.c:733 +#: src/lang.c:725 msgid "Unthreading articles..." msgstr "Dégroupement des articles..." -#: src/lang.c:734 +#: src/lang.c:726 msgid "Updated" msgstr "Mis à jour" -#: src/lang.c:735 +#: src/lang.c:727 msgid "Updating" msgstr "Rafraîchissement" -#: src/lang.c:736 +#: src/lang.c:728 #, c-format msgid "Opening %s\n" msgstr "Ouverture %s\n" -#: src/lang.c:737 +#: src/lang.c:729 msgid "No more URL's in this article" msgstr "Plus d'URL dans cet article" -#: src/lang.c:738 +#: src/lang.c:730 msgid "Use MIME display program for this message?" msgstr "Utiliser le programme d'affichage MIME pour ce message ?" -#: src/lang.c:739 +#: src/lang.c:731 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:740 +#: src/lang.c:732 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:741 +#: src/lang.c:733 msgid " -q don't check for new newsgroups" msgstr " -q ne pas vérifier s'il y a des nouveaux groupes" -#: src/lang.c:742 +#: src/lang.c:734 msgid " -X don't save any files on quit" msgstr " -X ne pas enregistrer de fichiers à la fermeture" -#: src/lang.c:743 +#: src/lang.c:735 msgid " -d don't show newsgroup descriptions" msgstr " -d ne pas afficher les descriptions des groupes" -#: src/lang.c:744 +#: src/lang.c:736 msgid " -G limit get only limit articles/group" msgstr " -G nombre d'articles par groupe limite" -#: src/lang.c:745 +#: src/lang.c:737 #, c-format msgid " -H help information about %s" msgstr " -H aide à propos de %s" -#: src/lang.c:746 +#: src/lang.c:738 msgid " -h this help message" msgstr " -h ce message d'aide" -#: src/lang.c:747 +#: src/lang.c:739 #, 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:748 +#: src/lang.c:740 msgid " -u update index files (batch mode)" msgstr " -u màj des fichiers index (en tâche de fond)" -#: src/lang.c:749 +#: src/lang.c:741 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr " -m rép. dossier des bàl [défaut=%s]" -#: src/lang.c:750 +#: src/lang.c:742 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Envoyez par mail vos rapports de bugs/suggestions à %s" -#: src/lang.c:751 +#: src/lang.c:743 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:752 +#: src/lang.c:744 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:753 +#: src/lang.c:745 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f fich. abonné au fichier groupes [défaut=%s]" -#: src/lang.c:754 +#: src/lang.c:746 msgid " -x no posting mode" msgstr "" -#: src/lang.c:755 +#: src/lang.c:747 msgid " -w post an article and exit" msgstr "" -#: src/lang.c:756 +#: src/lang.c:748 msgid " -o post all postponed articles and exit" msgstr " -o poster tous les brouillons puis quitter" -#: src/lang.c:757 +#: src/lang.c:749 msgid " -r read news remotely from default NNTP server" msgstr " -r lire les articles depuis le serveur NNTP par défaut" -#: src/lang.c:758 +#: src/lang.c:750 msgid " -R read news saved by -S option" msgstr " -R lire les articles enregistrés via l'option -S" -#: src/lang.c:759 +#: src/lang.c:751 #, 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:760 +#: src/lang.c:752 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:761 +#: src/lang.c:753 msgid " -z start if any unread news" msgstr " -z lancer si articles non lus" -#: src/lang.c:762 +#: src/lang.c:754 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3105,37 +3139,37 @@ msgid "A Usenet reader.\n" msgstr "Un lecteur UseNet.\n" "Usage : %s [options] [groupe[,...]]" -#: src/lang.c:763 +#: src/lang.c:755 msgid " -v verbose output for batch mode options" msgstr " -v sortie détaillée pour options en tâche de fond" -#: src/lang.c:764 +#: src/lang.c:756 msgid " -V print version & date information" msgstr " -V afficher infos date & version" -#: src/lang.c:765 +#: src/lang.c:757 #, 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:766 +#: src/lang.c:758 #, 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:768 +#: src/lang.c:760 #, 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:769 +#: src/lang.c:761 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Vue '%s' (%s/%s) ?" -#: src/lang.c:771 +#: src/lang.c:763 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3145,26 +3179,26 @@ msgstr "\n" ":\n" "%-100s\n" -#: src/lang.c:772 +#: src/lang.c:764 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Attention : article inchangé après son édition\n" -#: src/lang.c:773 +#: src/lang.c:765 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Attention : \"Subject:\" contient que des espaces.\n" -#: src/lang.c:774 +#: src/lang.c:766 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:776 +#: src/lang.c:768 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3172,7 +3206,7 @@ msgstr "\n" "Attention : L'article a \"References:\" mais \"Subject:\" ne commence\n" " avec \"Re: \" et ne contient pas \"(was:\".\n" -#: src/lang.c:779 +#: src/lang.c:771 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3194,7 +3228,7 @@ msgstr "Lisez ceci attentivement !\n" "Voici l'article que vous vous apprêtez à effacer :\n" "\n" -#: src/lang.c:783 +#: src/lang.c:775 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" @@ -3206,7 +3240,7 @@ msgstr "\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:788 +#: src/lang.c:780 #, c-format msgid "\n" "\n" @@ -3219,7 +3253,7 @@ msgstr "\n" "Certaines valeurs dans votre fichier %s ont changé !\n" "Lisez le fichier WHATSNEW, etc...\n" -#: src/lang.c:790 +#: src/lang.c:782 #, c-format msgid "\n" "\n" @@ -3231,7 +3265,7 @@ msgstr "\n" "Certaines valeurs dans votre fichier %s peuvent être ignorés, d'autres\n" "ont peut-être changés !\n" -#: src/lang.c:793 +#: src/lang.c:785 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3244,19 +3278,19 @@ msgstr "Attention : tin a écrit quelque "lors de cette session, cela indique une erreur et vous devriez sauvegarder\n" "votre %s avant de relancer tin !\n" -#: src/lang.c:797 +#: src/lang.c:789 #, 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:798 +#: src/lang.c:790 #, 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:799 +#: src/lang.c:791 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3271,50 +3305,50 @@ msgstr "\n" "d'être\n" " le plus court possible.\n" -#: src/lang.c:803 +#: src/lang.c:795 #, c-format 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:804 +#: src/lang.c:796 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:805 +#: src/lang.c:797 msgid "Writing attributes file..." msgstr "Écriture du fichier attributes..." -#: src/lang.c:807 +#: src/lang.c:799 #, c-format msgid "%d Responses" msgstr "%d Réponses" -#: src/lang.c:809 +#: src/lang.c:801 #, c-format msgid "Added %d %s" msgstr "%d %s ajouté(s)" -#: src/lang.c:810 +#: src/lang.c:802 msgid "No unsubscribed groups to show" msgstr "Pas de groupes désabonnés à afficher" -#: src/lang.c:811 +#: src/lang.c:803 msgid "Showing subscribed to groups only" msgstr "Afficher uniquement les groupes abonnés" -#: src/lang.c:812 +#: src/lang.c:804 msgid "Yes " msgstr "Oui " -#: src/lang.c:813 +#: src/lang.c:805 msgid " You have mail\n" msgstr " Nouveau mail\n" -#: src/lang.c:818 +#: src/lang.c:810 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3333,16 +3367,16 @@ msgstr "\n" " problème, ou bien changer la valeur de MM_NETWORK_CHARSET\n" " via le M)enu.\n" -#: src/lang.c:829 +#: src/lang.c:821 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Clé %s redéfinie '%s' -> '%s'\n" -#: src/lang.c:830 +#: src/lang.c:822 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D mode debug 1=NNTP 2=TOUS" -#: src/lang.c:834 +#: src/lang.c:826 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3369,11 +3403,11 @@ msgstr "Lisez ceci attentivement !\n" "Voici l'article que vous vous apprêtez a effacer :\n" "\n" -#: src/lang.c:843 +#: src/lang.c:835 msgid "toggle color" msgstr "(dés)activer la couleur" -#: src/lang.c:844 +#: src/lang.c:836 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" @@ -3393,44 +3427,44 @@ msgstr "# Pour ajuster les couleurs util "# et l'arrière-plan noir)\n" "\n" -#: src/lang.c:852 +#: src/lang.c:844 msgid " -a toggle color flag" msgstr " -a change la couleur" -#: src/lang.c:856 +#: src/lang.c:848 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:857 +#: src/lang.c:849 #, 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:858 +#: src/lang.c:850 #, 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:860 +#: src/lang.c:852 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:861 +#: src/lang.c:853 #, c-format 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:862 +#: src/lang.c:854 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" @@ -3439,307 +3473,307 @@ msgstr "\n" " apparaître dans ce groupe !\n" "\n" -#: src/lang.c:863 +#: src/lang.c:855 #, c-format 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:867 +#: src/lang.c:859 #, 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:868 +#: src/lang.c:860 msgid "Missing parts." msgstr "Parties manquantes" -#: src/lang.c:869 +#: src/lang.c:861 msgid "No beginning." msgstr "Pas de début." -#: src/lang.c:870 +#: src/lang.c:862 msgid "No data." msgstr "Pas de données." -#: src/lang.c:871 +#: src/lang.c:863 msgid "Unknown error." msgstr "Erreur inconnue." -#: src/lang.c:873 +#: src/lang.c:865 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tSomme de contrôle de %s (%ld %s)" -#: src/lang.c:877 +#: src/lang.c:869 msgid "Reading mail active file... " msgstr "Lecture du fichier active mail... " -#: src/lang.c:878 +#: src/lang.c:870 msgid "Reading mailgroups file... " msgstr "Lecture du fichier mailgroups... " -#: src/lang.c:882 +#: src/lang.c:874 msgid "perform PGP operations on article" msgstr "effectuer des opérations PGP sur l'article" -#: src/lang.c:883 +#: src/lang.c:875 msgid "Add key(s) to public keyring?" msgstr "Ajouter les clé(s) au cercle public ?" -#: src/lang.c:884 +#: src/lang.c:876 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=encodé, %s=signer, %s=les deux, %s=quitter : " -#: src/lang.c:885 +#: src/lang.c:877 #, 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:886 +#: src/lang.c:878 #, 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:887 +#: src/lang.c:879 msgid "Article not signed and no public keys found" msgstr "Article non signé et pas de clés publiques trouvées" -#: src/lang.c:889 +#: src/lang.c:881 #, 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:890 -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:882 +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:891 -msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:883 +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]: " + "[%%s]: " -#: src/lang.c:893 +#: src/lang.c:885 #, 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:894 -msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: " -msgstr "%s=quitter, %s=éditer, %s=pgp, %s=envoyer [%%.*s] : " +#: src/lang.c:886 +msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " +msgstr "%s=quitter, %s=éditer, %s=pgp, %s=envoyer [%%s] : " -#: src/lang.c:895 -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:887 +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:899 +#: src/lang.c:891 #, c-format 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:900 -msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: " -msgstr "%s=quitter, %s=éditer, %s=ispell, %s=envoyer [%%.*s] : " - -#: src/lang.c:901 -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:892 +msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " +msgstr "%s=quitter, %s=éditer, %s=ispell, %s=envoyer [%%s] : " + +#: src/lang.c:893 +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:903 +#: src/lang.c:895 #, c-format 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:904 -msgid "%s=quit, %s=edit, %s=send [%%.*s]: " -msgstr "%s=quitter, %s=éditer, %s=envoyer [%%.*s] : " - -#: src/lang.c:905 -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:896 +msgid "%s=quit, %s=edit, %s=send [%%s]: " +msgstr "%s=quitter, %s=éditer, %s=envoyer [%%s] : " + +#: src/lang.c:897 +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:914 +#: src/lang.c:906 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:915 +#: src/lang.c:907 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:916 +#: src/lang.c:908 msgid "Cannot find NNTP server name" msgstr "Nom du serveur NNTP introuvable" -#: src/lang.c:917 +#: src/lang.c:909 #, c-format msgid "Connecting to %s:%d..." msgstr "Connexion à %s:%d..." -#: src/lang.c:918 +#: src/lang.c:910 msgid "Disconnecting from server...\n" msgstr "Déconnexion du serveur...\n" -#: src/lang.c:919 +#: src/lang.c:911 #, 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:920 +#: src/lang.c:912 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "Échec de la connexion au serveur NNTP %s. Fermeture..." -#: src/lang.c:921 +#: src/lang.c:913 msgid "205 Closing connection" msgstr "205 Fermeture de la connexion" -#: src/lang.c:922 +#: src/lang.c:914 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:923 +#: src/lang.c:915 msgid "Connection to news server has timed out. Reconnect?" msgstr "Connexion au serveur de nouvelles expirée. Se reconnecter ?" -#: src/lang.c:924 +#: src/lang.c:916 #, c-format 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:925 +#: src/lang.c:917 msgid " -A force authentication on connect" msgstr " -A force l'authentication à la connexion" -#: src/lang.c:926 +#: src/lang.c:918 #, c-format 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:927 +#: src/lang.c:919 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr " -p port utiliser port comme port NNTP [défaut=%d]" -#: src/lang.c:928 +#: src/lang.c:920 msgid " -Q quick start. Same as -nqd" msgstr " -Q démarrage rapide. Idem que -npd" -#: src/lang.c:929 +#: src/lang.c:921 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l utilise seulement LIST plutôt que GROUP (n-)" -#: src/lang.c:930 +#: src/lang.c:922 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:932 +#: src/lang.c:924 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp : Service inconnu.\n" -#: src/lang.c:935 +#: src/lang.c:927 msgid "\n" "socket or connect problem\n" msgstr "\n" "problème de socket ou de connexion\n" -#: src/lang.c:937 +#: src/lang.c:929 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Connexion à %s : " -#: src/lang.c:938 +#: src/lang.c:930 msgid "Giving up...\n" msgstr "Abandon...\n" -#: src/lang.c:941 +#: src/lang.c:933 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:944 +#: src/lang.c:936 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:947 +#: src/lang.c:939 #, 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:950 +#: src/lang.c:942 msgid " -Q quick start. Same as -qd" msgstr " -Q démarrage rapide. Idem que -qd" -#: src/lang.c:951 +#: src/lang.c:943 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:952 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from spool" msgstr " -n lire seulement groupes abonnés du .newsrc depuis le spool" -#: src/lang.c:953 +#: src/lang.c:945 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:957 +#: src/lang.c:949 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:958 +#: src/lang.c:950 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:966 +#: src/lang.c:958 #, c-format msgid "%d %s printed" msgstr "%d %s imprimé" -#: src/lang.c:967 +#: src/lang.c:959 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "envoyer article/fil/sél./articles marqués à l'imprimante" -#: src/lang.c:968 +#: src/lang.c:960 msgid "Print" msgstr "Imprimer" -#: src/lang.c:969 +#: src/lang.c:961 msgid "Printing..." msgstr "Impression..." -#: src/lang.c:973 +#: src/lang.c:965 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "passer article/fil/sél./articles marqués à une commande" -#: src/lang.c:974 +#: src/lang.c:966 msgid "No command" msgstr "Pas de commande" -#: src/lang.c:975 +#: src/lang.c:967 msgid "Pipe" msgstr "Passer (pipe)" -#: src/lang.c:976 +#: src/lang.c:968 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Passer à la commande [%.*s]> " -#: src/lang.c:977 +#: src/lang.c:969 msgid "Piping..." msgstr "Passage..." -#: src/lang.c:979 +#: src/lang.c:971 msgid "Piping not enabled." msgstr "Passage non activé." -#: src/lang.c:983 +#: src/lang.c:975 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3752,7 +3786,7 @@ msgstr "\n" " du contenu. Utilisez une virgule (,) pour séparer de multiples\n" " noms de groupes.\n" -#: src/lang.c:988 +#: src/lang.c:980 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3763,7 +3797,7 @@ msgstr "\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:993 +#: src/lang.c:985 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3776,7 +3810,7 @@ msgstr "\n" " Pour éviter les problèmes, indiquez tous les groupes sur une\n" " seule ligne.\n" -#: src/lang.c:997 +#: src/lang.c:989 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" @@ -3784,7 +3818,7 @@ msgstr "\n" "Attention : La ligne \"%s:\" contient un ou des espaces qui DOIVENT\n" " être enlevés.\n" -#: src/lang.c:1002 +#: src/lang.c:994 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3818,41 +3852,41 @@ msgstr "\n" "simples\n" " règles, pratiquement toutes les personnes ignoreront vos articles.\n" -#: src/lang.c:1015 +#: src/lang.c:1007 msgid "shell escape" msgstr "accéder à un shell" -#: src/lang.c:1016 +#: src/lang.c:1008 #, c-format msgid "Shell Command (%s)" msgstr "Commande shell (%s)" -#: src/lang.c:1017 +#: src/lang.c:1009 #, c-format msgid "Enter shell command [%s]> " msgstr "Commande shell [%s]> " -#: src/lang.c:1021 +#: src/lang.c:1013 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "%s : Entrée pour TERM introuvable\n" -#: src/lang.c:1025 +#: src/lang.c:1017 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Groupe %.*s ('q' pour quitter)..." -#: src/lang.c:1027 +#: src/lang.c:1019 #, c-format msgid "Group %.*s..." msgstr "Groupe %.*s..." -#: src/lang.c:1031 +#: src/lang.c:1023 msgid "Server unavailable\n" msgstr "Service indisponible\n" # TRANSLATION TOO LONG -#: src/lang.c:1037 +#: src/lang.c:1029 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " "%s=post" @@ -3860,516 +3894,516 @@ msgstr "%s=pipe; %s=mail; %s=imprimer; % "%s=marquer; %s=poster" # TRANSLATION TOO LONG -#: src/lang.c:1038 +#: src/lang.c:1030 #, 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=marquer; %s=poster" -#: src/lang.c:1040 +#: src/lang.c:1032 #, 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:1041 +#: src/lang.c:1033 #, 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:1045 +#: src/lang.c:1037 #, 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:1046 +#: src/lang.c:1038 #, 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:1048 +#: src/lang.c:1040 #, 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:1049 +#: src/lang.c:1041 #, 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:1055 +#: src/lang.c:1047 msgid "Terminal does not support color" msgstr "Terminal ne supporte pas les couleurs" -#: src/lang.c:1060 +#: src/lang.c:1052 #, c-format msgid "Trying %s" msgstr "Essai %s" -#: src/lang.c:1074 src/lang.c:1099 src/lang.c:1115 src/lang.c:1294 src/refs.c:266 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:297 msgid "None" msgstr "Aucun" -#: src/lang.c:1075 +#: src/lang.c:1067 msgid "Subject" msgstr "Sujet" -#: src/lang.c:1076 +#: src/lang.c:1068 msgid "References" msgstr "Références" -#: src/lang.c:1077 +#: src/lang.c:1069 msgid "Both Subject and References" msgstr "Sujet & Références" -#: src/lang.c:1078 +#: src/lang.c:1070 msgid "Multipart Subject" msgstr "Sujet multiparties" -#: src/lang.c:1090 src/lang.c:1201 +#: src/lang.c:1082 src/lang.c:1193 msgid "No" msgstr "Non" -#: src/lang.c:1091 src/lang.c:1203 +#: src/lang.c:1083 src/lang.c:1195 msgid "Yes" msgstr "Oui" -#: src/lang.c:1092 +#: src/lang.c:1084 msgid "Hide All" msgstr "Tout masquer" -#: src/lang.c:1100 +#: src/lang.c:1092 msgid "Address" msgstr "Adresse" -#: src/lang.c:1101 +#: src/lang.c:1093 msgid "Full Name" msgstr "Nom complet" -#: src/lang.c:1102 +#: src/lang.c:1094 msgid "Address and Name" msgstr "Adresse et Nom" -#: src/lang.c:1109 +#: src/lang.c:1101 msgid "Max" msgstr "Max" -#: src/lang.c:1110 +#: src/lang.c:1102 msgid "Sum" msgstr "Sum" -#: src/lang.c:1111 +#: src/lang.c:1103 msgid "Average" msgstr "Moyenne" -#: src/lang.c:1116 +#: src/lang.c:1108 msgid "Lines" msgstr "Lignes" -#: src/lang.c:1117 +#: src/lang.c:1109 msgid "Score" msgstr "Score" -#: src/lang.c:1118 +#: src/lang.c:1110 msgid "Lines & Score" msgstr "Lignes & Score" -#: src/lang.c:1127 +#: src/lang.c:1119 msgid "Black" msgstr "Noir" -#: src/lang.c:1128 +#: src/lang.c:1120 msgid "Red" msgstr "Rouge" -#: src/lang.c:1129 +#: src/lang.c:1121 msgid "Green" msgstr "Vert" -#: src/lang.c:1130 +#: src/lang.c:1122 msgid "Brown" msgstr "Marron" -#: src/lang.c:1131 +#: src/lang.c:1123 msgid "Blue" msgstr "Bleu" -#: src/lang.c:1132 +#: src/lang.c:1124 msgid "Pink" msgstr "Rose" -#: src/lang.c:1133 +#: src/lang.c:1125 msgid "Cyan" msgstr "Cyan" -#: src/lang.c:1134 +#: src/lang.c:1126 msgid "White" msgstr "Blanc" -#: src/lang.c:1135 +#: src/lang.c:1127 msgid "Gray" msgstr "Gris" -#: src/lang.c:1136 +#: src/lang.c:1128 msgid "Light Red" msgstr "Rouge gras" -#: src/lang.c:1137 +#: src/lang.c:1129 msgid "Light Green" msgstr "Vert gras" -#: src/lang.c:1138 +#: src/lang.c:1130 msgid "Yellow" msgstr "Jaune" -#: src/lang.c:1139 +#: src/lang.c:1131 msgid "Light Blue" msgstr "Bleu gras" -#: src/lang.c:1140 +#: src/lang.c:1132 msgid "Light Pink" msgstr "Rose gras" -#: src/lang.c:1141 +#: src/lang.c:1133 msgid "Light Cyan" msgstr "Cyan gras" -#: src/lang.c:1142 +#: src/lang.c:1134 msgid "Light White" msgstr "Blanc gras" -#: src/lang.c:1150 src/lang.c:1207 src/lang.c:1221 +#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 msgid "Nothing" msgstr "Rien" -#: src/lang.c:1151 +#: src/lang.c:1143 msgid "Mark" msgstr "Marque" -#: src/lang.c:1152 +#: src/lang.c:1144 msgid "Space" msgstr "Espace" -#: src/lang.c:1159 +#: src/lang.c:1151 msgid "Normal" msgstr "Normal" -#: src/lang.c:1160 +#: src/lang.c:1152 msgid "Best highlighting" msgstr "Meilleure surbrillance" -#: src/lang.c:1161 +#: src/lang.c:1153 msgid "Underline" msgstr "Souligné" -#: src/lang.c:1162 +#: src/lang.c:1154 msgid "Reverse video" msgstr "Vidéo inversée" -#: src/lang.c:1163 +#: src/lang.c:1155 msgid "Blinking" msgstr "Clignotement" -#: src/lang.c:1164 +#: src/lang.c:1156 msgid "Half bright" msgstr "Moins lumineux" -#: src/lang.c:1165 +#: src/lang.c:1157 msgid "Bold" msgstr "Gras" -#: src/lang.c:1170 +#: src/lang.c:1162 msgid "none" msgstr "aucun" -#: src/lang.c:1171 +#: src/lang.c:1163 msgid "commands" msgstr "commandes" -#: src/lang.c:1172 +#: src/lang.c:1164 msgid "select" msgstr "sélection" -#: src/lang.c:1174 +#: src/lang.c:1166 msgid "commands & quit" msgstr "commandes & quitter" -#: src/lang.c:1175 +#: src/lang.c:1167 msgid "commands & select" msgstr "commandes & sélection" -#: src/lang.c:1176 +#: src/lang.c:1168 msgid "quit & select" msgstr "quitter & sélection" -#: src/lang.c:1177 +#: src/lang.c:1169 msgid "commands & quit & select" msgstr "commandes, quitter & sélection" -#: src/lang.c:1202 +#: src/lang.c:1194 msgid "Shell archive" msgstr "Archive shell" -#: src/lang.c:1208 +#: src/lang.c:1200 msgid "Subject: (descending)" msgstr "Sujet : (descendant)" -#: src/lang.c:1209 +#: src/lang.c:1201 msgid "Subject: (ascending)" msgstr "Sujet : (ascendant)" -#: src/lang.c:1210 +#: src/lang.c:1202 msgid "From: (descending)" msgstr "De : (descendant)" -#: src/lang.c:1211 +#: src/lang.c:1203 msgid "From: (ascending)" msgstr "De : (ascendant)" -#: src/lang.c:1212 +#: src/lang.c:1204 msgid "Date: (descending)" msgstr "Date : (descendant)" -#: src/lang.c:1213 +#: src/lang.c:1205 msgid "Date: (ascending)" msgstr "Date : (ascendant)" -#: src/lang.c:1214 src/lang.c:1222 +#: src/lang.c:1206 src/lang.c:1214 msgid "Score (descending)" msgstr "Score (descendant)" -#: src/lang.c:1215 src/lang.c:1223 +#: src/lang.c:1207 src/lang.c:1215 msgid "Score (ascending)" msgstr "Score (ascendant)" -#: src/lang.c:1216 +#: src/lang.c:1208 msgid "Lines: (descending)" msgstr "Lignes : (descendant)" -#: src/lang.c:1217 +#: src/lang.c:1209 msgid "Lines: (ascending)" msgstr "Lignes : (ascendant)" -#: src/lang.c:1228 +#: src/lang.c:1220 msgid "Always Keep" msgstr "Toujours garder" -#: src/lang.c:1229 +#: src/lang.c:1221 msgid "Always Remove" msgstr "Toujours effacer" -#: src/lang.c:1230 +#: src/lang.c:1222 msgid "Mark with D on selection screen" msgstr "Marquer avec un D dans la vue sélection" -#: src/lang.c:1235 +#: src/lang.c:1227 msgid "Kill only unread arts" msgstr "Filtrer uniquement les articles non lus" -#: src/lang.c:1236 +#: src/lang.c:1228 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:1237 +#: src/lang.c:1229 msgid "Kill all arts and never show" msgstr "Filtrer tous les articles et ne jamais afficher" -#: src/lang.c:1242 +#: src/lang.c:1234 msgid "Nothing special" msgstr "Rien de spécial" -#: src/lang.c:1243 +#: src/lang.c:1235 msgid "Compress quotes" msgstr "Citations compressées" -#: src/lang.c:1244 +#: src/lang.c:1236 msgid "Quote signatures" msgstr "Citer les signatures" -#: src/lang.c:1245 +#: src/lang.c:1237 msgid "Compress quotes, quote sigs" msgstr "Compresser les citations, citer les signatures" -#: src/lang.c:1246 +#: src/lang.c:1238 msgid "Quote empty lines" msgstr "Citer les lignes vides" -#: src/lang.c:1247 +#: src/lang.c:1239 msgid "Compress quotes, quote empty lines" msgstr "Compresser les citations, citer les lignes vides" -#: src/lang.c:1248 +#: src/lang.c:1240 msgid "Quote sigs & empty lines" msgstr "Citer les signatures & les lignes vides" -#: src/lang.c:1249 +#: src/lang.c:1241 msgid "Comp. q., quote sigs & empty lines" msgstr "Compr. les citations, citer les signatures & les lignes vides" -#: src/lang.c:1287 +#: src/lang.c:1279 msgid "no" msgstr "" -#: src/lang.c:1288 +#: src/lang.c:1280 msgid "with headers" msgstr "" -#: src/lang.c:1289 +#: src/lang.c:1281 msgid "without headers" msgstr "" -#: src/lang.c:1296 src/lang.c:1302 +#: src/lang.c:1288 src/lang.c:1294 msgid "NFKC" msgstr "" -#: src/lang.c:1297 +#: src/lang.c:1289 msgid "NFKD" msgstr "" -#: src/lang.c:1298 +#: src/lang.c:1290 msgid "NFC" msgstr "" -#: src/lang.c:1299 +#: src/lang.c:1291 msgid "NFD" msgstr "" -#: src/lang.c:1310 +#: src/lang.c:1302 msgid "Display Options" msgstr "Options d'affichage" -#: src/lang.c:1316 +#: src/lang.c:1308 msgid "Color Options" msgstr "Options des couleurs" -#: src/lang.c:1322 +#: src/lang.c:1314 msgid "Article-Limiting Options" msgstr "Options des articles" -#: src/lang.c:1328 +#: src/lang.c:1320 msgid "Posting/Mailing Options" msgstr "Options de postage/messagerie" -#: src/lang.c:1334 +#: src/lang.c:1326 msgid "Saving/Printing Options" msgstr "Options d'enregistrement/d'impression" -#: src/lang.c:1340 +#: src/lang.c:1332 msgid "Expert Options" msgstr "Options avancées" -#: src/lang.c:1346 +#: src/lang.c:1338 msgid "Filtering Options" msgstr "Options de filtrage" -#: src/lang.c:1351 src/lang.c:1377 src/lang.c:1383 src/lang.c:1390 src/lang.c:1422 -#: src/lang.c:1428 src/lang.c:1436 src/lang.c:1456 src/lang.c:1531 src/lang.c:1693 -#: src/lang.c:1699 src/lang.c:1705 src/lang.c:1711 src/lang.c:1723 src/lang.c:1730 -#: src/lang.c:1781 src/lang.c:1790 src/lang.c:1796 src/lang.c:1802 src/lang.c:1808 -#: src/lang.c:1814 src/lang.c:1820 src/lang.c:1826 src/lang.c:1832 src/lang.c:1838 -#: src/lang.c:1844 src/lang.c:1850 src/lang.c:1856 src/lang.c:1862 src/lang.c:1868 -#: src/lang.c:1874 src/lang.c:1880 src/lang.c:1886 src/lang.c:1892 src/lang.c:1898 -#: src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 src/lang.c:1923 src/lang.c:1929 -#: src/lang.c:1936 src/lang.c:1947 src/lang.c:1953 src/lang.c:1959 src/lang.c:1965 -#: src/lang.c:1971 src/lang.c:1977 src/lang.c:1991 src/lang.c:2003 src/lang.c:2037 -#: src/lang.c:2089 src/lang.c:2096 src/lang.c:2102 src/lang.c:2127 src/lang.c:2144 -#: src/lang.c:2197 src/lang.c:2230 src/lang.c:2250 src/lang.c:2285 src/lang.c:2294 -#: src/lang.c:2319 src/lang.c:2331 src/lang.c:2350 +#: src/lang.c:1343 src/lang.c:1369 src/lang.c:1375 src/lang.c:1382 src/lang.c:1414 +#: src/lang.c:1420 src/lang.c:1428 src/lang.c:1448 src/lang.c:1523 src/lang.c:1685 +#: src/lang.c:1691 src/lang.c:1697 src/lang.c:1703 src/lang.c:1715 src/lang.c:1722 +#: src/lang.c:1773 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:1884 src/lang.c:1890 +#: src/lang.c:1896 src/lang.c:1902 src/lang.c:1909 src/lang.c:1915 src/lang.c:1921 +#: src/lang.c:1928 src/lang.c:1939 src/lang.c:1945 src/lang.c:1951 src/lang.c:1957 +#: src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 src/lang.c:1995 src/lang.c:2029 +#: src/lang.c:2081 src/lang.c:2088 src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 +#: src/lang.c:2189 src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 msgid " toggles, sets, cancels." msgstr " changer, régler, annuler." -#: src/lang.c:1352 +#: src/lang.c:1344 msgid "Show mini menu & posting etiquette :" msgstr "Afficher menu & intitulé du postage:" -#: src/lang.c:1353 +#: src/lang.c:1345 msgid "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" 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:1358 +#: src/lang.c:1350 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Afficher une brève description pour chaque groupe. changer & " "régler." -#: src/lang.c:1359 +#: src/lang.c:1351 msgid "Show description of each newsgroup :" msgstr "Voir description de chaque groupe :" -#: src/lang.c:1360 +#: src/lang.c:1352 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:1365 +#: src/lang.c:1357 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Afficher les champs Sujet & De (auteur) dans le menu groupe. change " "& règle." -#: src/lang.c:1366 +#: src/lang.c:1358 msgid "In group menu, show author by :" msgstr "Dans vue groupe, voir auteur par :" -#: src/lang.c:1367 +#: src/lang.c:1359 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:1371 +#: src/lang.c:1363 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Afficher -> ou une ligne pour la sélection. change & règle." -#: src/lang.c:1372 +#: src/lang.c:1364 msgid "Draw -> instead of highlighted bar :" msgstr "Afficher -> plutôt qu'une ligne :" -#: src/lang.c:1373 +#: src/lang.c:1365 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Si ON utilise -> sinon barre en surbrillance pour la sélection\n" -#: src/lang.c:1378 +#: src/lang.c:1370 msgid "Use inverse video for page headers :" msgstr "Vidéo inversée pour les en-têtes :" -#: src/lang.c:1379 +#: src/lang.c:1371 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 " "vues\n" -#: src/lang.c:1384 +#: src/lang.c:1376 msgid "Thread articles by :" msgstr "Regrouper les articles par :" -#: src/lang.c:1385 +#: src/lang.c:1377 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:1391 +#: src/lang.c:1383 msgid "Score of a thread :" msgstr "Score d'un fil :" -#: src/lang.c:1392 +#: src/lang.c:1384 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "# Score d'un fil 0=(Max) 1=(Sum) 2=(Moyen)\n" -#: src/lang.c:1396 +#: src/lang.c:1388 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Trier les articles par Sujet, De, Date ou Score. change & règle." -#: src/lang.c:1397 +#: src/lang.c:1389 msgid "Sort articles by :" msgstr "Trier les articles par :" -#: src/lang.c:1398 +#: src/lang.c:1390 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" @@ -4378,56 +4412,56 @@ msgstr "# Trie les article par 0=(rien) "# 7=(Score descendant) 8=(Score ascendant) 9=(Lignes descendant) 10=(Lignes " "ascendant)\n" -#: src/lang.c:1404 +#: src/lang.c:1396 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Trier les fils par Rien ou Score. change & règle." -#: src/lang.c:1405 +#: src/lang.c:1397 msgid "Sort threads by :" msgstr "Trier les fils par :" -#: src/lang.c:1406 +#: src/lang.c:1398 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" msgstr "# Trie le fil par 0=(rien) 1=(Score descendant) 2=(Score ascendant)\n" -#: src/lang.c:1410 +#: src/lang.c:1402 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "Place le curseur sur le 1er article non lu. change & règle." -#: src/lang.c:1411 +#: src/lang.c:1403 msgid "Goto first unread article in group :" msgstr "Aller au 1er art. non lu du groupe :" -#: src/lang.c:1412 +#: src/lang.c:1404 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "# Si ON place le curseur sur le 1er article non lu sinon sur le dernier\n" -#: src/lang.c:1416 +#: src/lang.c:1408 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Affiche tous les articles ou seulement ceux non lus. change & " "règle." -#: src/lang.c:1417 +#: src/lang.c:1409 msgid "Show only unread articles :" msgstr "Afficher articles non lus seulement:" -#: src/lang.c:1418 +#: src/lang.c:1410 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# Si ON affiche seulement les articles non lus sinon les affiche tous.\n" -#: src/lang.c:1423 +#: src/lang.c:1415 msgid "Show only groups with unread arts :" msgstr "Voir groupes avec articles non lus :" -#: src/lang.c:1424 +#: src/lang.c:1416 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "# Si ON affiche seulement les groupes ayant des articles non lus.\n" -#: src/lang.c:1429 +#: src/lang.c:1421 msgid "Filter which articles :" msgstr "Filtrer quel article :" -#: src/lang.c:1430 +#: src/lang.c:1422 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" @@ -4435,232 +4469,232 @@ msgstr "# 0=(Filtrer seulement les artic "# 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:1437 +#: src/lang.c:1429 msgid "Tab goes to next unread article :" msgstr "Tab va au prochain article non lu :" -#: src/lang.c:1438 +#: src/lang.c:1430 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "# Si ON TAB ira au prochain article non lu directement depuis le visualiseur " "d'article\n" -#: src/lang.c:1442 +#: src/lang.c:1434 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "Défiler avec passera le fin d'un article et ira au prochain non lu." -#: src/lang.c:1443 +#: src/lang.c:1435 msgid "Space goes to next unread article :" msgstr "Espace va au prochain art. non lu :" -#: src/lang.c:1444 +#: src/lang.c:1436 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 "# 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:1449 +#: src/lang.c:1441 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "Défiler avec / passera la fin d'un article et ira au prochain non " "lu." -#: src/lang.c:1450 +#: src/lang.c:1442 msgid "PgDn goes to next unread article :" msgstr "PgDn ira au prochain article non lu:" -#: src/lang.c:1451 +#: src/lang.c:1443 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" "# pressed at end of message\n" 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:1457 +#: src/lang.c:1449 msgid "List thread using right arrow key :" msgstr "Lister le fil via la flèche droite :" -#: src/lang.c:1458 +#: src/lang.c:1450 msgid "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "# Si ON listera automatiquement le fil lors de l'utilisation de la flèche " "droite.\n" -#: src/lang.c:1462 +#: src/lang.c:1454 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Caractère indiquant les articles effacés. règle, annule." -#: src/lang.c:1463 +#: src/lang.c:1455 msgid "Character to show deleted articles :" msgstr "Caractère pour les articles effacés:" -#: src/lang.c:1464 +#: src/lang.c:1456 msgid "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article a été supprimé (défaut 'D')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1469 +#: src/lang.c:1461 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "Caractère indiquant les articles inclus. règle, annule." -#: src/lang.c:1470 +#: src/lang.c:1462 msgid "Character to show inrange articles :" msgstr "Caractère pour art. non inclus :" -#: src/lang.c:1471 +#: src/lang.c:1463 msgid "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article est inclus (défaut '#')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1476 +#: src/lang.c:1468 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1477 +#: src/lang.c:1469 msgid "Character to show returning arts :" msgstr "" -#: src/lang.c:1478 +#: src/lang.c:1470 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1483 +#: src/lang.c:1475 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1484 +#: src/lang.c:1476 msgid "Character to show selected articles:" msgstr "" -#: src/lang.c:1485 +#: src/lang.c:1477 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1490 +#: src/lang.c:1482 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1491 +#: src/lang.c:1483 msgid "Character to show recent articles :" msgstr "" -#: src/lang.c:1492 +#: src/lang.c:1484 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1497 +#: src/lang.c:1489 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1498 +#: src/lang.c:1490 msgid "Character to show unread articles :" msgstr "" -#: src/lang.c:1499 +#: src/lang.c:1491 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1504 +#: src/lang.c:1496 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1505 +#: src/lang.c:1497 msgid "Character to show read articles :" msgstr "" -#: src/lang.c:1506 +#: src/lang.c:1498 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1511 +#: src/lang.c:1503 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1512 +#: src/lang.c:1504 msgid "Character to show killed articles :" msgstr "" -#: src/lang.c:1513 +#: src/lang.c:1505 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:1518 +#: src/lang.c:1510 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1519 +#: src/lang.c:1511 msgid "Character to show readselected arts:" msgstr "" -#: src/lang.c:1520 +#: src/lang.c:1512 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:1525 +#: src/lang.c:1517 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1526 +#: src/lang.c:1518 msgid "Max. length of group names shown :" msgstr "" -#: src/lang.c:1527 +#: src/lang.c:1519 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1532 +#: src/lang.c:1524 msgid "Show lines/score in listings :" msgstr "" -#: src/lang.c:1533 +#: src/lang.c:1525 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:1538 +#: src/lang.c:1530 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1539 +#: src/lang.c:1531 msgid "Number of lines to scroll in pager :" msgstr "" -#: src/lang.c:1540 +#: src/lang.c:1532 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:1547 +#: src/lang.c:1539 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1548 +#: src/lang.c:1540 msgid "Display signatures :" msgstr "Afficher les signatures :" -#: src/lang.c:1549 +#: src/lang.c:1541 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1553 +#: src/lang.c:1545 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1554 +#: src/lang.c:1546 msgid "Display uue data as an attachment :" msgstr "Afficher donnée uue comme PJ :" -#: src/lang.c:1555 +#: src/lang.c:1547 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" @@ -4669,28 +4703,28 @@ msgid "# Handling of uuencoded data in t "# into a tag line.\n" msgstr "" -#: src/lang.c:1564 +#: src/lang.c:1556 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1565 +#: src/lang.c:1557 msgid "Display \"a as Umlaut-a :" msgstr "" -#: src/lang.c:1566 +#: src/lang.c:1558 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1571 src/lang.c:1581 +#: src/lang.c:1563 src/lang.c:1573 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1572 +#: src/lang.c:1564 msgid "Display these header fields (or *) :" msgstr "" -#: src/lang.c:1573 +#: src/lang.c:1565 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" @@ -4699,11 +4733,11 @@ msgid "# Which news headers you wish to "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1582 +#: src/lang.c:1574 msgid "Do not display these header fields :" msgstr "" -#: src/lang.c:1583 +#: src/lang.c:1575 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 " @@ -4714,519 +4748,519 @@ msgid "# Same as 'news_headers_to_displa "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1593 +#: src/lang.c:1585 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1594 +#: src/lang.c:1586 msgid "Skip multipart/alternative parts :" msgstr "" -#: src/lang.c:1595 +#: src/lang.c:1587 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1600 +#: src/lang.c:1592 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1601 +#: src/lang.c:1593 msgid "Regex used to show quoted lines :" msgstr "" -#: src/lang.c:1602 +#: src/lang.c:1594 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:1608 +#: src/lang.c:1600 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1609 +#: src/lang.c:1601 msgid "Regex used to show twice quoted l. :" msgstr "" -#: src/lang.c:1610 +#: src/lang.c:1602 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:1616 +#: src/lang.c:1608 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1617 +#: src/lang.c:1609 msgid "Regex used to show >= 3 times q.l. :" msgstr "" -#: src/lang.c:1618 +#: src/lang.c:1610 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:1625 +#: src/lang.c:1617 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1626 +#: src/lang.c:1618 msgid "Regex used to highlight /slashes/ :" msgstr "" -#: src/lang.c:1627 +#: src/lang.c:1619 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:1633 +#: src/lang.c:1625 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1634 +#: src/lang.c:1626 msgid "Regex used to highlight *stars* :" msgstr "" -#: src/lang.c:1635 +#: src/lang.c:1627 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:1641 +#: src/lang.c:1633 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1642 +#: src/lang.c:1634 msgid "Regex used to highlight -strokes- :" msgstr "" -#: src/lang.c:1643 +#: src/lang.c:1635 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:1649 +#: src/lang.c:1641 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1650 +#: src/lang.c:1642 msgid "Regex used to highlight _underline_:" msgstr "" -#: src/lang.c:1651 +#: src/lang.c:1643 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:1657 +#: src/lang.c:1649 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1658 +#: src/lang.c:1650 msgid "Regex with Subject prefixes :" msgstr "" -#: src/lang.c:1659 +#: src/lang.c:1651 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:1664 +#: src/lang.c:1656 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1665 +#: src/lang.c:1657 msgid "Regex with Subject suffixes :" msgstr "" -#: src/lang.c:1666 +#: src/lang.c:1658 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:1671 +#: src/lang.c:1663 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1672 +#: src/lang.c:1664 msgid "MIME binary content viewer :" msgstr "" -#: src/lang.c:1673 +#: src/lang.c:1665 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:1680 +#: src/lang.c:1672 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1681 +#: src/lang.c:1673 msgid "Ask before using MIME viewer :" msgstr "" -#: src/lang.c:1682 +#: src/lang.c:1674 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:1687 +#: src/lang.c:1679 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1688 +#: src/lang.c:1680 msgid "Catchup read groups when quitting :" msgstr "" -#: src/lang.c:1689 +#: src/lang.c:1681 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1694 +#: src/lang.c:1686 msgid "Catchup group using left key :" msgstr "" -#: src/lang.c:1695 +#: src/lang.c:1687 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1700 +#: src/lang.c:1692 msgid "Catchup thread by using left key :" msgstr "" -#: src/lang.c:1706 +#: src/lang.c:1698 msgid "Which actions require confirmation :" msgstr "" -#: src/lang.c:1707 +#: src/lang.c:1699 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1712 +#: src/lang.c:1704 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1713 +#: src/lang.c:1705 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1709 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1718 +#: src/lang.c:1710 msgid "Program that opens URL's :" msgstr "" -#: src/lang.c:1719 +#: src/lang.c:1711 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1724 +#: src/lang.c:1716 msgid "Use mouse in xterm :" msgstr "" -#: src/lang.c:1725 +#: src/lang.c:1717 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1723 msgid "Use scroll keys on keypad :" msgstr "" -#: src/lang.c:1732 +#: src/lang.c:1724 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1729 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1730 msgid "Number of articles to get :" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1731 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:1744 +#: src/lang.c:1736 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1745 +#: src/lang.c:1737 msgid "Article recentness time limit :" msgstr "" -#: src/lang.c:1746 +#: src/lang.c:1738 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1742 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1751 +#: src/lang.c:1743 msgid "Wildcard matching :" msgstr "" -#: src/lang.c:1752 +#: src/lang.c:1744 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1748 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1757 +#: src/lang.c:1749 msgid "Score limit (kill) :" msgstr "" -#: src/lang.c:1758 +#: src/lang.c:1750 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1754 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1763 +#: src/lang.c:1755 msgid "Default score to kill articles :" msgstr "" -#: src/lang.c:1764 +#: src/lang.c:1756 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1760 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1761 msgid "Score limit (select) :" msgstr "" -#: src/lang.c:1770 +#: src/lang.c:1762 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1774 +#: src/lang.c:1766 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1775 +#: src/lang.c:1767 msgid "Default score to select articles :" msgstr "" -#: src/lang.c:1776 +#: src/lang.c:1768 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1782 +#: src/lang.c:1774 msgid "Use slrnface to show ''X-Face:''s :" msgstr "" -#: src/lang.c:1783 +#: src/lang.c:1775 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:1791 +#: src/lang.c:1783 msgid "Use ANSI color :" msgstr "" -#: src/lang.c:1792 +#: src/lang.c:1784 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:1797 +#: src/lang.c:1789 msgid "Standard foreground color :" msgstr "" -#: src/lang.c:1798 +#: src/lang.c:1790 msgid "# Standard foreground color\n" msgstr "" -#: src/lang.c:1803 +#: src/lang.c:1795 msgid "Standard background color :" msgstr "" -#: src/lang.c:1804 +#: src/lang.c:1796 msgid "# Standard-Background-Color\n" msgstr "" -#: src/lang.c:1809 +#: src/lang.c:1801 msgid "Color for inverse text (background):" msgstr "" -#: src/lang.c:1810 +#: src/lang.c:1802 msgid "# Color of background for inverse text\n" msgstr "" -#: src/lang.c:1815 +#: src/lang.c:1807 msgid "Color for inverse text (foreground):" msgstr "" -#: src/lang.c:1816 +#: src/lang.c:1808 msgid "# Color of foreground for inverse text\n" msgstr "" -#: src/lang.c:1821 +#: src/lang.c:1813 msgid "Color of text lines :" msgstr "" -#: src/lang.c:1822 +#: src/lang.c:1814 msgid "# Color of text-lines\n" msgstr "" -#: src/lang.c:1827 +#: src/lang.c:1819 msgid "Color of mini help menu :" msgstr "" -#: src/lang.c:1828 +#: src/lang.c:1820 msgid "# Color of mini help menu\n" msgstr "" -#: src/lang.c:1833 +#: src/lang.c:1825 msgid "Color of help text :" msgstr "" -#: src/lang.c:1834 +#: src/lang.c:1826 msgid "# Color of help pages\n" msgstr "" -#: src/lang.c:1839 +#: src/lang.c:1831 msgid "Color of status messages :" msgstr "" -#: src/lang.c:1840 +#: src/lang.c:1832 msgid "# Color of messages in last line\n" msgstr "" -#: src/lang.c:1845 +#: src/lang.c:1837 msgid "Color of quoted lines :" msgstr "" -#: src/lang.c:1846 +#: src/lang.c:1838 msgid "# Color of quote-lines\n" msgstr "" -#: src/lang.c:1851 +#: src/lang.c:1843 msgid "Color of twice quoted line :" msgstr "" -#: src/lang.c:1852 +#: src/lang.c:1844 msgid "# Color of twice quoted lines\n" msgstr "" -#: src/lang.c:1857 +#: src/lang.c:1849 msgid "Color of =>3 times quoted line :" msgstr "" -#: src/lang.c:1858 +#: src/lang.c:1850 msgid "# Color of >=3 times quoted lines\n" msgstr "" -#: src/lang.c:1863 +#: src/lang.c:1855 msgid "Color of article header lines :" msgstr "" -#: src/lang.c:1864 +#: src/lang.c:1856 msgid "# Color of header-lines\n" msgstr "" -#: src/lang.c:1869 +#: src/lang.c:1861 msgid "Color of actual news header fields :" msgstr "" -#: src/lang.c:1870 +#: src/lang.c:1862 msgid "# Color of actual news header fields\n" msgstr "" -#: src/lang.c:1875 +#: src/lang.c:1867 msgid "Color of article subject lines :" msgstr "" -#: src/lang.c:1876 +#: src/lang.c:1868 msgid "# Color of article subject\n" msgstr "" -#: src/lang.c:1881 +#: src/lang.c:1873 msgid "Color of response counter :" msgstr "" -#: src/lang.c:1882 +#: src/lang.c:1874 msgid "# Color of response counter\n" msgstr "" -#: src/lang.c:1887 +#: src/lang.c:1879 msgid "Color of sender (From:) :" msgstr "" -#: src/lang.c:1888 +#: src/lang.c:1880 msgid "# Color of sender (From:)\n" msgstr "" -#: src/lang.c:1893 +#: src/lang.c:1885 msgid "Color of help/mail sign :" msgstr "" -#: src/lang.c:1894 +#: src/lang.c:1886 msgid "# Color of Help/Mail-Sign\n" msgstr "" -#: src/lang.c:1899 +#: src/lang.c:1891 msgid "Color of signatures :" msgstr "" -#: src/lang.c:1900 +#: src/lang.c:1892 msgid "# Color of signature\n" msgstr "" -#: src/lang.c:1905 +#: src/lang.c:1897 msgid "Color of highlighted URLs :" msgstr "" -#: src/lang.c:1906 +#: src/lang.c:1898 msgid "# Color of highlighted URLs\n" msgstr "" -#: src/lang.c:1911 +#: src/lang.c:1903 msgid "Color of highlighting with *stars* :" msgstr "" -#: src/lang.c:1912 +#: src/lang.c:1904 msgid "# Color of word highlighting. There are four possibilities\n" "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" msgstr "" -#: src/lang.c:1918 +#: src/lang.c:1910 msgid "Color of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1924 +#: src/lang.c:1916 msgid "Color of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1930 +#: src/lang.c:1922 msgid "Color of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1937 +#: src/lang.c:1929 msgid "Attr. of highlighting with *stars* :" msgstr "" -#: src/lang.c:1938 +#: src/lang.c:1930 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5235,93 +5269,93 @@ msgid "# Attribute of word highlighting "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1948 +#: src/lang.c:1940 msgid "Attr. of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1946 msgid "Attr. of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1960 +#: src/lang.c:1952 msgid "Attr. of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1966 +#: src/lang.c:1958 msgid "URL highlighting in message body :" msgstr "" -#: src/lang.c:1967 +#: src/lang.c:1959 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:1972 +#: src/lang.c:1964 msgid "Word highlighting in message body :" msgstr "" -#: src/lang.c:1973 +#: src/lang.c:1965 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1978 +#: src/lang.c:1970 msgid "What to display instead of mark :" msgstr "" -#: src/lang.c:1979 +#: src/lang.c:1971 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:1985 +#: src/lang.c:1977 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1978 msgid "Page line wrap column :" msgstr "" -#: src/lang.c:1987 +#: src/lang.c:1979 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:1984 msgid "Wrap around threads on next unread :" msgstr "" -#: src/lang.c:1993 +#: src/lang.c:1985 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1997 +#: src/lang.c:1989 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1998 +#: src/lang.c:1990 msgid "Mail address (and fullname) :" msgstr "" -#: src/lang.c:1999 +#: src/lang.c:1991 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:2004 +#: src/lang.c:1996 msgid "Show empty Followup-To in editor :" msgstr "" -#: src/lang.c:2005 +#: src/lang.c:1997 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2009 +#: src/lang.c:2001 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2002 msgid "Create signature from path/command :" msgstr "" -#: src/lang.c:2011 +#: src/lang.c:2003 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 " @@ -5329,48 +5363,48 @@ msgid "# Signature path (random sigs)/fi "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2010 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2019 +#: src/lang.c:2011 msgid "Prepend signature with \"-- \" :" msgstr "" -#: src/lang.c:2020 +#: src/lang.c:2012 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2016 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2017 msgid "Add signature when reposting :" msgstr "" -#: src/lang.c:2026 +#: src/lang.c:2018 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2030 +#: src/lang.c:2022 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2023 msgid "Characters used as quote-marks :" msgstr "" -#: src/lang.c:2032 +#: src/lang.c:2024 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:2038 +#: src/lang.c:2030 msgid "Quoting behavior :" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2031 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5382,49 +5416,49 @@ msgid "# How quoting should be handled w "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2051 src/lang.c:2059 src/lang.c:2065 +#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2052 +#: src/lang.c:2044 msgid "Quote line when following up :" msgstr "" -#: src/lang.c:2053 +#: src/lang.c:2045 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:2060 +#: src/lang.c:2052 msgid "Quote line when cross-posting :" msgstr "" -#: src/lang.c:2066 +#: src/lang.c:2058 msgid "Quote line when mailing :" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2063 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2072 +#: src/lang.c:2064 msgid "Insert 'User-Agent:'-header :" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2065 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2077 +#: src/lang.c:2069 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2078 +#: src/lang.c:2070 msgid "MM_CHARSET :" msgstr "" -#: src/lang.c:2079 +#: src/lang.c:2071 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" @@ -5433,27 +5467,27 @@ msgid "# Charset supported locally which "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2082 msgid "MM_NETWORK_CHARSET :" msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2083 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2097 +#: src/lang.c:2089 msgid "Mailbox format :" msgstr "" -#: src/lang.c:2098 +#: src/lang.c:2090 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2103 +#: src/lang.c:2095 msgid "MIME encoding in news messages :" msgstr "" -#: src/lang.c:2104 +#: src/lang.c:2096 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" @@ -5461,42 +5495,42 @@ msgid "# MIME encoding (8bit, base64, qu "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2112 src/lang.c:2133 +#: src/lang.c:2104 src/lang.c:2125 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2113 +#: src/lang.c:2105 msgid "Use 8bit characters in news headers:" msgstr "" -#: src/lang.c:2114 +#: src/lang.c:2106 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:2121 +#: src/lang.c:2113 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2122 +#: src/lang.c:2114 msgid "View post-processed files :" msgstr "" -#: src/lang.c:2123 +#: src/lang.c:2115 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2128 +#: src/lang.c:2120 msgid "MIME encoding in mail messages :" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2126 msgid "Use 8bit characters in mail headers:" msgstr "" -#: src/lang.c:2135 +#: src/lang.c:2127 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 " @@ -5506,382 +5540,382 @@ msgid "# If ON, 8bit characters in mail "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2137 msgid "Strip blanks from ends of lines :" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2138 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2151 +#: src/lang.c:2143 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2152 +#: src/lang.c:2144 msgid "Transliteration :" msgstr "" -#: src/lang.c:2153 +#: src/lang.c:2145 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:2160 +#: src/lang.c:2152 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2161 +#: src/lang.c:2153 msgid "Send you a cc automatically :" msgstr "" -#: src/lang.c:2162 +#: src/lang.c:2154 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "" -#: src/lang.c:2166 +#: src/lang.c:2158 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2159 msgid "Send you a blind cc automatically :" msgstr "" -#: src/lang.c:2168 +#: src/lang.c:2160 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2172 +#: src/lang.c:2164 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2165 msgid "Spamtrap warning address parts :" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2166 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:2179 +#: src/lang.c:2171 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2172 msgid "No. of days a filter entry is valid:" msgstr "" -#: src/lang.c:2181 +#: src/lang.c:2173 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2185 +#: src/lang.c:2177 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2186 +#: src/lang.c:2178 msgid "Add posted articles to filter :" msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2179 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2183 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2192 +#: src/lang.c:2184 msgid "Mail directory :" msgstr "" -#: src/lang.c:2193 +#: src/lang.c:2185 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2198 +#: src/lang.c:2190 msgid "Save articles in batch mode (-S) :" msgstr "" -#: src/lang.c:2199 +#: src/lang.c:2191 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:2204 +#: src/lang.c:2196 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2205 +#: src/lang.c:2197 msgid "Directory to save arts/threads in :" msgstr "" -#: src/lang.c:2206 +#: src/lang.c:2198 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2210 +#: src/lang.c:2202 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2203 msgid "Use Archive-name: header for save :" msgstr "" -#: src/lang.c:2212 +#: src/lang.c:2204 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:2217 +#: src/lang.c:2209 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2218 +#: src/lang.c:2210 msgid "Mark saved articles/threads as read:" msgstr "" -#: src/lang.c:2219 +#: src/lang.c:2211 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2223 +#: src/lang.c:2215 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2216 msgid "Post process saved articles :" msgstr "" -#: src/lang.c:2225 +#: src/lang.c:2217 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:2231 +#: src/lang.c:2223 msgid "Process only unread articles :" msgstr "" -#: src/lang.c:2232 +#: src/lang.c:2224 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "" -#: src/lang.c:2237 +#: src/lang.c:2229 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2238 +#: src/lang.c:2230 msgid "Print all headers when printing :" msgstr "" -#: src/lang.c:2239 +#: src/lang.c:2231 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2243 +#: src/lang.c:2235 msgid "The printer program with options that is to be used to print articles/threads." msgstr "" -#: src/lang.c:2244 +#: src/lang.c:2236 msgid "Printer program with options :" msgstr "" -#: src/lang.c:2245 +#: src/lang.c:2237 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2251 +#: src/lang.c:2243 msgid "Force redraw after certain commands:" msgstr "" -#: src/lang.c:2252 +#: src/lang.c:2244 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2256 +#: src/lang.c:2248 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2257 +#: src/lang.c:2249 msgid "Start editor with line offset :" msgstr "" -#: src/lang.c:2258 +#: src/lang.c:2250 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:2263 +#: src/lang.c:2255 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2264 +#: src/lang.c:2256 msgid "Invocation of your editor :" msgstr "" -#: src/lang.c:2265 +#: src/lang.c:2257 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2270 +#: src/lang.c:2262 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2271 +#: src/lang.c:2263 msgid "External inews :" msgstr "" -#: src/lang.c:2272 +#: src/lang.c:2264 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:2276 +#: src/lang.c:2268 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2277 +#: src/lang.c:2269 msgid "Invocation of your mail command :" msgstr "" -#: src/lang.c:2278 +#: src/lang.c:2270 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\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:2286 +#: src/lang.c:2278 msgid "Use interactive mail reader :" msgstr "" -#: src/lang.c:2287 +#: src/lang.c:2279 msgid "# Interactive mailreader:\n" "# 0 = no interactive mailreader\n" "# 1 = use interactive mailreader with headers in file\n" "# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2295 +#: src/lang.c:2287 msgid "Remove ~/.article after posting :" msgstr "" -#: src/lang.c:2296 +#: src/lang.c:2288 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2292 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2301 +#: src/lang.c:2293 msgid "Filename for posted articles :" msgstr "" -#: src/lang.c:2302 +#: src/lang.c:2294 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:2307 +#: src/lang.c:2299 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2308 +#: src/lang.c:2300 msgid "Keep failed arts in ~/dead.articles:" msgstr "" -#: src/lang.c:2309 +#: src/lang.c:2301 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2313 +#: src/lang.c:2305 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2314 +#: src/lang.c:2306 msgid "No unsubscribed groups in newsrc :" msgstr "" -#: src/lang.c:2315 +#: src/lang.c:2307 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2320 +#: src/lang.c:2312 msgid "Remove bogus groups from newsrc :" msgstr "" -#: src/lang.c:2321 +#: src/lang.c:2313 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:2325 +#: src/lang.c:2317 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2326 +#: src/lang.c:2318 msgid "Interval in secs to reread active :" msgstr "" -#: src/lang.c:2327 +#: src/lang.c:2319 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2332 +#: src/lang.c:2324 msgid "Reconnect to server automatically :" msgstr "Reconnexion automatique au serveur :" -#: src/lang.c:2333 +#: src/lang.c:2325 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2337 +#: src/lang.c:2329 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Créer des copies locales des en-têtes NNTP. change & choisi." -#: src/lang.c:2338 +#: src/lang.c:2330 msgid "Cache NNTP overview files locally :" msgstr "Cache local des en-têtes NNTP :" -#: src/lang.c:2339 +#: src/lang.c:2331 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Si ON, crée une copie locale des en-têtes NNTP.\n" -#: src/lang.c:2343 +#: src/lang.c:2335 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2344 +#: src/lang.c:2336 msgid "Format string for display of dates :" msgstr "" -#: src/lang.c:2345 +#: src/lang.c:2337 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2351 +#: src/lang.c:2343 msgid "Unicode normalization form :" msgstr "" -#: src/lang.c:2352 +#: src/lang.c:2344 msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" -#: src/main.c:586 +#: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" msgstr "Version : %s release %s (\"%s\") %s %s" -#: src/main.c:589 +#: src/main.c:593 #, c-format msgid "Version: %s release %s (\"%s\")" msgstr "Version : %s release %s (\"%s\")" @@ -5890,23 +5924,23 @@ msgstr "Version : %s release %s (\"%s\") msgid "Unreachable?\n" msgstr "Inacessible ?\n" -#: src/nntplib.c:821 +#: src/nntplib.c:822 #, c-format msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "\n" "Connexion au serveur expirée, reconnexion # %d\n" -#: src/nntplib.c:839 +#: src/nntplib.c:840 msgid "Rejoin current group\n" msgstr "Rejoindre l'actuel groupe\n" -#: src/nntplib.c:846 +#: src/nntplib.c:847 #, c-format msgid "Read (%s)\n" msgstr "Lecture (%s)\n" -#: src/nntplib.c:848 +#: src/nntplib.c:849 #, c-format msgid "Resend last command (%s)\n" msgstr "Réenvoyer la dernière commande (%s)\n" @@ -5916,7 +5950,7 @@ msgstr "Réenvoyer la dernière commande ( msgid "couldn't expand %s\n" msgstr "impossible de décompacter %s\n" -#: src/post.c:1939 +#: src/post.c:1951 #, c-format msgid "Posting: %.*s ..." msgstr "Postage : %.*s ..." @@ -5936,15 +5970,15 @@ msgid "Draining\n" msgstr "Purge\n" #. Don't hash the initial '<' -#: src/refs.c:220 +#: src/refs.c:251 msgid "unchanged" msgstr "non changé" -#: src/refs.c:573 +#: src/refs.c:610 msgid "[- Unavailable -]" msgstr "[- Indisponible -]" -#: src/save.c:975 +#: src/save.c:976 msgid "bytes" msgstr "octets" @@ -5956,7 +5990,7 @@ msgstr "non lu(s)" msgid "all" msgstr "tout" -#: src/select.c:525 src/select.c:527 +#: src/select.c:529 src/select.c:531 msgid " R" msgstr " R" Binary files tin-1.7.3/po/messages and tin-1.7.4/po/messages differ diff -Nurp tin-1.7.3/po/tin.pot tin-1.7.4/po/tin.pot --- tin-1.7.3/po/tin.pot Sat Dec 20 18:42:42 2003 +++ tin-1.7.4/po/tin.pot Wed Feb 25 10:33:55 2004 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-20 18:42+0100\n" +"POT-Creation-Date: 2004-02-25 10:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: src/art.c:1425 +#: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" @@ -234,7 +234,7 @@ msgstr "" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:608 src/filter.c:616 +#: src/filter.c:612 src/filter.c:620 msgid "Removed from the previous rule: " msgstr "" @@ -463,7 +463,7 @@ msgid "*** Beginning of article ***" msgstr "" #: src/lang.c:97 -msgid "Cancel (delete) or supersede (overwrite) article [%%.*s]? (%s/%s/%s): " +msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " msgstr "" #: src/lang.c:98 @@ -586,7 +586,7 @@ msgstr "" msgid "Creating newsrc file...\n" msgstr "" -#: src/lang.c:127 src/lang.c:1126 +#: src/lang.c:127 src/lang.c:1118 msgid "Default" msgstr "" @@ -1188,7 +1188,7 @@ msgid "0 - 9\t display article by numbe msgstr "" #: src/lang.c:283 -msgid "cancel (delete) current article; must have been posted by you" +msgid "cancel (delete) or supersede (overwrite) current article" msgstr "" #: src/lang.c:284 @@ -1235,7 +1235,7 @@ msgstr "" msgid "display first article in next thread" msgstr "" -#: src/lang.c:295 src/lang.c:302 src/lang.c:361 src/lang.c:362 +#: src/lang.c:295 msgid "display next unread article" msgstr "" @@ -1247,7 +1247,7 @@ msgstr "" msgid "display previous article" msgstr "" -#: src/lang.c:298 src/lang.c:364 +#: src/lang.c:298 msgid "display previous unread article" msgstr "" @@ -1263,191 +1263,195 @@ msgstr "" msgid "return to group selection level" msgstr "" -#: src/lang.c:303 +#: src/lang.c:302 msgid "reply through mail to author" msgstr "" -#: src/lang.c:304 +#: src/lang.c:303 msgid "reply through mail (don't copy text) to author" msgstr "" -#: src/lang.c:305 +#: src/lang.c:304 msgid "reply through mail to author quoting complete headers" msgstr "" -#: src/lang.c:306 src/lang.c:366 +#: src/lang.c:305 msgid "repost chosen article to another group" msgstr "" -#: src/lang.c:307 +#: src/lang.c:306 msgid "search backwards within this article" msgstr "" -#: src/lang.c:308 +#: src/lang.c:307 msgid "search forwards within this article" msgstr "" -#: src/lang.c:309 +#: src/lang.c:308 msgid "show article in raw-mode (including all headers)" msgstr "" -#: src/lang.c:310 +#: src/lang.c:309 msgid "skip next block of included text" msgstr "" -#: src/lang.c:311 +#: src/lang.c:310 msgid "toggle display of sections hidden by a form-feed (^L) on/off" msgstr "" -#: src/lang.c:312 +#: src/lang.c:311 msgid "toggle word highlighting on/off" msgstr "" -#: src/lang.c:313 +#: src/lang.c:312 msgid "toggle ROT-13 (basic decode) for current article" msgstr "" -#: src/lang.c:314 +#: src/lang.c:313 msgid "toggle tabwidth 4 <-> 8" msgstr "" -#: src/lang.c:315 +#: src/lang.c:314 msgid "toggle german TeX style decoding for current article" msgstr "" -#: src/lang.c:316 +#: src/lang.c:315 msgid "toggle display of uuencoded sections" msgstr "" -#: src/lang.c:317 +#: src/lang.c:316 msgid "View/save multimedia attachments" msgstr "" -#: src/lang.c:318 +#: src/lang.c:317 #, c-format msgid "report bug or comment via mail to %s" msgstr "" -#: src/lang.c:319 +#: src/lang.c:318 msgid "choose range of articles to be affected by next command" msgstr "" -#: src/lang.c:320 +#: src/lang.c:319 msgid "escape from command prompt" msgstr "" -#: src/lang.c:321 +#: src/lang.c:320 msgid "get help" msgstr "" -#: src/lang.c:322 +#: src/lang.c:321 msgid "display last article viewed" msgstr "" -#: src/lang.c:323 +#: src/lang.c:322 msgid "down one line" msgstr "" -#: src/lang.c:324 +#: src/lang.c:323 msgid "up one line" msgstr "" -#: src/lang.c:325 +#: src/lang.c:324 msgid "go to article chosen by Message-ID" msgstr "" -#: src/lang.c:326 +#: src/lang.c:325 msgid "mail article/thread/hot/pattern/tagged articles to someone" msgstr "" -#: src/lang.c:327 +#: src/lang.c:326 msgid "menu of configurable options" msgstr "" -#: src/lang.c:328 +#: src/lang.c:327 msgid "down one page" msgstr "" -#: src/lang.c:329 +#: src/lang.c:328 msgid "up one page" msgstr "" -#: src/lang.c:330 +#: src/lang.c:329 msgid "post (write) article to current group" msgstr "" -#: src/lang.c:331 +#: src/lang.c:330 msgid "post postponed articles" msgstr "" -#: src/lang.c:332 +#: src/lang.c:331 msgid "list articles posted by you (from posted file)" msgstr "" -#: src/lang.c:333 +#: src/lang.c:332 msgid "return to previous menu" msgstr "" -#: src/lang.c:334 +#: src/lang.c:333 msgid "quit tin immediately" msgstr "" -#: src/lang.c:335 +#: src/lang.c:334 msgid "redraw page" msgstr "" -#: src/lang.c:336 +#: src/lang.c:335 msgid "save article/thread/hot/pattern/tagged articles to file" msgstr "" -#: src/lang.c:337 +#: src/lang.c:336 msgid "save marked articles automatically without user prompts" msgstr "" -#: src/lang.c:338 +#: src/lang.c:337 msgid "search for articles by author backwards" msgstr "" -#: src/lang.c:339 +#: src/lang.c:338 msgid "search for articles by author forwards" msgstr "" -#: src/lang.c:340 +#: src/lang.c:339 msgid "search all articles for a given string (this may take some time)" msgstr "" -#: src/lang.c:341 +#: src/lang.c:340 msgid " \t (searches are case-insensitive and wrap around to all articles)" msgstr "" -#: src/lang.c:342 +#: src/lang.c:341 msgid "search for articles by Subject line backwards" msgstr "" -#: src/lang.c:343 +#: src/lang.c:342 msgid "search for articles by Subject line forwards" msgstr "" -#: src/lang.c:344 +#: src/lang.c:343 msgid "repeat last search" msgstr "" -#: src/lang.c:345 +#: src/lang.c:344 msgid "tag current article for reposting/mailing/piping/printing/saving" msgstr "" -#: src/lang.c:346 +#: src/lang.c:345 msgid "toggle info message in last line (subject/description)" msgstr "" -#: src/lang.c:347 +#: src/lang.c:346 msgid "toggle inverse video" msgstr "" -#: src/lang.c:348 +#: src/lang.c:347 msgid "toggle mini help menu display" msgstr "" +#: src/lang.c:348 +msgid "cycle the display of authors email address, real name, both or neither" +msgstr "" + #: src/lang.c:349 msgid "show version information" msgstr "" @@ -1464,329 +1468,325 @@ msgstr "" msgid "choose first thread in list" msgstr "" -#: src/lang.c:353 src/lang.c:384 -msgid "choose group by name" -msgstr "" - -#: src/lang.c:354 +#: src/lang.c:353 msgid "choose last thread in list" msgstr "" -#: src/lang.c:355 +#: src/lang.c:354 msgid "list articles within current thread (bring up Thread sub-menu)" msgstr "" -#: src/lang.c:356 +#: src/lang.c:355 msgid "mark article as unread" msgstr "" -#: src/lang.c:357 +#: src/lang.c:356 msgid "mark current thread or tagged threads as read" msgstr "" -#: src/lang.c:358 +#: src/lang.c:357 msgid "mark thread as unread" msgstr "" -#: src/lang.c:359 +#: src/lang.c:358 msgid "toggle display of all/selected articles" msgstr "" -#: src/lang.c:360 +#: src/lang.c:359 msgid "display next group" msgstr "" -#: src/lang.c:363 +#: src/lang.c:360 msgid "display previous group" msgstr "" -#: src/lang.c:365 src/lang.c:413 -msgid "read chosen article" -msgstr "" - -#: src/lang.c:367 +#: src/lang.c:361 msgid "toggle all selections (all articles)" msgstr "" -#: src/lang.c:368 +#: src/lang.c:362 msgid "select group (make \"hot\")" msgstr "" -#: src/lang.c:369 +#: src/lang.c:363 msgid "select thread" msgstr "" -#: src/lang.c:370 +#: src/lang.c:364 msgid "select threads if at least one unread article is selected" msgstr "" -#: src/lang.c:371 +#: src/lang.c:365 msgid "select threads that match user specified pattern" msgstr "" -#: src/lang.c:372 +#: src/lang.c:366 msgid "tag all parts of current multipart-message in order" msgstr "" -#: src/lang.c:373 +#: src/lang.c:367 msgid "0 - 9\t choose thread by number" msgstr "" -#: src/lang.c:374 +#: src/lang.c:368 msgid "toggle limit number of articles to get, and reload" msgstr "" -#: src/lang.c:375 +#: src/lang.c:369 msgid "toggle display of all/unread articles" msgstr "" -#: src/lang.c:376 src/lang.c:414 -msgid "cycle the display of authors email address, real name, both or neither" -msgstr "" - -#: src/lang.c:377 +#: src/lang.c:370 msgid "toggle selection of thread" msgstr "" -#: src/lang.c:378 +#: src/lang.c:371 msgid "cycle through threading options available" msgstr "" -#: src/lang.c:379 +#: src/lang.c:372 msgid "undo all selections (all articles)" msgstr "" -#: src/lang.c:380 +#: src/lang.c:373 msgid "untag all tagged threads" msgstr "" -#: src/lang.c:381 +#: src/lang.c:374 msgid "mark all articles in group as read" msgstr "" -#: src/lang.c:382 +#: src/lang.c:375 msgid "mark all articles in group as read and move to next unread group" msgstr "" -#: src/lang.c:383 +#: src/lang.c:376 msgid "choose first group in list" msgstr "" -#: src/lang.c:385 +#: src/lang.c:377 +msgid "choose group by name" +msgstr "" + +#: src/lang.c:378 msgid "0 - 9\t choose group by number" msgstr "" -#: src/lang.c:386 +#: src/lang.c:379 msgid "choose range of groups to be affected by next command" msgstr "" -#: src/lang.c:387 +#: src/lang.c:380 msgid "choose last group in list" msgstr "" -#: src/lang.c:388 +#: src/lang.c:381 msgid "mark all articles in chosen group unread" msgstr "" -#: src/lang.c:389 +#: src/lang.c:382 msgid "move chosen group within list" msgstr "" -#: src/lang.c:390 +#: src/lang.c:383 msgid "choose next group with unread news" msgstr "" -#: src/lang.c:391 src/lang.c:1173 +#: src/lang.c:384 src/lang.c:1165 msgid "quit" msgstr "" -#: src/lang.c:392 +#: src/lang.c:385 msgid "quit without saving configuration changes" msgstr "" -#: src/lang.c:393 +#: src/lang.c:386 msgid "read chosen group" msgstr "" -#: src/lang.c:394 +#: src/lang.c:387 msgid "reset .newsrc (all available articles in groups marked unread)" msgstr "" -#: src/lang.c:395 +#: src/lang.c:388 msgid "search backwards for a group name" msgstr "" -#: src/lang.c:396 +#: src/lang.c:389 msgid " \t (all searches are case-insensitive and wrap around)" msgstr "" -#: src/lang.c:397 +#: src/lang.c:390 msgid "search forwards for a group name" msgstr "" -#: src/lang.c:398 +#: src/lang.c:391 msgid "subscribe to chosen group" msgstr "" -#: src/lang.c:399 +#: src/lang.c:392 msgid "subscribe to groups that match pattern" msgstr "" -#: src/lang.c:400 +#: src/lang.c:393 msgid "reread active file to check for any new news" msgstr "" -#: src/lang.c:401 +#: src/lang.c:394 msgid "toggle display of group name only or group name plus description" msgstr "" -#: src/lang.c:402 +#: src/lang.c:395 msgid "toggle display to show all/unread subscribed groups" msgstr "" -#: src/lang.c:403 +#: src/lang.c:396 msgid "unsubscribe from chosen group" msgstr "" -#: src/lang.c:404 +#: src/lang.c:397 msgid "unsubscribe from groups that match pattern" msgstr "" -#: src/lang.c:405 +#: src/lang.c:398 msgid "sort the list of groups" msgstr "" -#: src/lang.c:406 +#: src/lang.c:399 msgid "toggle display to show all/subscribed groups" msgstr "" -#: src/lang.c:407 +#: src/lang.c:400 msgid "0 - 9\t choose article by number" msgstr "" -#: src/lang.c:408 +#: src/lang.c:401 msgid "mark thread as read and return to group index page" msgstr "" -#: src/lang.c:409 +#: src/lang.c:402 msgid "mark thread as read and enter next unread thread or group" msgstr "" -#: src/lang.c:410 +#: src/lang.c:403 msgid "choose first article in list" msgstr "" -#: src/lang.c:411 +#: src/lang.c:404 msgid "choose last article in list" msgstr "" -#: src/lang.c:412 +#: src/lang.c:405 msgid "" "mark article or tagged articles as read and move cursor to next unread " "article" msgstr "" -#: src/lang.c:415 +#: src/lang.c:406 +msgid "read chosen article" +msgstr "" + +#: src/lang.c:407 msgid "" "Display properties\n" "------------------" msgstr "" -#: src/lang.c:416 +#: src/lang.c:408 msgid "" "Miscellaneous\n" "-------------" msgstr "" -#: src/lang.c:417 +#: src/lang.c:409 msgid "" "Moving around\n" "-------------" msgstr "" -#: src/lang.c:418 +#: src/lang.c:410 msgid "" "Group/thread/article operations\n" "-------------------------------" msgstr "" -#: src/lang.c:420 +#: src/lang.c:412 msgid "Group Level Commands" msgstr "" -#: src/lang.c:421 +#: src/lang.c:413 msgid "Kill filter added" msgstr "" -#: src/lang.c:422 +#: src/lang.c:414 msgid "Auto-selection filter added" msgstr "" -#: src/lang.c:423 +#: src/lang.c:415 msgid "All parts tagged" msgstr "" -#: src/lang.c:424 +#: src/lang.c:416 msgid "Storing article for later posting" msgstr "" -#: src/lang.c:425 +#: src/lang.c:417 msgid "Please enter a valid character" msgstr "" -#: src/lang.c:426 +#: src/lang.c:418 #, c-format msgid "Missing part #%d" msgstr "" -#: src/lang.c:427 +#: src/lang.c:419 msgid "*** No postponed articles ***" msgstr "" -#: src/lang.c:428 +#: src/lang.c:420 msgid "Not a multi-part message" msgstr "" -#: src/lang.c:429 +#: src/lang.c:421 msgid "You are not subscribed to this group" msgstr "" -#: src/lang.c:430 +#: src/lang.c:422 msgid "No previous expression" msgstr "" -#: src/lang.c:431 +#: src/lang.c:423 msgid "Operation disabled in no-overwrite mode" msgstr "" #. TODO: replace hardcoded key-name in txt_info_postponed -#: src/lang.c:433 +#: src/lang.c:425 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "" -#: src/lang.c:434 +#: src/lang.c:426 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:436 +#: src/lang.c:428 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "" -#: src/lang.c:437 +#: src/lang.c:429 msgid "TeX2Iso encoded article" msgstr "" -#: src/lang.c:438 +#: src/lang.c:430 msgid "incomplete " msgstr "" #. TODO: replace hardcoded key-names -#: src/lang.c:440 +#: src/lang.c:432 #, c-format msgid "" "\n" @@ -1824,129 +1824,129 @@ msgid "" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "" -#: src/lang.c:456 +#: src/lang.c:448 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "" -#: src/lang.c:457 +#: src/lang.c:449 #, c-format msgid "Invalid Sender:-header %s" msgstr "" -#: src/lang.c:458 +#: src/lang.c:450 msgid "Inverse video disabled" msgstr "" -#: src/lang.c:459 +#: src/lang.c:451 msgid "Inverse video enabled" msgstr "" -#: src/lang.c:461 +#: src/lang.c:453 #, c-format msgid "Missing definition for %s\n" msgstr "" -#: src/lang.c:462 +#: src/lang.c:454 #, c-format msgid "Invalid key definition '%s'\n" msgstr "" -#: src/lang.c:463 +#: src/lang.c:455 #, c-format msgid "Invalid keyname '%s'\n" msgstr "" -#: src/lang.c:464 +#: src/lang.c:456 #, c-format msgid "Key '%s' is defined for both %s%s and %s%s\n" msgstr "" -#: src/lang.c:465 +#: src/lang.c:457 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "" -#: src/lang.c:466 +#: src/lang.c:458 msgid "Kill Lines: (num): " msgstr "" -#: src/lang.c:467 +#: src/lang.c:459 msgid "Kill Article Menu" msgstr "" -#: src/lang.c:468 +#: src/lang.c:460 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:469 +#: src/lang.c:461 msgid "Kill pattern scope : " msgstr "" -#: src/lang.c:470 +#: src/lang.c:462 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "" -#: src/lang.c:471 +#: src/lang.c:463 msgid "Kill text pattern : " msgstr "" -#: src/lang.c:472 +#: src/lang.c:464 msgid "Kill time in days : " msgstr "" -#: src/lang.c:474 +#: src/lang.c:466 msgid "Last" msgstr "" -#: src/lang.c:475 +#: src/lang.c:467 msgid "-- Last response --" msgstr "" -#: src/lang.c:476 +#: src/lang.c:468 #, c-format msgid "Lines %s " msgstr "" -#: src/lang.c:478 +#: src/lang.c:470 msgid "Message-ID: line " msgstr "" -#: src/lang.c:480 +#: src/lang.c:472 msgid "mailbox " msgstr "" -#: src/lang.c:481 +#: src/lang.c:473 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "" -#: src/lang.c:482 +#: src/lang.c:474 #, c-format msgid "Mailing log to %s\n" msgstr "" -#: src/lang.c:483 +#: src/lang.c:475 msgid "Mail bug report..." msgstr "" -#: src/lang.c:484 +#: src/lang.c:476 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "" -#: src/lang.c:485 +#: src/lang.c:477 msgid "Mailed" msgstr "" -#: src/lang.c:486 +#: src/lang.c:478 #, c-format msgid "Mailing to %s..." msgstr "" -#: src/lang.c:487 +#: src/lang.c:479 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -1954,285 +1954,285 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:490 +#: src/lang.c:482 #, c-format msgid "%s marked as unread" msgstr "" -#: src/lang.c:491 +#: src/lang.c:483 #, c-format msgid "Marked %d of %d tagged %s as read" msgstr "" -#: src/lang.c:492 +#: src/lang.c:484 #, c-format msgid "Mark all articles as read%s?" msgstr "" -#: src/lang.c:493 +#: src/lang.c:485 #, c-format msgid "Mark %s=tagged articles, %s=current article, %s=quit: " msgstr "" -#: src/lang.c:494 +#: src/lang.c:486 #, c-format -msgid "Mark group %.*s as read?" +msgid "Mark group %s as read?" msgstr "" -#: src/lang.c:495 +#: src/lang.c:487 #, c-format msgid "Mark thread as read%s?" msgstr "" -#: src/lang.c:496 +#: src/lang.c:488 #, c-format msgid "Mark %s=tagged articles/threads, %s=current thread, %s=quit: " msgstr "" -#: src/lang.c:497 +#: src/lang.c:489 #, c-format msgid "Matching %s groups..." msgstr "" -#: src/lang.c:498 src/lang.c:502 +#: src/lang.c:490 src/lang.c:494 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" -#: src/lang.c:499 +#: src/lang.c:491 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " "%s=list thread" msgstr "" -#: src/lang.c:500 +#: src/lang.c:492 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" -#: src/lang.c:501 +#: src/lang.c:493 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "" -#: src/lang.c:503 +#: src/lang.c:495 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" -#: src/lang.c:504 +#: src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" -#: src/lang.c:505 +#: src/lang.c:497 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" -#: src/lang.c:506 +#: src/lang.c:498 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank " "in/out" msgstr "" -#: src/lang.c:507 +#: src/lang.c:499 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" -#: src/lang.c:508 +#: src/lang.c:500 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" -#: src/lang.c:509 +#: src/lang.c:501 msgid "--More--" msgstr "" -#: src/lang.c:510 +#: src/lang.c:502 #, c-format msgid "Moving %s..." msgstr "" -#: src/lang.c:512 +#: src/lang.c:504 msgid ", name: " msgstr "" -#: src/lang.c:513 +#: src/lang.c:505 #, c-format msgid "Goto newsgroup [%s]> " msgstr "" -#: src/lang.c:514 +#: src/lang.c:506 msgid "newsgroups" msgstr "" -#: src/lang.c:515 +#: src/lang.c:507 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "" -#: src/lang.c:516 +#: src/lang.c:508 msgid "newsgroup" msgstr "" -#: src/lang.c:517 +#: src/lang.c:509 msgid "Try and save newsrc file again?" msgstr "" -#: src/lang.c:518 +#: src/lang.c:510 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" -#: src/lang.c:519 +#: src/lang.c:511 msgid "newsrc file saved successfully.\n" msgstr "" -#: src/lang.c:520 +#: src/lang.c:512 msgid "-- Next response --" msgstr "" -#: src/lang.c:521 +#: src/lang.c:513 #, c-format msgid "NNTP authorization password not found for %s" msgstr "" -#: src/lang.c:522 +#: src/lang.c:514 msgid "No " msgstr "" -#: src/lang.c:523 +#: src/lang.c:515 msgid "*** No articles ***" msgstr "" -#: src/lang.c:524 +#: src/lang.c:516 msgid "No articles have been posted" msgstr "" -#: src/lang.c:525 +#: src/lang.c:517 msgid "*** No description ***" msgstr "" -#: src/lang.c:526 +#: src/lang.c:518 msgid "No filename" msgstr "" -#: src/lang.c:527 +#: src/lang.c:519 msgid "No group" msgstr "" -#: src/lang.c:528 +#: src/lang.c:520 msgid "*** No groups ***" msgstr "" -#: src/lang.c:529 +#: src/lang.c:521 msgid "No more groups to read" msgstr "" -#: src/lang.c:530 +#: src/lang.c:522 msgid "No last message" msgstr "" -#: src/lang.c:531 +#: src/lang.c:523 msgid "No mail address" msgstr "" -#: src/lang.c:532 +#: src/lang.c:524 msgid "No articles marked for saving" msgstr "" -#: src/lang.c:533 +#: src/lang.c:525 msgid "No match" msgstr "" -#: src/lang.c:534 +#: src/lang.c:526 msgid "No more groups" msgstr "" -#: src/lang.c:535 +#: src/lang.c:527 msgid "No newsgroups" msgstr "" -#: src/lang.c:536 +#: src/lang.c:528 msgid "No next unread article" msgstr "" -#: src/lang.c:537 +#: src/lang.c:529 msgid "No previous group" msgstr "" -#: src/lang.c:538 +#: src/lang.c:530 msgid "No previous unread article" msgstr "" -#: src/lang.c:539 +#: src/lang.c:531 msgid "No responses" msgstr "" -#: src/lang.c:540 +#: src/lang.c:532 msgid "No responses to list in current thread" msgstr "" -#: src/lang.c:541 +#: src/lang.c:533 msgid "No search string" msgstr "" -#: src/lang.c:542 +#: src/lang.c:534 msgid "No subject" msgstr "" -#: src/lang.c:543 +#: src/lang.c:535 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "" -#: src/lang.c:544 +#: src/lang.c:536 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "" -#: src/lang.c:545 +#: src/lang.c:537 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "" -#: src/lang.c:546 +#: src/lang.c:538 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "" -#: src/lang.c:547 +#: src/lang.c:539 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" -#: src/lang.c:548 +#: src/lang.c:540 #, c-format msgid "No viewer found for %s/%s\n" msgstr "" -#: src/lang.c:549 +#: src/lang.c:541 msgid "Newsgroup does not exist on this server" msgstr "" -#: src/lang.c:550 +#: src/lang.c:542 #, c-format msgid "Group %s not found in active file" msgstr "" -#: src/lang.c:551 +#: src/lang.c:543 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:552 +#: src/lang.c:544 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:553 +#: src/lang.c:545 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -2249,311 +2249,311 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:560 +#: src/lang.c:552 msgid "Only" msgstr "" -#: src/lang.c:561 +#: src/lang.c:553 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "" -#: src/lang.c:562 +#: src/lang.c:554 msgid "Options Menu" msgstr "" -#: src/lang.c:565 +#: src/lang.c:557 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "" -#: src/lang.c:566 +#: src/lang.c:558 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "" -#: src/lang.c:567 +#: src/lang.c:559 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "" -#: src/lang.c:568 +#: src/lang.c:560 msgid "Post a followup..." msgstr "" #. TODO: replace hardcoded key-name in txt_post_error_ask_postpone -#: src/lang.c:570 +#: src/lang.c:562 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:573 +#: src/lang.c:565 msgid "Posted articles history" msgstr "" -#: src/lang.c:574 +#: src/lang.c:566 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "" -#: src/lang.c:575 +#: src/lang.c:567 msgid "-- post processing started --" msgstr "" -#: src/lang.c:576 +#: src/lang.c:568 msgid "-- post processing completed --" msgstr "" -#: src/lang.c:577 +#: src/lang.c:569 #, c-format msgid "Post subject [%s]> " msgstr "" -#: src/lang.c:578 +#: src/lang.c:570 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "" -#: src/lang.c:579 +#: src/lang.c:571 msgid "Posting article..." msgstr "" -#: src/lang.c:580 -msgid "Post postponed articles [%%.*s]? (%s/%s/%s/%s/%s): " +#: src/lang.c:572 +msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "" -#: src/lang.c:581 +#: src/lang.c:573 #, c-format msgid "Hot %s" msgstr "" -#: src/lang.c:582 +#: src/lang.c:574 #, c-format msgid "Tagged %s" msgstr "" -#: src/lang.c:583 +#: src/lang.c:575 #, c-format msgid "Untagged %s" msgstr "" -#: src/lang.c:584 +#: src/lang.c:576 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:585 +#: src/lang.c:577 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:586 +#: src/lang.c:578 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:587 +#: src/lang.c:579 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:588 +#: src/lang.c:580 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:590 +#: src/lang.c:582 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:591 +#: src/lang.c:583 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:592 +#: src/lang.c:584 msgid "Do you really want to quit?" msgstr "" -#: src/lang.c:593 -msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%.*s]: " +#: src/lang.c:585 +msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:594 +#: src/lang.c:586 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:595 +#: src/lang.c:587 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:596 +#: src/lang.c:588 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:597 +#: src/lang.c:589 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:598 +#: src/lang.c:590 msgid "Do you really want to quit without saving your configuration?" msgstr "" -#: src/lang.c:601 +#: src/lang.c:593 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:602 +#: src/lang.c:594 msgid "Do you want to abort this operation?" msgstr "" -#: src/lang.c:603 +#: src/lang.c:595 msgid "Do you want to exit tin immediately?" msgstr "" -#: src/lang.c:604 +#: src/lang.c:596 msgid "Read response> " msgstr "" -#: src/lang.c:605 +#: src/lang.c:597 msgid "Reading ('q' to quit)..." msgstr "" -#: src/lang.c:606 +#: src/lang.c:598 #, c-format msgid "Reading %sarticles..." msgstr "" -#: src/lang.c:607 +#: src/lang.c:599 #, c-format msgid "Reading %sattributes file...\n" msgstr "" -#: src/lang.c:608 +#: src/lang.c:600 #, c-format msgid "Reading %sconfig file...\n" msgstr "" -#: src/lang.c:609 +#: src/lang.c:601 msgid "Reading filter file...\n" msgstr "" -#: src/lang.c:610 +#: src/lang.c:602 #, c-format msgid "Reading %s groups..." msgstr "" -#: src/lang.c:611 +#: src/lang.c:603 msgid "Reading input history file...\n" msgstr "" -#: src/lang.c:612 +#: src/lang.c:604 msgid "Reading keymap file...\n" msgstr "" -#: src/lang.c:613 +#: src/lang.c:605 msgid "Reading groups from active file... " msgstr "" -#: src/lang.c:614 +#: src/lang.c:606 msgid "Reading groups from newsrc file... " msgstr "" -#: src/lang.c:615 +#: src/lang.c:607 msgid "Reading newsgroups file... " msgstr "" -#: src/lang.c:616 +#: src/lang.c:608 msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:617 +#: src/lang.c:609 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:618 +#: src/lang.c:610 #, c-format msgid "Error: rename %s to %s" msgstr "" -#: src/lang.c:619 +#: src/lang.c:611 msgid "Reply to author..." msgstr "" -#: src/lang.c:620 +#: src/lang.c:612 msgid "Repost" msgstr "" -#: src/lang.c:621 +#: src/lang.c:613 msgid "Reposting article..." msgstr "" -#: src/lang.c:622 +#: src/lang.c:614 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:623 +#: src/lang.c:615 msgid "Reset newsrc?" msgstr "" -#: src/lang.c:624 +#: src/lang.c:616 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:625 +#: src/lang.c:617 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:626 +#: src/lang.c:618 #, c-format msgid "RespNo %4d of %4d" msgstr "" -#: src/lang.c:627 +#: src/lang.c:619 msgid "Press to continue..." msgstr "" -#: src/lang.c:629 +#: src/lang.c:621 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:630 +#: src/lang.c:622 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:631 +#: src/lang.c:623 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:632 +#: src/lang.c:624 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:633 +#: src/lang.c:625 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:634 +#: src/lang.c:626 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:635 +#: src/lang.c:627 msgid "Select text pattern : " msgstr "" -#: src/lang.c:636 +#: src/lang.c:628 msgid "Select time in days : " msgstr "" -#: src/lang.c:637 +#: src/lang.c:629 #, c-format msgid "" "# %s server configuration file\n" @@ -2567,219 +2567,219 @@ msgid "" "\n" msgstr "" -#: src/lang.c:643 +#: src/lang.c:635 msgid "Showing unread groups only" msgstr "" -#: src/lang.c:644 +#: src/lang.c:636 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:645 +#: src/lang.c:637 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:646 +#: src/lang.c:638 msgid "Save" msgstr "" -#: src/lang.c:647 +#: src/lang.c:639 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "" -#: src/lang.c:648 +#: src/lang.c:640 msgid "Save configuration before continuing?" msgstr "" -#: src/lang.c:649 +#: src/lang.c:641 msgid "Save filename> " msgstr "" -#: src/lang.c:650 +#: src/lang.c:642 msgid "Saved" msgstr "" -#: src/lang.c:651 +#: src/lang.c:643 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:652 +#: src/lang.c:644 #, c-format msgid "Saved %s...\n" msgstr "" -#: src/lang.c:653 +#: src/lang.c:645 msgid "Nothing was saved" msgstr "" -#: src/lang.c:654 +#: src/lang.c:646 #, c-format msgid "" "\n" "%s %d %s from %d %s\n" msgstr "" -#: src/lang.c:655 +#: src/lang.c:647 #, c-format msgid "-- %s saved to %s%s --" msgstr "" -#: src/lang.c:656 +#: src/lang.c:648 #, c-format msgid "-- %s saved to %s - %s --" msgstr "" -#: src/lang.c:657 +#: src/lang.c:649 msgid "Saving..." msgstr "" -#: src/lang.c:658 +#: src/lang.c:650 #, c-format msgid "%s: Screen initialization failed" msgstr "" -#: src/lang.c:659 +#: src/lang.c:651 #, c-format msgid "%s: screen is too small\n" msgstr "" -#: src/lang.c:660 +#: src/lang.c:652 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "" -#: src/lang.c:661 +#: src/lang.c:653 #, c-format msgid "Search backwards [%s]> " msgstr "" -#: src/lang.c:662 +#: src/lang.c:654 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:663 +#: src/lang.c:655 #, c-format msgid "Search forwards [%s]> " msgstr "" -#: src/lang.c:664 +#: src/lang.c:656 msgid "Searching..." msgstr "" -#: src/lang.c:665 +#: src/lang.c:657 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:666 +#: src/lang.c:658 msgid "Select article> " msgstr "" -#: src/lang.c:667 +#: src/lang.c:659 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" -#: src/lang.c:668 +#: src/lang.c:660 msgid "Select group> " msgstr "" -#: src/lang.c:669 +#: src/lang.c:661 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:670 +#: src/lang.c:662 msgid "Select thread > " msgstr "" -#: src/lang.c:671 +#: src/lang.c:663 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:672 +#: src/lang.c:664 msgid "servers active-file" msgstr "" -#: src/lang.c:673 +#: src/lang.c:665 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:674 +#: src/lang.c:666 msgid "" msgstr "" -#: src/lang.c:675 +#: src/lang.c:667 #, c-format msgid "Starting: (%s)" msgstr "" -#: src/lang.c:676 +#: src/lang.c:668 #, c-format msgid "List Thread (%d of %d)" msgstr "" -#: src/lang.c:677 +#: src/lang.c:669 #, c-format msgid "Thread (%.*s)" msgstr "" -#: src/lang.c:678 +#: src/lang.c:670 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:679 +#: src/lang.c:671 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:680 +#: src/lang.c:672 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:681 +#: src/lang.c:673 msgid "Subscribing... " msgstr "" -#: src/lang.c:682 -msgid "Repost or supersede article(s) [%%.*s]? (%s/%s/%s): " +#: src/lang.c:674 +msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:683 +#: src/lang.c:675 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:684 +#: src/lang.c:676 msgid "Superseding article ..." msgstr "" -#: src/lang.c:685 +#: src/lang.c:677 #, c-format msgid "" "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:687 +#: src/lang.c:679 #, c-format msgid "%d days" msgstr "" -#: src/lang.c:688 +#: src/lang.c:680 msgid "" msgstr "" -#: src/lang.c:689 +#: src/lang.c:681 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:690 +#: src/lang.c:682 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" @@ -2790,262 +2790,262 @@ msgid "" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" -#: src/lang.c:703 +#: src/lang.c:695 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:704 +#: src/lang.c:696 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:705 +#: src/lang.c:697 msgid "There is no news\n" msgstr "" -#: src/lang.c:706 +#: src/lang.c:698 msgid "Thread" msgstr "" -#: src/lang.c:707 +#: src/lang.c:699 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:708 +#: src/lang.c:700 msgid "Thread deselected" msgstr "" -#: src/lang.c:709 +#: src/lang.c:701 msgid "Thread selected" msgstr "" -#: src/lang.c:710 +#: src/lang.c:702 msgid "threads" msgstr "" -#: src/lang.c:711 +#: src/lang.c:703 msgid "Thread range" msgstr "" -#: src/lang.c:712 +#: src/lang.c:704 msgid "thread" msgstr "" -#: src/lang.c:713 +#: src/lang.c:705 #, c-format msgid "Thread %4s of %4s" msgstr "" -#: src/lang.c:714 +#: src/lang.c:706 msgid "Threading articles..." msgstr "" -#: src/lang.c:715 +#: src/lang.c:707 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:716 +#: src/lang.c:708 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:717 +#: src/lang.c:709 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:718 +#: src/lang.c:710 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:719 +#: src/lang.c:711 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:720 +#: src/lang.c:712 #, c-format msgid "%d Trying to lock %s" msgstr "" -#: src/lang.c:721 +#: src/lang.c:713 msgid " h=help\n" msgstr "" -#: src/lang.c:723 +#: src/lang.c:715 msgid "Unlimited" msgstr "" -#: src/lang.c:724 +#: src/lang.c:716 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:725 +#: src/lang.c:717 #, c-format msgid "Error decoding %s : %s" msgstr "" -#: src/lang.c:726 +#: src/lang.c:718 msgid "No end." msgstr "" -#: src/lang.c:727 +#: src/lang.c:719 #, c-format msgid "%s successfully decoded." msgstr "" -#: src/lang.c:728 +#: src/lang.c:720 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:729 +#: src/lang.c:721 msgid "unread " msgstr "" -#: src/lang.c:730 +#: src/lang.c:722 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:731 +#: src/lang.c:723 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:732 +#: src/lang.c:724 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:733 +#: src/lang.c:725 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:734 +#: src/lang.c:726 msgid "Updated" msgstr "" -#: src/lang.c:735 +#: src/lang.c:727 msgid "Updating" msgstr "" -#: src/lang.c:736 +#: src/lang.c:728 #, c-format msgid "Opening %s\n" msgstr "" -#: src/lang.c:737 +#: src/lang.c:729 msgid "No more URL's in this article" msgstr "" -#: src/lang.c:738 +#: src/lang.c:730 msgid "Use MIME display program for this message?" msgstr "" -#: src/lang.c:739 +#: src/lang.c:731 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr "" -#: src/lang.c:740 +#: src/lang.c:732 msgid " -Z return status indicating if any unread news (batch mode)" msgstr "" -#: src/lang.c:741 +#: src/lang.c:733 msgid " -q don't check for new newsgroups" msgstr "" -#: src/lang.c:742 +#: src/lang.c:734 msgid " -X don't save any files on quit" msgstr "" -#: src/lang.c:743 +#: src/lang.c:735 msgid " -d don't show newsgroup descriptions" msgstr "" -#: src/lang.c:744 +#: src/lang.c:736 msgid " -G limit get only limit articles/group" msgstr "" -#: src/lang.c:745 +#: src/lang.c:737 #, c-format msgid " -H help information about %s" msgstr "" -#: src/lang.c:746 +#: src/lang.c:738 msgid " -h this help message" msgstr "" -#: src/lang.c:747 +#: src/lang.c:739 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr "" -#: src/lang.c:748 +#: src/lang.c:740 msgid " -u update index files (batch mode)" msgstr "" -#: src/lang.c:749 +#: src/lang.c:741 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr "" -#: src/lang.c:750 +#: src/lang.c:742 #, c-format msgid "" "\n" "Mail bug reports/comments to %s" msgstr "" -#: src/lang.c:751 +#: src/lang.c:743 msgid " -N mail new news to your posts (batch mode)" msgstr "" -#: src/lang.c:752 +#: src/lang.c:744 msgid " -M user mail new news to specified user (batch mode)" msgstr "" -#: src/lang.c:753 +#: src/lang.c:745 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr "" -#: src/lang.c:754 +#: src/lang.c:746 msgid " -x no posting mode" msgstr "" -#: src/lang.c:755 +#: src/lang.c:747 msgid " -w post an article and exit" msgstr "" -#: src/lang.c:756 +#: src/lang.c:748 msgid " -o post all postponed articles and exit" msgstr "" -#: src/lang.c:757 +#: src/lang.c:749 msgid " -r read news remotely from default NNTP server" msgstr "" -#: src/lang.c:758 +#: src/lang.c:750 msgid " -R read news saved by -S option" msgstr "" -#: src/lang.c:759 +#: src/lang.c:751 #, c-format msgid " -s dir save news directory [default=%s]" msgstr "" -#: src/lang.c:760 +#: src/lang.c:752 msgid " -S save new news for later reading (batch mode)" msgstr "" -#: src/lang.c:761 +#: src/lang.c:753 msgid " -z start if any unread news" msgstr "" -#: src/lang.c:762 +#: src/lang.c:754 #, c-format msgid "" "A Usenet reader.\n" @@ -3053,37 +3053,37 @@ msgid "" "Usage: %s [options] [newsgroup[,...]]" msgstr "" -#: src/lang.c:763 +#: src/lang.c:755 msgid " -v verbose output for batch mode options" msgstr "" -#: src/lang.c:764 +#: src/lang.c:756 msgid " -V print version & date information" msgstr "" -#: src/lang.c:765 +#: src/lang.c:757 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "" -#: src/lang.c:766 +#: src/lang.c:758 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "" -#: src/lang.c:768 +#: src/lang.c:760 #, c-format msgid "" "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:769 +#: src/lang.c:761 #, c-format msgid "View '%s' (%s/%s)?" msgstr "" -#: src/lang.c:771 +#: src/lang.c:763 #, c-format msgid "" "\n" @@ -3091,33 +3091,33 @@ msgid "" "%-100s\n" msgstr "" -#: src/lang.c:772 +#: src/lang.c:764 msgid "" "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:773 +#: src/lang.c:765 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:774 +#: src/lang.c:766 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no " "\"References:\".\n" msgstr "" -#: src/lang.c:776 +#: src/lang.c:768 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:779 +#: src/lang.c:771 msgid "" "Read carefully!\n" "\n" @@ -3131,7 +3131,7 @@ msgid "" "\n" msgstr "" -#: src/lang.c:783 +#: src/lang.c:775 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -3140,7 +3140,7 @@ msgid "" " not be encoded properly.\n" msgstr "" -#: src/lang.c:788 +#: src/lang.c:780 #, c-format msgid "" "\n" @@ -3150,7 +3150,7 @@ msgid "" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:790 +#: src/lang.c:782 #, c-format msgid "" "\n" @@ -3159,7 +3159,7 @@ msgid "" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:793 +#: src/lang.c:785 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -3169,19 +3169,19 @@ msgid "" "before you start tin once again!\n" msgstr "" -#: src/lang.c:797 +#: src/lang.c:789 #, c-format msgid "" "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:798 +#: src/lang.c:790 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:799 +#: src/lang.c:791 #, c-format msgid "" "\n" @@ -3192,49 +3192,49 @@ msgid "" " possible.\n" msgstr "" -#: src/lang.c:803 +#: src/lang.c:795 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:804 +#: src/lang.c:796 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:805 +#: src/lang.c:797 msgid "Writing attributes file..." msgstr "" -#: src/lang.c:807 +#: src/lang.c:799 #, c-format msgid "%d Responses" msgstr "" -#: src/lang.c:809 +#: src/lang.c:801 #, c-format msgid "Added %d %s" msgstr "" -#: src/lang.c:810 +#: src/lang.c:802 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:811 +#: src/lang.c:803 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:812 +#: src/lang.c:804 msgid "Yes " msgstr "" -#: src/lang.c:813 +#: src/lang.c:805 msgid " You have mail\n" msgstr "" -#: src/lang.c:818 +#: src/lang.c:810 #, c-format msgid "" "\n" @@ -3247,16 +3247,16 @@ msgid "" " M)enu option.\n" msgstr "" -#: src/lang.c:829 +#: src/lang.c:821 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "" -#: src/lang.c:830 +#: src/lang.c:822 msgid " -D debug mode 1=NNTP 2=ALL" msgstr "" -#: src/lang.c:834 +#: src/lang.c:826 msgid "" "Read carefully!\n" "\n" @@ -3273,11 +3273,11 @@ msgid "" "\n" msgstr "" -#: src/lang.c:843 +#: src/lang.c:835 msgid "toggle color" msgstr "" -#: src/lang.c:844 +#: src/lang.c:836 msgid "" "# For color-adjust use the following numbers\n" "# 0-black 1-red 2-green 3-brown\n" @@ -3290,351 +3290,351 @@ msgid "" "\n" msgstr "" -#: src/lang.c:852 +#: src/lang.c:844 msgid " -a toggle color flag" msgstr "" -#: src/lang.c:856 +#: src/lang.c:848 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:857 +#: src/lang.c:849 #, c-format msgid "" "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:858 +#: src/lang.c:850 #, c-format msgid "" "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:860 +#: src/lang.c:852 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:861 +#: src/lang.c:853 #, c-format msgid "" "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:862 +#: src/lang.c:854 #, c-format msgid "" "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:863 +#: src/lang.c:855 #, c-format msgid "" "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:867 +#: src/lang.c:859 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:868 +#: src/lang.c:860 msgid "Missing parts." msgstr "" -#: src/lang.c:869 +#: src/lang.c:861 msgid "No beginning." msgstr "" -#: src/lang.c:870 +#: src/lang.c:862 msgid "No data." msgstr "" -#: src/lang.c:871 +#: src/lang.c:863 msgid "Unknown error." msgstr "" -#: src/lang.c:873 +#: src/lang.c:865 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "" -#: src/lang.c:877 +#: src/lang.c:869 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:878 +#: src/lang.c:870 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:882 +#: src/lang.c:874 msgid "perform PGP operations on article" msgstr "" -#: src/lang.c:883 +#: src/lang.c:875 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:884 +#: src/lang.c:876 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "" -#: src/lang.c:885 +#: src/lang.c:877 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "" -#: src/lang.c:886 +#: src/lang.c:878 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:887 +#: src/lang.c:879 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:889 +#: src/lang.c:881 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:890 -msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%.*s]: " +#: src/lang.c:882 +msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:891 +#: src/lang.c:883 msgid "" -"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: " +"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:893 +#: src/lang.c:885 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:894 -msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%.*s]: " +#: src/lang.c:886 +msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:895 -msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:887 +msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:899 +#: src/lang.c:891 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:900 -msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%.*s]: " +#: src/lang.c:892 +msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:901 -msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:893 +msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:903 +#: src/lang.c:895 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:904 -msgid "%s=quit, %s=edit, %s=send [%%.*s]: " +#: src/lang.c:896 +msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:905 -msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%.*s]: " +#: src/lang.c:897 +msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:914 +#: src/lang.c:906 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:915 +#: src/lang.c:907 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:916 +#: src/lang.c:908 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:917 +#: src/lang.c:909 #, c-format msgid "Connecting to %s:%d..." msgstr "" -#: src/lang.c:918 +#: src/lang.c:910 msgid "Disconnecting from server...\n" msgstr "" -#: src/lang.c:919 +#: src/lang.c:911 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "" -#: src/lang.c:920 +#: src/lang.c:912 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "" -#: src/lang.c:921 +#: src/lang.c:913 msgid "205 Closing connection" msgstr "" -#: src/lang.c:922 +#: src/lang.c:914 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "" -#: src/lang.c:923 +#: src/lang.c:915 msgid "Connection to news server has timed out. Reconnect?" msgstr "" -#: src/lang.c:924 +#: src/lang.c:916 #, c-format msgid "" "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "" -#: src/lang.c:925 +#: src/lang.c:917 msgid " -A force authentication on connect" msgstr "" -#: src/lang.c:926 +#: src/lang.c:918 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr "" -#: src/lang.c:927 +#: src/lang.c:919 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr "" -#: src/lang.c:928 +#: src/lang.c:920 msgid " -Q quick start. Same as -nqd" msgstr "" -#: src/lang.c:929 +#: src/lang.c:921 msgid " -l use only LIST instead of GROUP (-n) command" msgstr "" -#: src/lang.c:930 +#: src/lang.c:922 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr "" -#: src/lang.c:932 +#: src/lang.c:924 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "" -#: src/lang.c:935 +#: src/lang.c:927 msgid "" "\n" "socket or connect problem\n" msgstr "" -#: src/lang.c:937 +#: src/lang.c:929 #, c-format msgid "" "\n" "Connection to %s: " msgstr "" -#: src/lang.c:938 +#: src/lang.c:930 msgid "Giving up...\n" msgstr "" -#: src/lang.c:941 +#: src/lang.c:933 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:944 +#: src/lang.c:936 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "" -#: src/lang.c:947 +#: src/lang.c:939 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "" -#: src/lang.c:950 +#: src/lang.c:942 msgid " -Q quick start. Same as -qd" msgstr "" -#: src/lang.c:951 +#: src/lang.c:943 msgid " -l read only active file instead of scanning spool (-n) command" msgstr "" -#: src/lang.c:952 +#: src/lang.c:944 msgid " -n only read subscribed .newsrc groups from spool" msgstr "" -#: src/lang.c:953 +#: src/lang.c:945 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "" -#: src/lang.c:957 +#: src/lang.c:949 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "" -#: src/lang.c:958 +#: src/lang.c:950 msgid "It worked! Should I always use my built in inews from now on?" msgstr "" -#: src/lang.c:966 +#: src/lang.c:958 #, c-format msgid "%d %s printed" msgstr "" -#: src/lang.c:967 +#: src/lang.c:959 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "" -#: src/lang.c:968 +#: src/lang.c:960 msgid "Print" msgstr "" -#: src/lang.c:969 +#: src/lang.c:961 msgid "Printing..." msgstr "" -#: src/lang.c:973 +#: src/lang.c:965 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "" -#: src/lang.c:974 +#: src/lang.c:966 msgid "No command" msgstr "" -#: src/lang.c:975 +#: src/lang.c:967 msgid "Pipe" msgstr "" -#: src/lang.c:976 +#: src/lang.c:968 #, c-format msgid "Pipe to command [%.*s]> " msgstr "" -#: src/lang.c:977 +#: src/lang.c:969 msgid "Piping..." msgstr "" -#: src/lang.c:979 +#: src/lang.c:971 msgid "Piping not enabled." msgstr "" -#: src/lang.c:983 +#: src/lang.c:975 #, c-format msgid "" "\n" @@ -3644,7 +3644,7 @@ msgid "" " newsgroup names.\n" msgstr "" -#: src/lang.c:988 +#: src/lang.c:980 #, c-format msgid "" "\n" @@ -3653,7 +3653,7 @@ msgid "" " Please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:993 +#: src/lang.c:985 #, c-format msgid "" "\n" @@ -3662,14 +3662,14 @@ msgid "" " To avoid trouble please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:997 +#: src/lang.c:989 #, c-format msgid "" "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" msgstr "" -#: src/lang.c:1002 +#: src/lang.c:994 msgid "" "\n" " If your article contains quoted text please take some time to pare it " @@ -3691,832 +3691,832 @@ msgid "" " likely to ignore it completely. It's a crowded net out there.\n" msgstr "" -#: src/lang.c:1015 +#: src/lang.c:1007 msgid "shell escape" msgstr "" -#: src/lang.c:1016 +#: src/lang.c:1008 #, c-format msgid "Shell Command (%s)" msgstr "" -#: src/lang.c:1017 +#: src/lang.c:1009 #, c-format msgid "Enter shell command [%s]> " msgstr "" -#: src/lang.c:1021 +#: src/lang.c:1013 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "" -#: src/lang.c:1025 +#: src/lang.c:1017 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "" -#: src/lang.c:1027 +#: src/lang.c:1019 #, c-format msgid "Group %.*s..." msgstr "" -#: src/lang.c:1031 +#: src/lang.c:1023 msgid "Server unavailable\n" msgstr "" -#: src/lang.c:1037 +#: src/lang.c:1029 #, 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:1038 +#: src/lang.c:1030 #, c-format msgid "" "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1040 +#: src/lang.c:1032 #, c-format msgid "" "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1041 +#: src/lang.c:1033 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1045 +#: src/lang.c:1037 #, c-format msgid "" "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1046 +#: src/lang.c:1038 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1048 +#: src/lang.c:1040 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1049 +#: src/lang.c:1041 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1055 +#: src/lang.c:1047 msgid "Terminal does not support color" msgstr "" -#: src/lang.c:1060 +#: src/lang.c:1052 #, c-format msgid "Trying %s" msgstr "" -#: src/lang.c:1074 src/lang.c:1099 src/lang.c:1115 src/lang.c:1294 -#: src/refs.c:266 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 +#: src/refs.c:297 msgid "None" msgstr "" -#: src/lang.c:1075 +#: src/lang.c:1067 msgid "Subject" msgstr "" -#: src/lang.c:1076 +#: src/lang.c:1068 msgid "References" msgstr "" -#: src/lang.c:1077 +#: src/lang.c:1069 msgid "Both Subject and References" msgstr "" -#: src/lang.c:1078 +#: src/lang.c:1070 msgid "Multipart Subject" msgstr "" -#: src/lang.c:1090 src/lang.c:1201 +#: src/lang.c:1082 src/lang.c:1193 msgid "No" msgstr "" -#: src/lang.c:1091 src/lang.c:1203 +#: src/lang.c:1083 src/lang.c:1195 msgid "Yes" msgstr "" -#: src/lang.c:1092 +#: src/lang.c:1084 msgid "Hide All" msgstr "" -#: src/lang.c:1100 +#: src/lang.c:1092 msgid "Address" msgstr "" -#: src/lang.c:1101 +#: src/lang.c:1093 msgid "Full Name" msgstr "" -#: src/lang.c:1102 +#: src/lang.c:1094 msgid "Address and Name" msgstr "" -#: src/lang.c:1109 +#: src/lang.c:1101 msgid "Max" msgstr "" -#: src/lang.c:1110 +#: src/lang.c:1102 msgid "Sum" msgstr "" -#: src/lang.c:1111 +#: src/lang.c:1103 msgid "Average" msgstr "" -#: src/lang.c:1116 +#: src/lang.c:1108 msgid "Lines" msgstr "" -#: src/lang.c:1117 +#: src/lang.c:1109 msgid "Score" msgstr "" -#: src/lang.c:1118 +#: src/lang.c:1110 msgid "Lines & Score" msgstr "" -#: src/lang.c:1127 +#: src/lang.c:1119 msgid "Black" msgstr "" -#: src/lang.c:1128 +#: src/lang.c:1120 msgid "Red" msgstr "" -#: src/lang.c:1129 +#: src/lang.c:1121 msgid "Green" msgstr "" -#: src/lang.c:1130 +#: src/lang.c:1122 msgid "Brown" msgstr "" -#: src/lang.c:1131 +#: src/lang.c:1123 msgid "Blue" msgstr "" -#: src/lang.c:1132 +#: src/lang.c:1124 msgid "Pink" msgstr "" -#: src/lang.c:1133 +#: src/lang.c:1125 msgid "Cyan" msgstr "" -#: src/lang.c:1134 +#: src/lang.c:1126 msgid "White" msgstr "" -#: src/lang.c:1135 +#: src/lang.c:1127 msgid "Gray" msgstr "" -#: src/lang.c:1136 +#: src/lang.c:1128 msgid "Light Red" msgstr "" -#: src/lang.c:1137 +#: src/lang.c:1129 msgid "Light Green" msgstr "" -#: src/lang.c:1138 +#: src/lang.c:1130 msgid "Yellow" msgstr "" -#: src/lang.c:1139 +#: src/lang.c:1131 msgid "Light Blue" msgstr "" -#: src/lang.c:1140 +#: src/lang.c:1132 msgid "Light Pink" msgstr "" -#: src/lang.c:1141 +#: src/lang.c:1133 msgid "Light Cyan" msgstr "" -#: src/lang.c:1142 +#: src/lang.c:1134 msgid "Light White" msgstr "" -#: src/lang.c:1150 src/lang.c:1207 src/lang.c:1221 +#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 msgid "Nothing" msgstr "" -#: src/lang.c:1151 +#: src/lang.c:1143 msgid "Mark" msgstr "" -#: src/lang.c:1152 +#: src/lang.c:1144 msgid "Space" msgstr "" -#: src/lang.c:1159 +#: src/lang.c:1151 msgid "Normal" msgstr "" -#: src/lang.c:1160 +#: src/lang.c:1152 msgid "Best highlighting" msgstr "" -#: src/lang.c:1161 +#: src/lang.c:1153 msgid "Underline" msgstr "" -#: src/lang.c:1162 +#: src/lang.c:1154 msgid "Reverse video" msgstr "" -#: src/lang.c:1163 +#: src/lang.c:1155 msgid "Blinking" msgstr "" -#: src/lang.c:1164 +#: src/lang.c:1156 msgid "Half bright" msgstr "" -#: src/lang.c:1165 +#: src/lang.c:1157 msgid "Bold" msgstr "" -#: src/lang.c:1170 +#: src/lang.c:1162 msgid "none" msgstr "" -#: src/lang.c:1171 +#: src/lang.c:1163 msgid "commands" msgstr "" -#: src/lang.c:1172 +#: src/lang.c:1164 msgid "select" msgstr "" -#: src/lang.c:1174 +#: src/lang.c:1166 msgid "commands & quit" msgstr "" -#: src/lang.c:1175 +#: src/lang.c:1167 msgid "commands & select" msgstr "" -#: src/lang.c:1176 +#: src/lang.c:1168 msgid "quit & select" msgstr "" -#: src/lang.c:1177 +#: src/lang.c:1169 msgid "commands & quit & select" msgstr "" -#: src/lang.c:1202 +#: src/lang.c:1194 msgid "Shell archive" msgstr "" -#: src/lang.c:1208 +#: src/lang.c:1200 msgid "Subject: (descending)" msgstr "" -#: src/lang.c:1209 +#: src/lang.c:1201 msgid "Subject: (ascending)" msgstr "" -#: src/lang.c:1210 +#: src/lang.c:1202 msgid "From: (descending)" msgstr "" -#: src/lang.c:1211 +#: src/lang.c:1203 msgid "From: (ascending)" msgstr "" -#: src/lang.c:1212 +#: src/lang.c:1204 msgid "Date: (descending)" msgstr "" -#: src/lang.c:1213 +#: src/lang.c:1205 msgid "Date: (ascending)" msgstr "" -#: src/lang.c:1214 src/lang.c:1222 +#: src/lang.c:1206 src/lang.c:1214 msgid "Score (descending)" msgstr "" -#: src/lang.c:1215 src/lang.c:1223 +#: src/lang.c:1207 src/lang.c:1215 msgid "Score (ascending)" msgstr "" -#: src/lang.c:1216 +#: src/lang.c:1208 msgid "Lines: (descending)" msgstr "" -#: src/lang.c:1217 +#: src/lang.c:1209 msgid "Lines: (ascending)" msgstr "" -#: src/lang.c:1228 +#: src/lang.c:1220 msgid "Always Keep" msgstr "" -#: src/lang.c:1229 +#: src/lang.c:1221 msgid "Always Remove" msgstr "" -#: src/lang.c:1230 +#: src/lang.c:1222 msgid "Mark with D on selection screen" msgstr "" -#: src/lang.c:1235 +#: src/lang.c:1227 msgid "Kill only unread arts" msgstr "" -#: src/lang.c:1236 +#: src/lang.c:1228 msgid "Kill all arts & show with K" msgstr "" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1237 +#: src/lang.c:1229 msgid "Kill all arts and never show" msgstr "" -#: src/lang.c:1242 +#: src/lang.c:1234 msgid "Nothing special" msgstr "" -#: src/lang.c:1243 +#: src/lang.c:1235 msgid "Compress quotes" msgstr "" -#: src/lang.c:1244 +#: src/lang.c:1236 msgid "Quote signatures" msgstr "" -#: src/lang.c:1245 +#: src/lang.c:1237 msgid "Compress quotes, quote sigs" msgstr "" -#: src/lang.c:1246 +#: src/lang.c:1238 msgid "Quote empty lines" msgstr "" -#: src/lang.c:1247 +#: src/lang.c:1239 msgid "Compress quotes, quote empty lines" msgstr "" -#: src/lang.c:1248 +#: src/lang.c:1240 msgid "Quote sigs & empty lines" msgstr "" -#: src/lang.c:1249 +#: src/lang.c:1241 msgid "Comp. q., quote sigs & empty lines" msgstr "" -#: src/lang.c:1287 +#: src/lang.c:1279 msgid "no" msgstr "" -#: src/lang.c:1288 +#: src/lang.c:1280 msgid "with headers" msgstr "" -#: src/lang.c:1289 +#: src/lang.c:1281 msgid "without headers" msgstr "" -#: src/lang.c:1296 src/lang.c:1302 +#: src/lang.c:1288 src/lang.c:1294 msgid "NFKC" msgstr "" -#: src/lang.c:1297 +#: src/lang.c:1289 msgid "NFKD" msgstr "" -#: src/lang.c:1298 +#: src/lang.c:1290 msgid "NFC" msgstr "" -#: src/lang.c:1299 +#: src/lang.c:1291 msgid "NFD" msgstr "" -#: src/lang.c:1310 +#: src/lang.c:1302 msgid "Display Options" msgstr "" -#: src/lang.c:1316 +#: src/lang.c:1308 msgid "Color Options" msgstr "" -#: src/lang.c:1322 +#: src/lang.c:1314 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1328 +#: src/lang.c:1320 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1334 +#: src/lang.c:1326 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1340 +#: src/lang.c:1332 msgid "Expert Options" msgstr "" -#: src/lang.c:1346 +#: src/lang.c:1338 msgid "Filtering Options" msgstr "" -#: src/lang.c:1351 src/lang.c:1377 src/lang.c:1383 src/lang.c:1390 -#: src/lang.c:1422 src/lang.c:1428 src/lang.c:1436 src/lang.c:1456 -#: src/lang.c:1531 src/lang.c:1693 src/lang.c:1699 src/lang.c:1705 -#: src/lang.c:1711 src/lang.c:1723 src/lang.c:1730 src/lang.c:1781 -#: src/lang.c:1790 src/lang.c:1796 src/lang.c:1802 src/lang.c:1808 -#: src/lang.c:1814 src/lang.c:1820 src/lang.c:1826 src/lang.c:1832 -#: src/lang.c:1838 src/lang.c:1844 src/lang.c:1850 src/lang.c:1856 -#: src/lang.c:1862 src/lang.c:1868 src/lang.c:1874 src/lang.c:1880 -#: src/lang.c:1886 src/lang.c:1892 src/lang.c:1898 src/lang.c:1904 -#: src/lang.c:1910 src/lang.c:1917 src/lang.c:1923 src/lang.c:1929 -#: src/lang.c:1936 src/lang.c:1947 src/lang.c:1953 src/lang.c:1959 -#: src/lang.c:1965 src/lang.c:1971 src/lang.c:1977 src/lang.c:1991 -#: src/lang.c:2003 src/lang.c:2037 src/lang.c:2089 src/lang.c:2096 -#: src/lang.c:2102 src/lang.c:2127 src/lang.c:2144 src/lang.c:2197 -#: src/lang.c:2230 src/lang.c:2250 src/lang.c:2285 src/lang.c:2294 -#: src/lang.c:2319 src/lang.c:2331 src/lang.c:2350 +#: src/lang.c:1343 src/lang.c:1369 src/lang.c:1375 src/lang.c:1382 +#: src/lang.c:1414 src/lang.c:1420 src/lang.c:1428 src/lang.c:1448 +#: src/lang.c:1523 src/lang.c:1685 src/lang.c:1691 src/lang.c:1697 +#: src/lang.c:1703 src/lang.c:1715 src/lang.c:1722 src/lang.c:1773 +#: 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:1884 src/lang.c:1890 src/lang.c:1896 +#: src/lang.c:1902 src/lang.c:1909 src/lang.c:1915 src/lang.c:1921 +#: src/lang.c:1928 src/lang.c:1939 src/lang.c:1945 src/lang.c:1951 +#: src/lang.c:1957 src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 +#: src/lang.c:1995 src/lang.c:2029 src/lang.c:2081 src/lang.c:2088 +#: src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 src/lang.c:2189 +#: src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1352 +#: src/lang.c:1344 msgid "Show mini menu & posting etiquette :" msgstr "" -#: src/lang.c:1353 +#: src/lang.c:1345 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:1358 +#: src/lang.c:1350 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1359 +#: src/lang.c:1351 msgid "Show description of each newsgroup :" msgstr "" -#: src/lang.c:1360 +#: src/lang.c:1352 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1365 +#: src/lang.c:1357 msgid "" "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "" -#: src/lang.c:1366 +#: src/lang.c:1358 msgid "In group menu, show author by :" msgstr "" -#: src/lang.c:1367 +#: src/lang.c:1359 msgid "" "# Part of from field to display 0) none 1) address 2) full name 3) both\n" msgstr "" -#: src/lang.c:1371 +#: src/lang.c:1363 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1372 +#: src/lang.c:1364 msgid "Draw -> instead of highlighted bar :" msgstr "" -#: src/lang.c:1373 +#: src/lang.c:1365 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1378 +#: src/lang.c:1370 msgid "Use inverse video for page headers :" msgstr "" -#: src/lang.c:1379 +#: src/lang.c:1371 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1384 +#: src/lang.c:1376 msgid "Thread articles by :" msgstr "" -#: src/lang.c:1385 +#: src/lang.c:1377 msgid "" "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" msgstr "" -#: src/lang.c:1391 +#: src/lang.c:1383 msgid "Score of a thread :" msgstr "" -#: src/lang.c:1392 +#: src/lang.c:1384 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "" -#: src/lang.c:1396 +#: src/lang.c:1388 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1397 +#: src/lang.c:1389 msgid "Sort articles by :" msgstr "" -#: src/lang.c:1398 +#: src/lang.c:1390 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:1404 +#: src/lang.c:1396 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1405 +#: src/lang.c:1397 msgid "Sort threads by :" msgstr "" -#: src/lang.c:1406 +#: src/lang.c:1398 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" msgstr "" -#: src/lang.c:1410 +#: src/lang.c:1402 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1411 +#: src/lang.c:1403 msgid "Goto first unread article in group :" msgstr "" -#: src/lang.c:1412 +#: src/lang.c:1404 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1416 +#: src/lang.c:1408 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1417 +#: src/lang.c:1409 msgid "Show only unread articles :" msgstr "" -#: src/lang.c:1418 +#: src/lang.c:1410 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1423 +#: src/lang.c:1415 msgid "Show only groups with unread arts :" msgstr "" -#: src/lang.c:1424 +#: src/lang.c:1416 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1429 +#: src/lang.c:1421 msgid "Filter which articles :" msgstr "" -#: src/lang.c:1430 +#: src/lang.c:1422 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:1437 +#: src/lang.c:1429 msgid "Tab goes to next unread article :" msgstr "" -#: src/lang.c:1438 +#: src/lang.c:1430 msgid "" "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "" -#: src/lang.c:1442 +#: src/lang.c:1434 msgid "" "Scrolling with past the end of an art. jumps to the next unread one." msgstr "" -#: src/lang.c:1443 +#: src/lang.c:1435 msgid "Space goes to next unread article :" msgstr "" -#: src/lang.c:1444 +#: src/lang.c:1436 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:1449 +#: src/lang.c:1441 msgid "" "Scrolling with / past the end of an art. jumps to the unread one." msgstr "" -#: src/lang.c:1450 +#: src/lang.c:1442 msgid "PgDn goes to next unread article :" msgstr "" -#: src/lang.c:1451 +#: src/lang.c:1443 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:1457 +#: src/lang.c:1449 msgid "List thread using right arrow key :" msgstr "" -#: src/lang.c:1458 +#: src/lang.c:1450 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1462 +#: src/lang.c:1454 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1463 +#: src/lang.c:1455 msgid "Character to show deleted articles :" msgstr "" -#: src/lang.c:1464 +#: src/lang.c:1456 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1469 +#: src/lang.c:1461 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1470 +#: src/lang.c:1462 msgid "Character to show inrange articles :" msgstr "" -#: src/lang.c:1471 +#: src/lang.c:1463 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1476 +#: src/lang.c:1468 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1477 +#: src/lang.c:1469 msgid "Character to show returning arts :" msgstr "" -#: src/lang.c:1478 +#: src/lang.c:1470 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1483 +#: src/lang.c:1475 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1484 +#: src/lang.c:1476 msgid "Character to show selected articles:" msgstr "" -#: src/lang.c:1485 +#: src/lang.c:1477 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1490 +#: src/lang.c:1482 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1491 +#: src/lang.c:1483 msgid "Character to show recent articles :" msgstr "" -#: src/lang.c:1492 +#: src/lang.c:1484 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1497 +#: src/lang.c:1489 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1498 +#: src/lang.c:1490 msgid "Character to show unread articles :" msgstr "" -#: src/lang.c:1499 +#: src/lang.c:1491 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1504 +#: src/lang.c:1496 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1505 +#: src/lang.c:1497 msgid "Character to show read articles :" msgstr "" -#: src/lang.c:1506 +#: src/lang.c:1498 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1511 +#: src/lang.c:1503 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1512 +#: src/lang.c:1504 msgid "Character to show killed articles :" msgstr "" -#: src/lang.c:1513 +#: src/lang.c:1505 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:1518 +#: src/lang.c:1510 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1519 +#: src/lang.c:1511 msgid "Character to show readselected arts:" msgstr "" -#: src/lang.c:1520 +#: src/lang.c:1512 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:1525 +#: src/lang.c:1517 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1526 +#: src/lang.c:1518 msgid "Max. length of group names shown :" msgstr "" -#: src/lang.c:1527 +#: src/lang.c:1519 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1532 +#: src/lang.c:1524 msgid "Show lines/score in listings :" msgstr "" -#: src/lang.c:1533 +#: src/lang.c:1525 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:1538 +#: src/lang.c:1530 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1539 +#: src/lang.c:1531 msgid "Number of lines to scroll in pager :" msgstr "" -#: src/lang.c:1540 +#: src/lang.c:1532 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" @@ -4524,28 +4524,28 @@ msgid "" "# -2 = half-page scrolling\n" msgstr "" -#: src/lang.c:1547 +#: src/lang.c:1539 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1548 +#: src/lang.c:1540 msgid "Display signatures :" msgstr "" -#: src/lang.c:1549 +#: src/lang.c:1541 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1553 +#: src/lang.c:1545 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1554 +#: src/lang.c:1546 msgid "Display uue data as an attachment :" msgstr "" -#: src/lang.c:1555 +#: src/lang.c:1547 msgid "" "# Handling of uuencoded data in the pager\n" "# 0 = display raw uuencoded data\n" @@ -4555,30 +4555,30 @@ msgid "" "# into a tag line.\n" msgstr "" -#: src/lang.c:1564 +#: src/lang.c:1556 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1565 +#: src/lang.c:1557 msgid "Display \"a as Umlaut-a :" msgstr "" -#: src/lang.c:1566 +#: src/lang.c:1558 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1571 src/lang.c:1581 +#: src/lang.c:1563 src/lang.c:1573 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1572 +#: src/lang.c:1564 msgid "Display these header fields (or *) :" msgstr "" -#: src/lang.c:1573 +#: src/lang.c:1565 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" @@ -4588,11 +4588,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1582 +#: src/lang.c:1574 msgid "Do not display these header fields :" msgstr "" -#: src/lang.c:1583 +#: src/lang.c:1575 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" @@ -4604,163 +4604,163 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1593 +#: src/lang.c:1585 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1594 +#: src/lang.c:1586 msgid "Skip multipart/alternative parts :" msgstr "" -#: src/lang.c:1595 +#: src/lang.c:1587 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1600 +#: src/lang.c:1592 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1601 +#: src/lang.c:1593 msgid "Regex used to show quoted lines :" msgstr "" -#: src/lang.c:1602 +#: src/lang.c:1594 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:1608 +#: src/lang.c:1600 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1609 +#: src/lang.c:1601 msgid "Regex used to show twice quoted l. :" msgstr "" -#: src/lang.c:1610 +#: src/lang.c:1602 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:1616 +#: src/lang.c:1608 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1617 +#: src/lang.c:1609 msgid "Regex used to show >= 3 times q.l. :" msgstr "" -#: src/lang.c:1618 +#: src/lang.c:1610 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:1625 +#: src/lang.c:1617 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1626 +#: src/lang.c:1618 msgid "Regex used to highlight /slashes/ :" msgstr "" -#: src/lang.c:1627 +#: src/lang.c:1619 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:1633 +#: src/lang.c:1625 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1634 +#: src/lang.c:1626 msgid "Regex used to highlight *stars* :" msgstr "" -#: src/lang.c:1635 +#: src/lang.c:1627 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:1641 +#: src/lang.c:1633 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1642 +#: src/lang.c:1634 msgid "Regex used to highlight -strokes- :" msgstr "" -#: src/lang.c:1643 +#: src/lang.c:1635 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:1649 +#: src/lang.c:1641 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1650 +#: src/lang.c:1642 msgid "Regex used to highlight _underline_:" msgstr "" -#: src/lang.c:1651 +#: src/lang.c:1643 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:1657 +#: src/lang.c:1649 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1658 +#: src/lang.c:1650 msgid "Regex with Subject prefixes :" msgstr "" -#: src/lang.c:1659 +#: src/lang.c:1651 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:1664 +#: src/lang.c:1656 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1665 +#: src/lang.c:1657 msgid "Regex with Subject suffixes :" msgstr "" -#: src/lang.c:1666 +#: src/lang.c:1658 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:1671 +#: src/lang.c:1663 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1672 +#: src/lang.c:1664 msgid "MIME binary content viewer :" msgstr "" -#: src/lang.c:1673 +#: src/lang.c:1665 msgid "" "# If --internal automatically use the built in MIME viewer for non-text\n" "# parts of articles.\n" @@ -4769,373 +4769,373 @@ msgid "" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:1680 +#: src/lang.c:1672 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1681 +#: src/lang.c:1673 msgid "Ask before using MIME viewer :" msgstr "" -#: src/lang.c:1682 +#: src/lang.c:1674 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:1687 +#: src/lang.c:1679 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1688 +#: src/lang.c:1680 msgid "Catchup read groups when quitting :" msgstr "" -#: src/lang.c:1689 +#: src/lang.c:1681 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1694 +#: src/lang.c:1686 msgid "Catchup group using left key :" msgstr "" -#: src/lang.c:1695 +#: src/lang.c:1687 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1700 +#: src/lang.c:1692 msgid "Catchup thread by using left key :" msgstr "" -#: src/lang.c:1706 +#: src/lang.c:1698 msgid "Which actions require confirmation :" msgstr "" -#: src/lang.c:1707 +#: src/lang.c:1699 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1712 +#: src/lang.c:1704 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1713 +#: src/lang.c:1705 msgid "" "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1709 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1718 +#: src/lang.c:1710 msgid "Program that opens URL's :" msgstr "" -#: src/lang.c:1719 +#: src/lang.c:1711 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1724 +#: src/lang.c:1716 msgid "Use mouse in xterm :" msgstr "" -#: src/lang.c:1725 +#: src/lang.c:1717 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1723 msgid "Use scroll keys on keypad :" msgstr "" -#: src/lang.c:1732 +#: src/lang.c:1724 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1729 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1730 msgid "Number of articles to get :" msgstr "" -#: src/lang.c:1739 +#: src/lang.c:1731 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:1744 +#: src/lang.c:1736 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1745 +#: src/lang.c:1737 msgid "Article recentness time limit :" msgstr "" -#: src/lang.c:1746 +#: src/lang.c:1738 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1742 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1751 +#: src/lang.c:1743 msgid "Wildcard matching :" msgstr "" -#: src/lang.c:1752 +#: src/lang.c:1744 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1748 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1757 +#: src/lang.c:1749 msgid "Score limit (kill) :" msgstr "" -#: src/lang.c:1758 +#: src/lang.c:1750 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1754 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1763 +#: src/lang.c:1755 msgid "Default score to kill articles :" msgstr "" -#: src/lang.c:1764 +#: src/lang.c:1756 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1760 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1769 +#: src/lang.c:1761 msgid "Score limit (select) :" msgstr "" -#: src/lang.c:1770 +#: src/lang.c:1762 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1774 +#: src/lang.c:1766 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1775 +#: src/lang.c:1767 msgid "Default score to select articles :" msgstr "" -#: src/lang.c:1776 +#: src/lang.c:1768 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1782 +#: src/lang.c:1774 msgid "Use slrnface to show ''X-Face:''s :" msgstr "" -#: src/lang.c:1783 +#: src/lang.c:1775 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:1791 +#: src/lang.c:1783 msgid "Use ANSI color :" msgstr "" -#: src/lang.c:1792 +#: src/lang.c:1784 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:1797 +#: src/lang.c:1789 msgid "Standard foreground color :" msgstr "" -#: src/lang.c:1798 +#: src/lang.c:1790 msgid "# Standard foreground color\n" msgstr "" -#: src/lang.c:1803 +#: src/lang.c:1795 msgid "Standard background color :" msgstr "" -#: src/lang.c:1804 +#: src/lang.c:1796 msgid "# Standard-Background-Color\n" msgstr "" -#: src/lang.c:1809 +#: src/lang.c:1801 msgid "Color for inverse text (background):" msgstr "" -#: src/lang.c:1810 +#: src/lang.c:1802 msgid "# Color of background for inverse text\n" msgstr "" -#: src/lang.c:1815 +#: src/lang.c:1807 msgid "Color for inverse text (foreground):" msgstr "" -#: src/lang.c:1816 +#: src/lang.c:1808 msgid "# Color of foreground for inverse text\n" msgstr "" -#: src/lang.c:1821 +#: src/lang.c:1813 msgid "Color of text lines :" msgstr "" -#: src/lang.c:1822 +#: src/lang.c:1814 msgid "# Color of text-lines\n" msgstr "" -#: src/lang.c:1827 +#: src/lang.c:1819 msgid "Color of mini help menu :" msgstr "" -#: src/lang.c:1828 +#: src/lang.c:1820 msgid "# Color of mini help menu\n" msgstr "" -#: src/lang.c:1833 +#: src/lang.c:1825 msgid "Color of help text :" msgstr "" -#: src/lang.c:1834 +#: src/lang.c:1826 msgid "# Color of help pages\n" msgstr "" -#: src/lang.c:1839 +#: src/lang.c:1831 msgid "Color of status messages :" msgstr "" -#: src/lang.c:1840 +#: src/lang.c:1832 msgid "# Color of messages in last line\n" msgstr "" -#: src/lang.c:1845 +#: src/lang.c:1837 msgid "Color of quoted lines :" msgstr "" -#: src/lang.c:1846 +#: src/lang.c:1838 msgid "# Color of quote-lines\n" msgstr "" -#: src/lang.c:1851 +#: src/lang.c:1843 msgid "Color of twice quoted line :" msgstr "" -#: src/lang.c:1852 +#: src/lang.c:1844 msgid "# Color of twice quoted lines\n" msgstr "" -#: src/lang.c:1857 +#: src/lang.c:1849 msgid "Color of =>3 times quoted line :" msgstr "" -#: src/lang.c:1858 +#: src/lang.c:1850 msgid "# Color of >=3 times quoted lines\n" msgstr "" -#: src/lang.c:1863 +#: src/lang.c:1855 msgid "Color of article header lines :" msgstr "" -#: src/lang.c:1864 +#: src/lang.c:1856 msgid "# Color of header-lines\n" msgstr "" -#: src/lang.c:1869 +#: src/lang.c:1861 msgid "Color of actual news header fields :" msgstr "" -#: src/lang.c:1870 +#: src/lang.c:1862 msgid "# Color of actual news header fields\n" msgstr "" -#: src/lang.c:1875 +#: src/lang.c:1867 msgid "Color of article subject lines :" msgstr "" -#: src/lang.c:1876 +#: src/lang.c:1868 msgid "# Color of article subject\n" msgstr "" -#: src/lang.c:1881 +#: src/lang.c:1873 msgid "Color of response counter :" msgstr "" -#: src/lang.c:1882 +#: src/lang.c:1874 msgid "# Color of response counter\n" msgstr "" -#: src/lang.c:1887 +#: src/lang.c:1879 msgid "Color of sender (From:) :" msgstr "" -#: src/lang.c:1888 +#: src/lang.c:1880 msgid "# Color of sender (From:)\n" msgstr "" -#: src/lang.c:1893 +#: src/lang.c:1885 msgid "Color of help/mail sign :" msgstr "" -#: src/lang.c:1894 +#: src/lang.c:1886 msgid "# Color of Help/Mail-Sign\n" msgstr "" -#: src/lang.c:1899 +#: src/lang.c:1891 msgid "Color of signatures :" msgstr "" -#: src/lang.c:1900 +#: src/lang.c:1892 msgid "# Color of signature\n" msgstr "" -#: src/lang.c:1905 +#: src/lang.c:1897 msgid "Color of highlighted URLs :" msgstr "" -#: src/lang.c:1906 +#: src/lang.c:1898 msgid "# Color of highlighted URLs\n" msgstr "" -#: src/lang.c:1911 +#: src/lang.c:1903 msgid "Color of highlighting with *stars* :" msgstr "" -#: src/lang.c:1912 +#: src/lang.c:1904 msgid "" "# Color of word highlighting. There are four possibilities\n" "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" msgstr "" -#: src/lang.c:1918 +#: src/lang.c:1910 msgid "Color of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1924 +#: src/lang.c:1916 msgid "Color of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1930 +#: src/lang.c:1922 msgid "Color of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1937 +#: src/lang.c:1929 msgid "Attr. of highlighting with *stars* :" msgstr "" -#: src/lang.c:1938 +#: src/lang.c:1930 msgid "" "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" @@ -5145,95 +5145,95 @@ msgid "" "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1948 +#: src/lang.c:1940 msgid "Attr. of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1946 msgid "Attr. of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1960 +#: src/lang.c:1952 msgid "Attr. of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1966 +#: src/lang.c:1958 msgid "URL highlighting in message body :" msgstr "" -#: src/lang.c:1967 +#: src/lang.c:1959 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:1972 +#: src/lang.c:1964 msgid "Word highlighting in message body :" msgstr "" -#: src/lang.c:1973 +#: src/lang.c:1965 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1978 +#: src/lang.c:1970 msgid "What to display instead of mark :" msgstr "" -#: src/lang.c:1979 +#: src/lang.c:1971 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:1985 +#: src/lang.c:1977 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1978 msgid "Page line wrap column :" msgstr "" -#: src/lang.c:1987 +#: src/lang.c:1979 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:1984 msgid "Wrap around threads on next unread :" msgstr "" -#: src/lang.c:1993 +#: src/lang.c:1985 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1997 +#: src/lang.c:1989 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1998 +#: src/lang.c:1990 msgid "Mail address (and fullname) :" msgstr "" -#: src/lang.c:1999 +#: src/lang.c:1991 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:2004 +#: src/lang.c:1996 msgid "Show empty Followup-To in editor :" msgstr "" -#: src/lang.c:2005 +#: src/lang.c:1997 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2009 +#: src/lang.c:2001 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2002 msgid "Create signature from path/command :" msgstr "" -#: src/lang.c:2011 +#: src/lang.c:2003 msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" "# default_sigfile=file appends file as signature\n" @@ -5242,50 +5242,50 @@ msgid "" "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2010 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2019 +#: src/lang.c:2011 msgid "Prepend signature with \"-- \" :" msgstr "" -#: src/lang.c:2020 +#: src/lang.c:2012 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2016 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2025 +#: src/lang.c:2017 msgid "Add signature when reposting :" msgstr "" -#: src/lang.c:2026 +#: src/lang.c:2018 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2030 +#: src/lang.c:2022 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2023 msgid "Characters used as quote-marks :" msgstr "" -#: src/lang.c:2032 +#: src/lang.c:2024 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:2038 +#: src/lang.c:2030 msgid "Quoting behavior :" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2031 msgid "" "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" @@ -5298,52 +5298,52 @@ msgid "" "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2051 src/lang.c:2059 src/lang.c:2065 +#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2052 +#: src/lang.c:2044 msgid "Quote line when following up :" msgstr "" -#: src/lang.c:2053 +#: src/lang.c:2045 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:2060 +#: src/lang.c:2052 msgid "Quote line when cross-posting :" msgstr "" -#: src/lang.c:2066 +#: src/lang.c:2058 msgid "Quote line when mailing :" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2063 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2072 +#: src/lang.c:2064 msgid "Insert 'User-Agent:'-header :" msgstr "" -#: src/lang.c:2073 +#: src/lang.c:2065 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2077 +#: src/lang.c:2069 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2078 +#: src/lang.c:2070 msgid "MM_CHARSET :" msgstr "" -#: src/lang.c:2079 +#: src/lang.c:2071 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -5353,27 +5353,27 @@ msgid "" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2082 msgid "MM_NETWORK_CHARSET :" msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2083 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2097 +#: src/lang.c:2089 msgid "Mailbox format :" msgstr "" -#: src/lang.c:2098 +#: src/lang.c:2090 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2103 +#: src/lang.c:2095 msgid "MIME encoding in news messages :" msgstr "" -#: src/lang.c:2104 +#: src/lang.c:2096 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" @@ -5382,15 +5382,15 @@ msgid "" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2112 src/lang.c:2133 +#: src/lang.c:2104 src/lang.c:2125 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2113 +#: src/lang.c:2105 msgid "Use 8bit characters in news headers:" msgstr "" -#: src/lang.c:2114 +#: src/lang.c:2106 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -5398,28 +5398,28 @@ msgid "" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" -#: src/lang.c:2121 +#: src/lang.c:2113 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2122 +#: src/lang.c:2114 msgid "View post-processed files :" msgstr "" -#: src/lang.c:2123 +#: src/lang.c:2115 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2128 +#: src/lang.c:2120 msgid "MIME encoding in mail messages :" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2126 msgid "Use 8bit characters in mail headers:" msgstr "" -#: src/lang.c:2135 +#: src/lang.c:2127 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -5430,278 +5430,278 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2137 msgid "Strip blanks from ends of lines :" msgstr "" -#: src/lang.c:2146 +#: src/lang.c:2138 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2151 +#: src/lang.c:2143 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2152 +#: src/lang.c:2144 msgid "Transliteration :" msgstr "" -#: src/lang.c:2153 +#: src/lang.c:2145 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:2160 +#: src/lang.c:2152 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2161 +#: src/lang.c:2153 msgid "Send you a cc automatically :" msgstr "" -#: src/lang.c:2162 +#: src/lang.c:2154 msgid "" "# If ON automatically put your name in the Cc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2166 +#: src/lang.c:2158 msgid "" "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2159 msgid "Send you a blind cc automatically :" msgstr "" -#: src/lang.c:2168 +#: src/lang.c:2160 msgid "" "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2172 +#: src/lang.c:2164 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2165 msgid "Spamtrap warning address parts :" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2166 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:2179 +#: src/lang.c:2171 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2172 msgid "No. of days a filter entry is valid:" msgstr "" -#: src/lang.c:2181 +#: src/lang.c:2173 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2185 +#: src/lang.c:2177 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2186 +#: src/lang.c:2178 msgid "Add posted articles to filter :" msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2179 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2183 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2192 +#: src/lang.c:2184 msgid "Mail directory :" msgstr "" -#: src/lang.c:2193 +#: src/lang.c:2185 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2198 +#: src/lang.c:2190 msgid "Save articles in batch mode (-S) :" msgstr "" -#: src/lang.c:2199 +#: src/lang.c:2191 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:2204 +#: src/lang.c:2196 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2205 +#: src/lang.c:2197 msgid "Directory to save arts/threads in :" msgstr "" -#: src/lang.c:2206 +#: src/lang.c:2198 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2210 +#: src/lang.c:2202 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2203 msgid "Use Archive-name: header for save :" msgstr "" -#: src/lang.c:2212 +#: src/lang.c:2204 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:2217 +#: src/lang.c:2209 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2218 +#: src/lang.c:2210 msgid "Mark saved articles/threads as read:" msgstr "" -#: src/lang.c:2219 +#: src/lang.c:2211 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2223 +#: src/lang.c:2215 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2216 msgid "Post process saved articles :" msgstr "" -#: src/lang.c:2225 +#: src/lang.c:2217 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:2231 +#: src/lang.c:2223 msgid "Process only unread articles :" msgstr "" -#: src/lang.c:2232 +#: src/lang.c:2224 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" -#: src/lang.c:2237 +#: src/lang.c:2229 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2238 +#: src/lang.c:2230 msgid "Print all headers when printing :" msgstr "" -#: src/lang.c:2239 +#: src/lang.c:2231 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2243 +#: src/lang.c:2235 msgid "" "The printer program with options that is to be used to print " "articles/threads." msgstr "" -#: src/lang.c:2244 +#: src/lang.c:2236 msgid "Printer program with options :" msgstr "" -#: src/lang.c:2245 +#: src/lang.c:2237 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2251 +#: src/lang.c:2243 msgid "Force redraw after certain commands:" msgstr "" -#: src/lang.c:2252 +#: src/lang.c:2244 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2256 +#: src/lang.c:2248 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2257 +#: src/lang.c:2249 msgid "Start editor with line offset :" msgstr "" -#: src/lang.c:2258 +#: src/lang.c:2250 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:2263 +#: src/lang.c:2255 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2264 +#: src/lang.c:2256 msgid "Invocation of your editor :" msgstr "" -#: src/lang.c:2265 +#: src/lang.c:2257 msgid "" "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2270 +#: src/lang.c:2262 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2271 +#: src/lang.c:2263 msgid "External inews :" msgstr "" -#: src/lang.c:2272 +#: src/lang.c:2264 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:2276 +#: src/lang.c:2268 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2277 +#: src/lang.c:2269 msgid "Invocation of your mail command :" msgstr "" -#: src/lang.c:2278 +#: src/lang.c:2270 msgid "" "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" @@ -5709,11 +5709,11 @@ msgid "" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" msgstr "" -#: src/lang.c:2286 +#: src/lang.c:2278 msgid "Use interactive mail reader :" msgstr "" -#: src/lang.c:2287 +#: src/lang.c:2279 msgid "" "# Interactive mailreader:\n" "# 0 = no interactive mailreader\n" @@ -5721,126 +5721,126 @@ msgid "" "# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2295 +#: src/lang.c:2287 msgid "Remove ~/.article after posting :" msgstr "" -#: src/lang.c:2296 +#: src/lang.c:2288 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2292 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2301 +#: src/lang.c:2293 msgid "Filename for posted articles :" msgstr "" -#: src/lang.c:2302 +#: src/lang.c:2294 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:2307 +#: src/lang.c:2299 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2308 +#: src/lang.c:2300 msgid "Keep failed arts in ~/dead.articles:" msgstr "" -#: src/lang.c:2309 +#: src/lang.c:2301 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2313 +#: src/lang.c:2305 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2314 +#: src/lang.c:2306 msgid "No unsubscribed groups in newsrc :" msgstr "" -#: src/lang.c:2315 +#: src/lang.c:2307 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2320 +#: src/lang.c:2312 msgid "Remove bogus groups from newsrc :" msgstr "" -#: src/lang.c:2321 +#: src/lang.c:2313 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:2325 +#: src/lang.c:2317 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2326 +#: src/lang.c:2318 msgid "Interval in secs to reread active :" msgstr "" -#: src/lang.c:2327 +#: src/lang.c:2319 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2332 +#: src/lang.c:2324 msgid "Reconnect to server automatically :" msgstr "" -#: src/lang.c:2333 +#: src/lang.c:2325 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2337 +#: src/lang.c:2329 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2338 +#: src/lang.c:2330 msgid "Cache NNTP overview files locally :" msgstr "" -#: src/lang.c:2339 +#: src/lang.c:2331 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2343 +#: src/lang.c:2335 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2344 +#: src/lang.c:2336 msgid "Format string for display of dates :" msgstr "" -#: src/lang.c:2345 +#: src/lang.c:2337 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2351 +#: src/lang.c:2343 msgid "Unicode normalization form :" msgstr "" -#: src/lang.c:2352 +#: src/lang.c:2344 msgid "" "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" -#: src/main.c:586 +#: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" msgstr "" -#: src/main.c:589 +#: src/main.c:593 #, c-format msgid "Version: %s release %s (\"%s\")" msgstr "" @@ -5849,23 +5849,23 @@ msgstr "" msgid "Unreachable?\n" msgstr "" -#: src/nntplib.c:821 +#: src/nntplib.c:822 #, c-format msgid "" "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:839 +#: src/nntplib.c:840 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:846 +#: src/nntplib.c:847 #, c-format msgid "Read (%s)\n" msgstr "" -#: src/nntplib.c:848 +#: src/nntplib.c:849 #, c-format msgid "Resend last command (%s)\n" msgstr "" @@ -5875,7 +5875,7 @@ msgstr "" msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1939 +#: src/post.c:1951 #, c-format msgid "Posting: %.*s ..." msgstr "" @@ -5895,15 +5895,15 @@ msgid "Draining\n" msgstr "" #. Don't hash the initial '<' -#: src/refs.c:220 +#: src/refs.c:251 msgid "unchanged" msgstr "" -#: src/refs.c:573 +#: src/refs.c:610 msgid "[- Unavailable -]" msgstr "" -#: src/save.c:975 +#: src/save.c:976 msgid "bytes" msgstr "" @@ -5915,7 +5915,7 @@ msgstr "" msgid "all" msgstr "" -#: src/select.c:525 src/select.c:527 +#: src/select.c:529 src/select.c:531 msgid " R" msgstr "" diff -Nurp tin-1.7.3/src/Makefile.in tin-1.7.4/src/Makefile.in --- tin-1.7.3/src/Makefile.in Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/Makefile.in Wed Jan 28 10:06:36 2004 @@ -1,9 +1,9 @@ # Source Makefile for tin # - for configuration options read the ../doc/INSTALL file. # -# Updated: 2003-11-18 +# Updated: 2004-01-28 # -# Copyright (c) 1995-2003 Thomas E. Dickey +# Copyright (c) 1995-2004 Thomas E. Dickey # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -43,28 +43,37 @@ srcdir = @srcdir@ VPATH = $(srcdir) # Compiler, linker & parser commands -CC = @CC@ -CPP = @CPP@ -EXEEXT = @PROG_EXT@ -PRELIB = @LIB_PREFIX@ +CC = @CC@ +CPP = @CPP@ +PRELIB = @LIB_PREFIX@ -DEBUG = @ENABLE_DEBUG@ -DDEBUG #-DDEBUG_NEWSRC -DPROFILE -DDEBUG_REFS -CANLOCK = # -DUSE_CANLOCK # -DEVIL_INSIDE +x = @EXEEXT@ +o = .@OBJEXT@ + +DEBUG = @ENABLE_DEBUG@ -DDEBUG #-DDEBUG_NEWSRC -DPROFILE -DDEBUG_REFS +CANLOCK = # -DUSE_CANLOCK # -DEVIL_INSIDE INTL_CPPFLAGS = -DLOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" PCRE_CPPFLAGS = @PCREDIR_CPPFLAGS@ @PCREDIR_MAKE@ -I$(top_builddir)/pcre -I$(top_srcdir)/pcre -CPPOPTS = @DEFS@ -I. -I../include $(PCRE_CPPFLAGS) $(INTL_CPPFLAGS) -I$(INCDIR) $(DEBUG) $(CANLOCK) @CPPFLAGS@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @DEFS@ -I. -I../include $(PCRE_CPPFLAGS) $(INTL_CPPFLAGS) -I$(INCDIR) $(DEBUG) $(CANLOCK) @CPPFLAGS@ +CFLAGS = @CFLAGS@ + +LDFLAGS = @LDFLAGS@ +YACC = @YACC@ -LD = $(CC) -LDFLAGS = @LDFLAGS@ -YACC = @YACC@ +BUILD_CC = @BUILD_CC@ +BUILD_CFLAGS = @BUILD_CFLAGS@ +BUILD_CPPFLAGS = @BUILD_CPPFLAGS@ $(PCRE_CPPFLAGS) +BUILD_LDFLAGS = @BUILD_LDFLAGS@ +BUILD_LIBS = @BUILD_LIBS@ +X = $(BUILD_EXEEXT) CANLIB = # -L../libcanlock -lcanlock INTL_LIBS = @INTLLIBS@ PCRE_LIBS = @PCREDIR_LIBS@ @PCREDIR_MAKE@ -L../pcre -lpcre -LIBS = $(PCRE_LIBS) $(CANLIB) @LIBS@ @INN_NNTPLIB@ $(INTL_LIBS) +LIBS = @LIBS@ +LINK_LIBS = $(PCRE_LIBS) $(CANLIB) @LIBS@ @INN_NNTPLIB@ $(INTL_LIBS) # Where do you want the binary & manual page installed? DESTDIR = @DESTDIR@ @@ -76,7 +85,7 @@ INS_OLD_SUFFIX = old # Project PROJECT = @PACKAGE@ -EXE = @PACKAGE@$(EXEEXT) +EXE = @PACKAGE@$x VER = @VERSION@ # directory structure @@ -194,114 +203,115 @@ CFILES = \ EXTRAOBJS = @EXTRAOBJS@ EXTRA_INTLLIBS = @INTLDIR_MAKE@ @INTLLIBS@ +EXTRA_PCREHDRS = @PCREDIR_MAKE@ ../pcre/pcre.h EXTRA_PCRELIBS = @PCREDIR_MAKE@ ../pcre/$(PRELIB)pcre.a EXTRALIBS = $(EXTRA_INTLLIBS) $(EXTRA_PCRELIBS) OFILES = @ALLOCA@ $(EXTRAOBJS) \ - $(OBJDIR)/active.o \ - $(OBJDIR)/art.o \ - $(OBJDIR)/attrib.o \ - $(OBJDIR)/auth.o \ - $(OBJDIR)/charset.o \ - $(OBJDIR)/color.o \ - $(OBJDIR)/config.o \ - $(OBJDIR)/cook.o \ - $(OBJDIR)/curses.o \ - $(OBJDIR)/debug.o \ - $(OBJDIR)/envarg.o \ - $(OBJDIR)/feed.o \ - $(OBJDIR)/filter.o \ - $(OBJDIR)/getline.o \ - $(OBJDIR)/global.o \ - $(OBJDIR)/group.o \ - $(OBJDIR)/hashstr.o \ - $(OBJDIR)/header.o \ - $(OBJDIR)/help.o \ - $(OBJDIR)/inews.o \ - $(OBJDIR)/init.o \ - $(OBJDIR)/joinpath.o \ - $(OBJDIR)/keymap.o \ - $(OBJDIR)/lang.o \ - $(OBJDIR)/langinfo.o \ - $(OBJDIR)/list.o \ - $(OBJDIR)/lock.o \ - $(OBJDIR)/mail.o \ - $(OBJDIR)/main.o \ - $(OBJDIR)/memory.o \ - $(OBJDIR)/mimetypes.o \ - $(OBJDIR)/misc.o \ - $(OBJDIR)/my_tmpfile.o \ - $(OBJDIR)/newsrc.o \ - $(OBJDIR)/nntplib.o \ - $(OBJDIR)/nrctbl.o \ - $(OBJDIR)/page.o \ - $(OBJDIR)/parsdate.o \ - $(OBJDIR)/pgp.o \ - $(OBJDIR)/plp_snprintf.o \ - $(OBJDIR)/post.o \ - $(OBJDIR)/prompt.o \ - $(OBJDIR)/read.o \ - $(OBJDIR)/refs.o \ - $(OBJDIR)/regex.o \ - $(OBJDIR)/rfc1524.o \ - $(OBJDIR)/rfc2045.o \ - $(OBJDIR)/rfc2046.o \ - $(OBJDIR)/rfc2047.o \ - $(OBJDIR)/save.o \ - $(OBJDIR)/screen.o \ - $(OBJDIR)/search.o \ - $(OBJDIR)/select.o \ - $(OBJDIR)/sigfile.o \ - $(OBJDIR)/signal.o \ - $(OBJDIR)/strftime.o \ - $(OBJDIR)/string.o \ - $(OBJDIR)/tags.o \ - $(OBJDIR)/tcurses.o \ - $(OBJDIR)/tmpfile.o \ - $(OBJDIR)/thread.o \ - $(OBJDIR)/version.o \ - $(OBJDIR)/wildmat.o \ - $(OBJDIR)/xface.o \ - $(OBJDIR)/xref.o + $(OBJDIR)/active$o \ + $(OBJDIR)/art$o \ + $(OBJDIR)/attrib$o \ + $(OBJDIR)/auth$o \ + $(OBJDIR)/charset$o \ + $(OBJDIR)/color$o \ + $(OBJDIR)/config$o \ + $(OBJDIR)/cook$o \ + $(OBJDIR)/curses$o \ + $(OBJDIR)/debug$o \ + $(OBJDIR)/envarg$o \ + $(OBJDIR)/feed$o \ + $(OBJDIR)/filter$o \ + $(OBJDIR)/getline$o \ + $(OBJDIR)/global$o \ + $(OBJDIR)/group$o \ + $(OBJDIR)/hashstr$o \ + $(OBJDIR)/header$o \ + $(OBJDIR)/help$o \ + $(OBJDIR)/inews$o \ + $(OBJDIR)/init$o \ + $(OBJDIR)/joinpath$o \ + $(OBJDIR)/keymap$o \ + $(OBJDIR)/lang$o \ + $(OBJDIR)/langinfo$o \ + $(OBJDIR)/list$o \ + $(OBJDIR)/lock$o \ + $(OBJDIR)/mail$o \ + $(OBJDIR)/main$o \ + $(OBJDIR)/memory$o \ + $(OBJDIR)/mimetypes$o \ + $(OBJDIR)/misc$o \ + $(OBJDIR)/my_tmpfile$o \ + $(OBJDIR)/newsrc$o \ + $(OBJDIR)/nntplib$o \ + $(OBJDIR)/nrctbl$o \ + $(OBJDIR)/page$o \ + $(OBJDIR)/parsdate$o \ + $(OBJDIR)/pgp$o \ + $(OBJDIR)/plp_snprintf$o \ + $(OBJDIR)/post$o \ + $(OBJDIR)/prompt$o \ + $(OBJDIR)/read$o \ + $(OBJDIR)/refs$o \ + $(OBJDIR)/regex$o \ + $(OBJDIR)/rfc1524$o \ + $(OBJDIR)/rfc2045$o \ + $(OBJDIR)/rfc2046$o \ + $(OBJDIR)/rfc2047$o \ + $(OBJDIR)/save$o \ + $(OBJDIR)/screen$o \ + $(OBJDIR)/search$o \ + $(OBJDIR)/select$o \ + $(OBJDIR)/sigfile$o \ + $(OBJDIR)/signal$o \ + $(OBJDIR)/strftime$o \ + $(OBJDIR)/string$o \ + $(OBJDIR)/tags$o \ + $(OBJDIR)/tcurses$o \ + $(OBJDIR)/tmpfile$o \ + $(OBJDIR)/thread$o \ + $(OBJDIR)/version$o \ + $(OBJDIR)/wildmat$o \ + $(OBJDIR)/xface$o \ + $(OBJDIR)/xref$o ALL_FILES = $(HFILES) $(CFILES) $(NNTP) -LINTFLAGS = -a -c -h -n -x $(CPPOPTS) -I/usr/local/include/ \ +LINTFLAGS = -a -c -h -n -x $(CPPFLAGS) -I/usr/local/include/ \ -DUSE_ISO2ASC=\"2\" \ -DHAVE_ISPELL \ -DHAVE_COLOR -all: $(BINDIR)/$(EXE) +all : $(BINDIR)/$(EXE) -.SUFFIXES: .i +.SUFFIXES : .i -.c.o: +.c$o : @SHOW_CC@ - @ECHO_CC@$(CC) $(CPPOPTS) $(CFLAGS) -c $(srcdir)/$*.c + @ECHO_CC@$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/$*.c -.c.i: +.c.i : @SHOW_CC@ - @ECHO_CC@$(CPP) -C $(CPPOPTS) $*.c >$@ + @ECHO_CC@$(CPP) -C $(CPPFLAGS) $*.c >$@ # explicit rules to allow running lint, and to accommodate older 'make' programs -$(OBJDIR)/parsdate.o: $(SRCDIR)/parsdate.y +$(OBJDIR)/parsdate$o : $(SRCDIR)/parsdate.y @$(ECHO) "expect 6 shift/reduce conflicts ..." $(YACC) $(SRCDIR)/parsdate.y $(MV) -f y.tab.c $(OBJDIR)/parsdate.c @SHOW_CC@ - @ECHO_CC@$(CC) $(CPPOPTS) $(CFLAGS) -c $(OBJDIR)/parsdate.c + @ECHO_CC@$(CC) $(CPPFLAGS) $(CFLAGS) -c $(OBJDIR)/parsdate.c -$(OBJDIR)/parsdate.c: $(SRCDIR)/parsdate.y +$(OBJDIR)/parsdate.c : $(SRCDIR)/parsdate.y @$(ECHO) "expect 6 shift/reduce conflicts ..." $(YACC) $(SRCDIR)/parsdate.y $(MV) -f y.tab.c $(OBJDIR)/parsdate.c -$(BINDIR)/$(EXE): $(OFILES) $(EXTRALIBS) +$(BINDIR)/$(EXE) : $(OFILES) $(EXTRALIBS) @$(ECHO) "Linking $(EXE) v$(VER) ..." - $(LD) $(LDFLAGS) -o $(BINDIR)/$(EXE) $(OFILES) $(NNTPLIB) $(NETLIBS) $(LIBS) $(DEBUG) + $(CC) $(LDFLAGS) -o $(BINDIR)/$(EXE) $(OFILES) $(LINK_LIBS) $(DEBUG) @$(LS) -l $(BINDIR)/$(EXE) -help: +help : @$(ECHO) "This Makefile offers the following options:" @$(ECHO) " " @$(ECHO) " make [all] [ Build the binary for your OS ]" @@ -320,7 +330,7 @@ $(DESTDIR)$(INS_BINARY_DIR) \ $(DESTDIR)$(INS_SYSDEF_DIR) : $(top_srcdir)/mkdirs.sh $@ -install_manpage: $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) $(DESTDIR)$(INS_MANUAL_DIR)5 +install_manpage : $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) $(DESTDIR)$(INS_MANUAL_DIR)5 @$(ECHO) "Installing $(PROJECT) manual pages to $(DESTDIR)$(INS_MANUAL_DIR) ..." @$(INSTALL) -m 444 $(DOCDIR)/tin.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT) @( $(CD) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) && $(RM) -f r$(PROJECT).$(INS_MANUAL_EXT) && $(LN) $(PROJECT).$(INS_MANUAL_EXT) r$(PROJECT).$(INS_MANUAL_EXT) ) @@ -328,7 +338,7 @@ install_manpage: $(DESTDIR)$(INS_MANUAL_ @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi -uninstall_manpage: +uninstall_manpage : @$(ECHO) "Uninstalling $(PROJECT) manual page in $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) ..." @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT) @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/r$(PROJECT).$(INS_MANUAL_EXT) @@ -336,35 +346,39 @@ uninstall_manpage: # @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 # @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 -install_sysdefs: $(DESTDIR)$(INS_SYSDEF_DIR) +install_sysdefs : $(DESTDIR)$(INS_SYSDEF_DIR) @$(ECHO) "Installing system-wide defaults to $(DESTDIR)$(INS_SYSDEF_DIR) ..." @-if test -f $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults ; then $(ECHO) " ... backing up existing tin.defaults file to tin.defaults.$(INS_OLD_SUFFIX)" ; $(MV) -f $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults.$(INS_OLD_SUFFIX) ; fi @-if test -f $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types ; then $(ECHO) " ... backing up existing mime.types file to mime.types.$(INS_OLD_SUFFIX)" ; $(MV) -f $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types.$(INS_OLD_SUFFIX) ; fi @$(INSTALL) -m 644 $(DOCDIR)/tin.defaults $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults @$(INSTALL) -m 644 $(DOCDIR)/mime.types $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types -uninstall_sysdefs: +uninstall_sysdefs : @$(ECHO) "Uninstalling system-wide defaults in $(DESTDIR)$(INS_SYSDEF_DIR) ..." @-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults @-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types -install_helpers: $(DESTDIR)$(INS_BINARY_DIR) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) +install_helpers : $(DESTDIR)$(INS_BINARY_DIR) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) @$(ECHO) "Installing helper applications ..." @-if test ! -f $(DESTDIR)$(INS_BINARY_DIR)/url_handler.sh ; then $(INSTALL) -m 755 $(TOLDIR)/url_handler.sh $(DESTDIR)$(INS_BINARY_DIR)/url_handler.sh ; fi @-if test ! -f $(DESTDIR)$(INS_BINARY_DIR)/metamutt ; then $(INSTALL) -m 755 $(TOLDIR)/metamutt $(DESTDIR)$(INS_BINARY_DIR)/metamutt ; fi @$(INSTALL) -m 755 $(TOLDIR)/w2r.pl $(DESTDIR)$(INS_BINARY_DIR)/w2r.pl @$(INSTALL) -m 755 $(TOLDIR)/opt-case.pl $(DESTDIR)$(INS_BINARY_DIR)/opt-case.pl + @$(INSTALL) -m 755 $(TOLDIR)/tinews.pl $(DESTDIR)$(INS_BINARY_DIR)/tinews.pl @$(INSTALL) -m 444 $(DOCDIR)/w2r.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/w2r.pl.$(INS_MANUAL_EXT) @$(INSTALL) -m 444 $(DOCDIR)/opt-case.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/opt-case.pl.$(INS_MANUAL_EXT) + @$(INSTALL) -m 444 $(DOCDIR)/tinews.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/tinews.pl.$(INS_MANUAL_EXT) -uninstall_helpers: +uninstall_helpers : @$(ECHO) "Removing helper applications ..." @-$(RM) -f $(DESTDIR)$(INS_BINARY_DIR)/w2r.pl @-$(RM) -f $(DESTDIR)$(INS_BINARY_DIR)/opt-case.pl + @-$(RM) -f $(DESTDIR)$(INS_BINARY_DIR)/tinews.pl @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/w2r.pl.$(INS_MANUAL_EXT) @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/opt-case.pl.$(INS_MANUAL_EXT) + @-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/tinews.pl.$(INS_MANUAL_EXT) -install: $(DESTDIR)$(INS_BINARY_DIR) +install : $(DESTDIR)$(INS_BINARY_DIR) @$(MAKE) all @$(ECHO) "Installing $(EXE) v$(VER) to $(DESTDIR)$(INS_BINARY_DIR) ..." @$(INSTALL) -s $(BINDIR)/$(EXE) $(DESTDIR)$(INS_BINARY_DIR)/$(EXE) @@ -373,7 +387,7 @@ install: $(DESTDIR)$(INS_BINARY_DIR) @$(MAKE) install_manpage @MSG_DIR_MAKE@ @$(MAKE) install_nls -uninstall: +uninstall : @$(ECHO) "Uninstalling $(EXE) in $(DESTDIR)$(INS_BINARY_DIR) ..." @-$(RM) -f $(DESTDIR)$(INS_BINARY_DIR)/$(EXE) @-$(RM) -f $(DESTDIR)$(INS_BINARY_DIR)/r$(EXE) @@ -381,32 +395,32 @@ uninstall: @$(MAKE) uninstall_manpage @MSG_DIR_MAKE@ @$(MAKE) uninstall_nls -install_nls: +install_nls : @MSG_DIR_MAKE@ @-if test -r ../po/Makefile ; then $(ECHO) "Installing NLS-files" ; $(CD) ../po/ && $(MAKE) install ; fi -uninstall_nls: +uninstall_nls : @MSG_DIR_MAKE@ @-if test -r ../po/Makefile ; then $(ECHO) "Uninstalling NLS-files" ; $(CD) ../po/ && $(MAKE) uninstall ; fi -tags: +tags : @$(ECHO) "Generating tags (results in ./tags) ..." @-$(RM) -f tags @$(TAGS) $(HFILES) $(CFILES) -TAGS: +TAGS : @$(ECHO) "Generating emacs tags (results in ./TAGS) ..." @-$(RM) -f TAGS @$(ETAGS) $(HFILES) $(CFILES) -lint: $(CFILES) $(OBJDIR)/parsdate.c tincfg.h +lint : $(CFILES) $(OBJDIR)/parsdate.c tincfg.h @$(ECHO) "Linting source (results in ./LINT) ..." @$(LINT) $(LINTFLAGS) -DNNTP_ABLE `$(LS) $(CFILES)|$(SED) -e 's/\.y/.c/'` $(LIBS) > LINT -clean: +clean : @$(ECHO) "Cleaning ..." @-$(RM) -f $(OFILES) @-$(RM) -f $(OBJDIR)/parsdate.c @-$(RM) -f LINT *.ln *.out - @-$(RM) -f makecfg$(EXEEXT) makecfg.o tincfg.h + @-$(RM) -f makecfg$X makecfg$o tincfg.h @-$(RM) -f core *~ @-$(RM) -f $(EXE) @PCREDIR_MAKE@ @-if test -r ../pcre/Makefile ; then $(CD) ../pcre && $(ECHO) "Cleaning Philip Hazel's Perl-compatible regular expressions library ..." && $(MAKE) @cf_cv_makeflags@ clean ; fi @@ -414,7 +428,7 @@ clean: @INTLDIR_MAKE@ @-if test -r ../intl/Makefile ; then $(CD) ../intl && $(MAKE) @cf_cv_makeflags@ $@ ; fi laundry \ -dirty: +dirty : @$(ECHO) "I'm sorry, this is not supported yet ..." distclean \ @@ -426,15 +440,15 @@ distclean :: @INTLDIR_MAKE@ @-$(CD) ../intl && $(MAKE) @cf_cv_makeflags@ $@ @MSG_DIR_MAKE@ @-$(CD) ../po && $(MAKE) @cf_cv_makeflags@ clean -cflow: +cflow : @$(ECHO) "Creating cflow for $(PROJECT) ..." @PCREDIR_MAKE@ @$(CFLOW) -I$(INCDIR) -I$(SRCDIR) -I../pcre $(CFILES) > cflow.$(PROJECT) -cscope: +cscope : @$(ECHO) "Creating cscope database $(PROJECT) ..." @$(CSCOPE) $(ALL_FILES) -canlock: +canlock : @$(ECHO) "Building libcanlock ..." @$(CD) ../libcanlock && ./Build @@ -447,141 +461,141 @@ TIN_DEP = \ $(INCDIR)/extern.h \ $(INCDIR)/nntplib.h \ $(INCDIR)/tcurses.h \ - $(INCDIR)/proto.h $(EXTRA_INTLLIBS) + $(INCDIR)/proto.h $(EXTRA_PCREHDRS) $(EXTRA_INTLLIBS) -@PCREDIR_MAKE@../pcre/$(PRELIB)pcre.a: +@PCREDIR_MAKE@../pcre/pcre.h ../pcre/$(PRELIB)pcre.a : @PCREDIR_MAKE@ @$(ECHO) "Building Philip Hazel's Perl regular expressions library ..." @PCREDIR_MAKE@ @$(CD) ../pcre && $(MAKE) @cf_cv_makeflags@ $(PRELIB)pcre.a -@INTLDIR_MAKE@@INTLLIBS@: +@INTLDIR_MAKE@@INTLLIBS@ : @INTLDIR_MAKE@ @$(ECHO) "Building GNU gettext library ..." @INTLDIR_MAKE@ @$(CD) ../intl && $(MAKE) @cf_cv_makeflags@ -tincfg.h: $(SRCDIR)/tincfg.tbl \ - makecfg$(EXEEXT) +tincfg.h : $(SRCDIR)/tincfg.tbl \ + makecfg$X ./makecfg $(SRCDIR)/tincfg.tbl tincfg.h -makecfg$(EXEEXT): $(OBJDIR)/makecfg.o - $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/makecfg.o @LIBS@ +makecfg$X : $(SRCDIR)/makecfg.c $(TIN_DEP) +@SHOW_CC@ + @ECHO_CC@$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -o $@ makecfg.c $(BUILD_LIBS) -$(OBJDIR)/active.o: $(SRCDIR)/active.c $(TIN_DEP) -$(OBJDIR)/art.o: $(SRCDIR)/art.c $(TIN_DEP) \ +$(OBJDIR)/active$o : $(SRCDIR)/active.c $(TIN_DEP) +$(OBJDIR)/art$o : $(SRCDIR)/art.c $(TIN_DEP) \ $(INCDIR)/stpwatch.h -$(OBJDIR)/attrib.o: $(SRCDIR)/attrib.c $(TIN_DEP) \ +$(OBJDIR)/attrib$o : $(SRCDIR)/attrib.c $(TIN_DEP) \ $(INCDIR)/version.h -$(OBJDIR)/auth.o: $(SRCDIR)/auth.c $(TIN_DEP) -$(OBJDIR)/charset.o: $(SRCDIR)/charset.c $(TIN_DEP) -$(OBJDIR)/color.o: $(SRCDIR)/color.c $(TIN_DEP) -$(OBJDIR)/config.o: $(SRCDIR)/config.c $(TIN_DEP) \ +$(OBJDIR)/auth$o : $(SRCDIR)/auth.c $(TIN_DEP) +$(OBJDIR)/charset$o : $(SRCDIR)/charset.c $(TIN_DEP) +$(OBJDIR)/color$o : $(SRCDIR)/color.c $(TIN_DEP) +$(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) \ +$(OBJDIR)/curses$o : $(SRCDIR)/curses.c $(TIN_DEP) \ $(INCDIR)/tnntp.h -$(OBJDIR)/cook.o: $(SRCDIR)/cook.c $(TIN_DEP) \ +$(OBJDIR)/cook$o : $(SRCDIR)/cook.c $(TIN_DEP) \ $(INCDIR)/rfc2046.h -$(OBJDIR)/debug.o: $(SRCDIR)/debug.c $(TIN_DEP) \ +$(OBJDIR)/debug$o : $(SRCDIR)/debug.c $(TIN_DEP) \ $(INCDIR)/newsrc.h -$(OBJDIR)/envarg.o: $(SRCDIR)/envarg.c $(TIN_DEP) -$(OBJDIR)/feed.o: $(SRCDIR)/feed.c $(TIN_DEP) \ +$(OBJDIR)/envarg$o : $(SRCDIR)/envarg.c $(TIN_DEP) +$(OBJDIR)/feed$o : $(SRCDIR)/feed.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/rfc2046.h -$(OBJDIR)/filter.o: $(SRCDIR)/filter.c $(TIN_DEP) \ +$(OBJDIR)/filter$o : $(SRCDIR)/filter.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/version.h -$(OBJDIR)/getline.o: $(SRCDIR)/getline.c $(TIN_DEP) -$(OBJDIR)/global.o: $(SRCDIR)/global.c $(TIN_DEP) \ +$(OBJDIR)/getline$o : $(SRCDIR)/getline.c $(TIN_DEP) +$(OBJDIR)/global$o : $(SRCDIR)/global.c $(TIN_DEP) \ $(INCDIR)/menukeys.h -$(OBJDIR)/group.o: $(SRCDIR)/group.c $(TIN_DEP) \ +$(OBJDIR)/group$o : $(SRCDIR)/group.c $(TIN_DEP) \ $(INCDIR)/menukeys.h -$(OBJDIR)/hashstr.o: $(SRCDIR)/hashstr.c $(TIN_DEP) -$(OBJDIR)/header.o: $(SRCDIR)/header.c $(TIN_DEP) \ +$(OBJDIR)/hashstr$o : $(SRCDIR)/hashstr.c $(TIN_DEP) +$(OBJDIR)/header$o : $(SRCDIR)/header.c $(TIN_DEP) \ $(INCDIR)/tnntp.h -$(OBJDIR)/help.o: $(SRCDIR)/help.c $(TIN_DEP) \ +$(OBJDIR)/help$o : $(SRCDIR)/help.c $(TIN_DEP) \ $(INCDIR)/menukeys.h -$(OBJDIR)/inews.o: $(SRCDIR)/inews.c $(TIN_DEP) \ +$(OBJDIR)/inews$o : $(SRCDIR)/inews.c $(TIN_DEP) \ $(INCDIR)/tnntp.h -$(OBJDIR)/init.o: $(SRCDIR)/init.c $(TIN_DEP) \ +$(OBJDIR)/init$o : $(SRCDIR)/init.c $(TIN_DEP) \ $(INCDIR)/bugrep.h \ $(INCDIR)/menukeys.h \ $(INCDIR)/tnntp.h \ $(INCDIR)/version.h -$(OBJDIR)/joinpath.o: $(SRCDIR)/joinpath.c $(TIN_DEP) -$(OBJDIR)/keymap.o: $(SRCDIR)/keymap.c $(TIN_DEP) \ +$(OBJDIR)/joinpath$o : $(SRCDIR)/joinpath.c $(TIN_DEP) +$(OBJDIR)/keymap$o : $(SRCDIR)/keymap.c $(TIN_DEP) \ $(INCDIR)/keymap.h \ $(INCDIR)/menukeys.h -$(OBJDIR)/lang.o: $(SRCDIR)/lang.c $(TIN_DEP) -$(OBJDIR)/langinfo.o: $(SRCDIR)/langinfo.c $(TIN_DEP) -$(OBJDIR)/list.o: $(SRCDIR)/list.c $(TIN_DEP) -$(OBJDIR)/lock.o: $(SRCDIR)/lock.c $(TIN_DEP) -$(OBJDIR)/mail.o: $(SRCDIR)/mail.c $(TIN_DEP) -$(OBJDIR)/main.o: $(SRCDIR)/main.c $(TIN_DEP) \ +$(OBJDIR)/lang$o : $(SRCDIR)/lang.c $(TIN_DEP) +$(OBJDIR)/langinfo$o : $(SRCDIR)/langinfo.c $(TIN_DEP) +$(OBJDIR)/list$o : $(SRCDIR)/list.c $(TIN_DEP) +$(OBJDIR)/lock$o : $(SRCDIR)/lock.c $(TIN_DEP) +$(OBJDIR)/mail$o : $(SRCDIR)/mail.c $(TIN_DEP) +$(OBJDIR)/main$o : $(SRCDIR)/main.c $(TIN_DEP) \ $(INCDIR)/version.h -$(OBJDIR)/makecfg.o: $(SRCDIR)/makecfg.c $(TIN_DEP) -$(OBJDIR)/memory.o: $(SRCDIR)/memory.c $(TIN_DEP) \ +$(OBJDIR)/memory$o : $(SRCDIR)/memory.c $(TIN_DEP) \ $(INCDIR)/rfc2046.h -$(OBJDIR)/mimetypes.o: $(SRCDIR)/mimetypes.c $(TIN_DEP) -$(OBJDIR)/misc.o: $(SRCDIR)/misc.c $(TIN_DEP) \ +$(OBJDIR)/mimetypes$o : $(SRCDIR)/mimetypes.c $(TIN_DEP) +$(OBJDIR)/misc$o : $(SRCDIR)/misc.c $(TIN_DEP) \ $(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)/my_tmpfile$o : $(SRCDIR)/my_tmpfile.c $(TIN_DEP) +$(OBJDIR)/newsrc$o : $(SRCDIR)/newsrc.c $(TIN_DEP) \ $(INCDIR)/newsrc.h \ $(INCDIR)/tnntp.h -$(OBJDIR)/nntplib.o: $(SRCDIR)/nntplib.c $(TIN_DEP) \ +$(OBJDIR)/nntplib$o : $(SRCDIR)/nntplib.c $(TIN_DEP) \ $(INCDIR)/tnntp.h -$(OBJDIR)/nrctbl.o: $(SRCDIR)/nrctbl.c $(TIN_DEP) \ +$(OBJDIR)/nrctbl$o : $(SRCDIR)/nrctbl.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/version.h -$(OBJDIR)/page.o: $(SRCDIR)/page.c $(TIN_DEP) \ +$(OBJDIR)/page$o : $(SRCDIR)/page.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/rfc2046.h -$(OBJDIR)/parsdate.o: $(OBJDIR)/parsdate.y $(TIN_DEP) -$(OBJDIR)/pgp.o: $(SRCDIR)/pgp.c $(TIN_DEP) \ +$(OBJDIR)/parsdate$o : $(OBJDIR)/parsdate.y $(TIN_DEP) +$(OBJDIR)/pgp$o : $(SRCDIR)/pgp.c $(TIN_DEP) \ $(INCDIR)/menukeys.h -$(OBJDIR)/plp_snprintf.o: $(SRCDIR)/plp_snprintf.c $(TIN_DEP) \ +$(OBJDIR)/plp_snprintf$o : $(SRCDIR)/plp_snprintf.c $(TIN_DEP) \ $(INCDIR)/plp_snprintf.h -$(OBJDIR)/post.o: $(SRCDIR)/post.c $(TIN_DEP) \ +$(OBJDIR)/post$o : $(SRCDIR)/post.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/rfc2046.h \ $(INCDIR)/version.h -$(OBJDIR)/prompt.o: $(SRCDIR)/prompt.c $(TIN_DEP) \ +$(OBJDIR)/prompt$o : $(SRCDIR)/prompt.c $(TIN_DEP) \ $(INCDIR)/menukeys.h -$(OBJDIR)/read.o: $(SRCDIR)/read.c $(TIN_DEP) \ +$(OBJDIR)/read$o : $(SRCDIR)/read.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/tnntp.h -$(OBJDIR)/refs.o: $(SRCDIR)/refs.c $(TIN_DEP) -$(OBJDIR)/regex.o: $(SRCDIR)/regex.c $(TIN_DEP) -$(OBJDIR)/rfc1524.o: $(SRCDIR)/rfc1524.c $(TIN_DEP) \ +$(OBJDIR)/refs$o : $(SRCDIR)/refs.c $(TIN_DEP) +$(OBJDIR)/regex$o : $(SRCDIR)/regex.c $(TIN_DEP) +$(OBJDIR)/rfc1524$o : $(SRCDIR)/rfc1524.c $(TIN_DEP) \ $(INCDIR)/rfc2046.h -$(OBJDIR)/rfc2045.o: $(SRCDIR)/rfc2045.c $(TIN_DEP) -$(OBJDIR)/rfc2046.o: $(SRCDIR)/rfc2046.c $(TIN_DEP) \ +$(OBJDIR)/rfc2045$o : $(SRCDIR)/rfc2045.c $(TIN_DEP) +$(OBJDIR)/rfc2046$o : $(SRCDIR)/rfc2046.c $(TIN_DEP) \ $(INCDIR)/rfc2046.h -$(OBJDIR)/rfc2047.o: $(SRCDIR)/rfc2047.c $(TIN_DEP) \ +$(OBJDIR)/rfc2047$o : $(SRCDIR)/rfc2047.c $(TIN_DEP) \ $(INCDIR)/rfc2046.h -$(OBJDIR)/save.o: $(SRCDIR)/save.c $(TIN_DEP) \ +$(OBJDIR)/save$o : $(SRCDIR)/save.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/rfc2046.h -$(OBJDIR)/screen.o: $(SRCDIR)/screen.c $(TIN_DEP) -$(OBJDIR)/search.o: $(SRCDIR)/search.c $(TIN_DEP) \ +$(OBJDIR)/screen$o : $(SRCDIR)/screen.c $(TIN_DEP) +$(OBJDIR)/search$o : $(SRCDIR)/search.c $(TIN_DEP) \ $(INCDIR)/menukeys.h -$(OBJDIR)/select.o: $(SRCDIR)/select.c $(TIN_DEP) \ +$(OBJDIR)/select$o : $(SRCDIR)/select.c $(TIN_DEP) \ $(INCDIR)/menukeys.h -$(OBJDIR)/sigfile.o: $(SRCDIR)/sigfile.c $(TIN_DEP) -$(OBJDIR)/signal.o: $(SRCDIR)/signal.c $(TIN_DEP) \ +$(OBJDIR)/sigfile$o : $(SRCDIR)/sigfile.c $(TIN_DEP) +$(OBJDIR)/signal$o : $(SRCDIR)/signal.c $(TIN_DEP) \ $(INCDIR)/version.h -$(OBJDIR)/strftime.o: $(SRCDIR)/strftime.c $(TIN_DEP) -$(OBJDIR)/string.o: $(SRCDIR)/string.c $(TIN_DEP) -$(OBJDIR)/tags.o: $(SRCDIR)/tags.c $(TIN_DEP) -$(OBJDIR)/tcurses.o: $(SRCDIR)/tcurses.c $(TIN_DEP) -$(OBJDIR)/tmpfile.o: $(SRCDIR)/tmpfile.c $(TIN_DEP) -$(OBJDIR)/thread.o: $(SRCDIR)/thread.c $(TIN_DEP) \ +$(OBJDIR)/strftime$o : $(SRCDIR)/strftime.c $(TIN_DEP) +$(OBJDIR)/string$o : $(SRCDIR)/string.c $(TIN_DEP) +$(OBJDIR)/tags$o : $(SRCDIR)/tags.c $(TIN_DEP) +$(OBJDIR)/tcurses$o : $(SRCDIR)/tcurses.c $(TIN_DEP) +$(OBJDIR)/tmpfile$o : $(SRCDIR)/tmpfile.c $(TIN_DEP) +$(OBJDIR)/thread$o : $(SRCDIR)/thread.c $(TIN_DEP) \ $(INCDIR)/menukeys.h -$(OBJDIR)/version.o: $(SRCDIR)/version.c $(TIN_DEP) \ +$(OBJDIR)/version$o : $(SRCDIR)/version.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/version.h -$(OBJDIR)/wildmat.o: $(SRCDIR)/wildmat.c $(TIN_DEP) -$(OBJDIR)/xface.o: $(SRCDIR)/xface.c $(TIN_DEP) -$(OBJDIR)/xref.o: $(SRCDIR)/xref.c $(TIN_DEP) \ +$(OBJDIR)/wildmat$o : $(SRCDIR)/wildmat.c $(TIN_DEP) +$(OBJDIR)/xface$o : $(SRCDIR)/xface.c $(TIN_DEP) +$(OBJDIR)/xref$o : $(SRCDIR)/xref.c $(TIN_DEP) \ $(INCDIR)/newsrc.h diff -Nurp tin-1.7.3/src/active.c tin-1.7.4/src/active.c --- tin-1.7.3/src/active.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/active.c Sun Dec 28 15:15:23 2003 @@ -6,7 +6,7 @@ * Updated : 2003-09-24 * Notes : * - * Copyright (c) 1992-2003 Iain Lea + * Copyright (c) 1992-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/art.c tin-1.7.4/src/art.c --- tin-1.7.3/src/art.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/art.c Sun Dec 28 15:15:32 2003 @@ -3,10 +3,10 @@ * Module : art.c * Author : I.Lea & R.Skrenta * Created : 1991-04-01 - * Updated : 2003-11-18 + * Updated : 2003-12-28 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -570,6 +570,7 @@ read_art_headers( { FILE *fp; char dir[PATH_LEN]; + char *group_msg; int i; int modified = 0; long art; @@ -588,6 +589,7 @@ read_art_headers( my_chdir(buf); } + group_msg = fmt_string(_(txt_group), cCOLS - strlen(_(txt_group)) + 2 - 3, group->name); for (i = 0; i < grpmenu.max; i++) { /* for each article number */ art = base[i]; @@ -638,8 +640,9 @@ read_art_headers( top_art++; if (++modified % MODULO_COUNT_NUM == 0) - show_progress(mesg, modified, total); + show_progress(group_msg, modified, total); } + free(group_msg); /* * Change back to previous dir before indexing started @@ -1288,6 +1291,7 @@ read_overview( FILE *fp; char *ptr; char *buf; + char *group_msg; char art_full_name[HEADER_LEN]; char art_from_addr[HEADER_LEN]; unsigned int count; @@ -1307,6 +1311,7 @@ read_overview( if (group->xmax > max) group->xmax = max; + group_msg = fmt_string(_(txt_group), cCOLS - strlen(_(txt_group)) + 2 - 3, group->name); while ((buf = tin_fgets(fp, FALSE)) != NULL) { if (need_resize) { handle_resize((need_resize == cRedraw) ? TRUE : FALSE); @@ -1440,10 +1445,11 @@ read_overview( /* we might loose accuracy here, but that shouldn't hurt */ if (artnum % MODULO_COUNT_NUM == 0) - show_progress(mesg, artnum - min, max - min); + show_progress(group_msg, artnum - min, max - min); top_art++; /* Basically this statement commits the article */ } + free(group_msg); TIN_FCLOSE(fp); diff -Nurp tin-1.7.3/src/attrib.c tin-1.7.4/src/attrib.c --- tin-1.7.3/src/attrib.c Fri Dec 19 15:35:57 2003 +++ tin-1.7.4/src/attrib.c Sun Dec 28 15:15:42 2003 @@ -6,7 +6,7 @@ * Updated : 2003-12-19 * Notes : Group attribute routines * - * Copyright (c) 1993-2003 Iain Lea + * Copyright (c) 1993-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/auth.c tin-1.7.4/src/auth.c --- tin-1.7.3/src/auth.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/auth.c Sun Dec 28 15:15:57 2003 @@ -7,7 +7,7 @@ * Notes : Routines to authenticate to a news server via NNTP. * DON'T USE get_respcode() THROUGHOUT THIS CODE. * - * Copyright (c) 1997-2003 Dirk Nimmich + * Copyright (c) 1997-2004 Dirk Nimmich * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/charset.c tin-1.7.4/src/charset.c --- tin-1.7.3/src/charset.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/charset.c Sun Dec 28 15:16:24 2003 @@ -6,7 +6,7 @@ * Updated : 2003-03-22 * Notes : ISO to ascii charset conversion routines * - * Copyright (c) 1993-2003 Markus Kuhn + * Copyright (c) 1993-2004 Markus Kuhn * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/color.c tin-1.7.4/src/color.c --- tin-1.7.3/src/color.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/color.c Tue Jan 20 15:21:00 2004 @@ -5,13 +5,13 @@ * Author : Roland Rosenfeld * Giuseppe De Marco (light-colors) * Julien Oster (word highlighting) - * T.Dickey (curses support) + * T.Dickey (curses support) * Created : 1995-06-02 - * Updated : 2003-05-05 + * Updated : 2004-01-11 * Notes : This are the basic function for ansi-color * and word highlighting * - * Copyright (c) 1995-2003 Roland Rosenfeld + * Copyright (c) 1995-2004 Roland Rosenfeld * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -211,7 +211,8 @@ bcol( void draw_pager_line( const char *str, - int flags) + int flags, + t_bool raw_data) { #ifdef HAVE_COLOR @@ -233,7 +234,51 @@ draw_pager_line( } #endif /* HAVE_COLOR */ - my_fputs(str, stdout); + if (!raw_data) + my_fputs(str, stdout); + else { + /* in RAW-mode (show_all_headers) display non-printable chars as octals */ + const char *c; + char octal[5]; + + c = str; + while (*c) { +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + int num_bytes; + wchar_t wc; + + num_bytes = mbtowc(&wc, c, MB_CUR_MAX); + if (num_bytes != -1 && iswprint(wc)) { + my_fputwc((wint_t) wc, stdout); + c += num_bytes; + } +#else + if (my_isprint((int) *c)) { + my_fputc((int) *c, stdout); + c++; + } +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + else if (IS_LOCAL_CHARSET("Big5") && (unsigned char) *c >= 0xa1 &&(unsigned char) *c <= 0xfe && *(c + 1)) { + /* + * Big5: ASCII chars are handled by the normal code + * check only for 2-byte chars + * TODO: should we also check if the second byte is also valid? + */ + my_fputc((int) *c, stdout); + c++; + my_fputc((int) *c, stdout); + c++; + } else { + /* + * non-printable char + * print as an octal value + */ + snprintf(octal, sizeof(octal), "\\%03o", (int) *c & 0xff); + my_fputs(octal, stdout); + c++; + } + } + } #ifndef USE_CURSES my_fputs(cCRLF, stdout); diff -Nurp tin-1.7.3/src/config.c tin-1.7.4/src/config.c --- tin-1.7.3/src/config.c Wed Dec 17 19:12:50 2003 +++ tin-1.7.4/src/config.c Tue Jan 20 15:39:40 2004 @@ -3,10 +3,10 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-12-17 + * Updated : 2004-01-20 * Notes : Configuration file routines * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -816,7 +816,7 @@ read_config_file( */ { #ifndef NO_LOCALE - char *p; + const char *p; if ((p = tin_nl_langinfo(CODESET)) != NULL) { if (!strcmp(p, "ANSI_X3.4-1968")) diff -Nurp tin-1.7.3/src/cook.c tin-1.7.4/src/cook.c --- tin-1.7.3/src/cook.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/cook.c Sun Dec 28 15:16:41 2003 @@ -6,7 +6,7 @@ * Updated : 2003-08-26 * Notes : Split from page.c * - * Copyright (c) 2000-2003 Jason Faultless + * Copyright (c) 2000-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/debug.c tin-1.7.4/src/debug.c --- tin-1.7.3/src/debug.c Thu Dec 11 13:43:36 2003 +++ tin-1.7.4/src/debug.c Sun Dec 28 15:17:03 2003 @@ -6,7 +6,7 @@ * Updated : 2003-12-11 * Notes : debug routines * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/envarg.c tin-1.7.4/src/envarg.c --- tin-1.7.3/src/envarg.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/envarg.c Sun Dec 28 15:17:14 2003 @@ -6,7 +6,7 @@ * Updated : 1993-03-10 * Notes : Adds default options from environment to command line * - * Copyright (c) 1991-2003 Bill Davidson + * Copyright (c) 1991-2004 Bill Davidson * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/feed.c tin-1.7.4/src/feed.c --- tin-1.7.3/src/feed.c Wed Dec 17 19:13:00 2003 +++ tin-1.7.4/src/feed.c Mon Jan 5 03:59:09 2004 @@ -3,10 +3,10 @@ * Module : feed.c * Author : I. Lea * Created : 1991-08-31 - * Updated : 2003-12-17 + * Updated : 2004-01-05 * Notes : provides same interface to mail,pipe,print,save & repost commands * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -280,9 +280,15 @@ get_feed_key( return 0; case iKeyFeedPat: - snprintf(mesg, sizeof(mesg), _(txt_feed_pattern), tinrc.default_pattern); - if (!(prompt_string_default(mesg, tinrc.default_pattern, _(txt_no_match), HIST_REGEX_PATTERN))) - return 0; + { + char *tmp = fmt_string(_(txt_feed_pattern), tinrc.default_pattern); + + if (!(prompt_string_default(tmp, tinrc.default_pattern, _(txt_no_match), HIST_REGEX_PATTERN))) { + free(tmp); + return 0; + } + free(tmp); + } break; default: @@ -368,6 +374,7 @@ feed_article( const char *data, /* Extra data if needed, print command or save filename */ struct t_group *group) { + char *progress_mesg = NULL; t_bool ok = TRUE; /* Assume success */ t_openartinfo openart; t_openartinfo *openartptr = &openart; @@ -382,29 +389,33 @@ feed_article( #ifndef DONT_HAVE_PIPING case FEED_PIPE: /* TODO: looks odd because screen mode is raw */ - wait_message(0, "%s (%d/%d)", _(txt_piping), counter->total, counter->max); + progress_mesg = fmt_string("%s (%d/%d)", _(txt_piping), counter->total, counter->max); break; #endif /* !DONT_HAVE_PIPING */ #ifndef DISABLE_PRINTING case FEED_PRINT: /* TODO: looks odd because screen mode is raw */ - wait_message(0, "%s (%d/%d)", _(txt_printing), counter->total, counter->max); + progress_mesg = fmt_string("%s (%d/%d)", _(txt_printing), counter->total, counter->max); break; #endif /* !DISABLE_PRINTING */ case FEED_SAVE: case FEED_AUTOSAVE: - wait_message(0, "%s (%d/%d)", _(txt_saving), counter->total, counter->max); + progress_mesg = fmt_string("%s (%d/%d)", _(txt_saving), counter->total, counter->max); break; } if (use_current) openartptr = &pgart; /* Use art already open in pager */ else { - if (art_open(FALSE, &arts[art], group, openartptr, TRUE) < 0) /* User abort or an error */ + if (art_open(FALSE, &arts[art], group, openartptr, TRUE, progress_mesg) < 0) { + /* User abort or an error */ + FreeIfNeeded(progress_mesg); return FALSE; + } } + FreeIfNeeded(progress_mesg); switch (function) { case FEED_MAIL: @@ -496,6 +507,7 @@ feed_articles( int respnum) { char outpath[PATH_LEN]; + char *prompt; int art; int feed_type; int i; @@ -535,17 +547,23 @@ feed_articles( switch (function) { /* Setup mail - get address to mail to */ case FEED_MAIL: - snprintf(mesg, sizeof(mesg), _(txt_mail_art_to), cCOLS - (strlen(_(txt_mail_art_to)) + 30), tinrc.default_mail_address); - if (!(prompt_string_default(mesg, tinrc.default_mail_address, _(txt_no_mail_address), HIST_MAIL_ADDRESS))) + prompt = fmt_string(_(txt_mail_art_to), cCOLS - (strlen(_(txt_mail_art_to)) + 30), tinrc.default_mail_address); + if (!(prompt_string_default(prompt, tinrc.default_mail_address, _(txt_no_mail_address), HIST_MAIL_ADDRESS))) { + free(prompt); return; + } + free(prompt); break; #ifndef DONT_HAVE_PIPING /* Setup pipe - get pipe-to command and open the pipe */ case FEED_PIPE: - snprintf(mesg, sizeof(mesg), _(txt_pipe_to_command), cCOLS - (strlen(_(txt_pipe_to_command)) + 30), tinrc.default_pipe_command); - if (!(prompt_string_default(mesg, tinrc.default_pipe_command, _(txt_no_command), HIST_PIPE_COMMAND))) + prompt = fmt_string(_(txt_pipe_to_command), cCOLS - (strlen(_(txt_pipe_to_command)) + 30), tinrc.default_pipe_command); + if (!(prompt_string_default(prompt, tinrc.default_pipe_command, _(txt_no_command), HIST_PIPE_COMMAND))) { + free(prompt); return; + } + free(prompt); got_sig_pipe = FALSE; EndWin(); /* Turn off curses/windowing */ @@ -601,6 +619,7 @@ feed_articles( /* repost (or supersede) article */ case FEED_REPOST: { + char *tmp; #ifndef FORGERY char from_name[PATH_LEN]; @@ -608,10 +627,11 @@ feed_articles( if (strstr(from_name, arts[respnum].from)) { #endif /* !FORGERY */ + char *smsg; + char option; char buf[LEN]; char keyrepost[MAXKEYLEN], keysupersede[MAXKEYLEN]; char keyquit[MAXKEYLEN]; - char option; /* repost or supersede? */ snprintf(buf, sizeof(buf), _(txt_supersede_article), @@ -620,16 +640,17 @@ feed_articles( printascii(keyquit, map_to_local(iKeyQuit, &menukeymap.feed_supersede_article))); option = (char) prompt_slk_response(iKeyFeedSupersede, &menukeymap.feed_supersede_article, "%s", - sized_message(buf, arts[respnum].subject)); + sized_message(&smsg, buf, arts[respnum].subject)); + free(smsg); switch (option) { case iKeyFeedSupersede: - snprintf(mesg, sizeof(mesg), _(txt_supersede_group), tinrc.default_repost_group); + tmp = fmt_string(_(txt_supersede_group), tinrc.default_repost_group); supersede = TRUE; break; case iKeyFeedRepost: - snprintf(mesg, sizeof(mesg), _(txt_repost_group), tinrc.default_repost_group); + tmp = fmt_string(_(txt_repost_group), tinrc.default_repost_group); supersede = FALSE; break; @@ -639,12 +660,15 @@ feed_articles( } #ifndef FORGERY } else { - snprintf(mesg, sizeof(mesg), _(txt_repost_group), tinrc.default_repost_group); + tmp = fmt_string(_(txt_repost_group), tinrc.default_repost_group); supersede = FALSE; } #endif /* !FORGERY */ - if (!(prompt_string_default(mesg, tinrc.default_repost_group, _(txt_no_group), HIST_REPOST_GROUP))) + if (!(prompt_string_default(tmp, tinrc.default_repost_group, _(txt_no_group), HIST_REPOST_GROUP))) { + free(tmp); return; + } + free(tmp); } break; diff -Nurp tin-1.7.3/src/filter.c tin-1.7.4/src/filter.c --- tin-1.7.3/src/filter.c Thu Dec 4 12:29:38 2003 +++ tin-1.7.4/src/filter.c Sat Jan 10 15:16:33 2004 @@ -3,10 +3,10 @@ * Module : filter.c * Author : I. Lea * Created : 1992-12-28 - * Updated : 2003-12-04 + * Updated : 2004-01-10 * Notes : Filter articles. Kill & auto selection are supported. * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -95,7 +95,7 @@ static struct t_filter_comment *add_filt static struct t_filter_comment *free_filter_comment(struct t_filter_comment *ptr); static struct t_filter_comment *copy_filter_comment(struct t_filter_comment *from, struct t_filter_comment *to); static t_bool add_filter_rule(struct t_group *group, struct t_article *art, struct t_filter_rule *rule, t_bool quick_filter_rule); -static t_bool test_regex(const char *string, char *regex, t_bool nocase, struct regex_cache *cache); +static int test_regex(const char *string, char *regex, t_bool nocase, struct regex_cache *cache); static void expand_filter_array(struct t_filters *ptr); static void fmt_filter_menu_prompt(char *dest, size_t dest_len, const char *fmt_str, int len, const char *text); static void free_filter_item(struct t_filter *ptr); @@ -188,9 +188,11 @@ expand_filter_array( /* * Looks for a matching filter hit (wildmat or pcre regex) in the supplied string * If the cache is not yet initialised, compile and optimise the regex - * Return TRUE if we hit the rule + * Returns 1 if we hit the rule + * Returns 0 if we had no match + * In case of error prints an error message and returns -1 */ -static t_bool +static int test_regex( const char *string, char *regex, @@ -201,19 +203,21 @@ test_regex( if (!tinrc.wildcard) { if (wildmat(string, regex, nocase)) - return TRUE; + return 1; } else { if (!cache->re) compile_regex(regex, cache, (nocase ? PCRE_CASELESS : 0)); if (cache->re) { regex_errpos = pcre_exec(cache->re, cache->extra, string, strlen(string), 0, 0, NULL, 0); if (regex_errpos >= 0) - return TRUE; - else if (regex_errpos != PCRE_ERROR_NOMATCH) - snprintf(mesg, sizeof(mesg), _(txt_pcre_error_num), regex_errpos); + return 1; + else if (regex_errpos != PCRE_ERROR_NOMATCH) { + error_message(_(txt_pcre_error_num), regex_errpos); + return -1; + } } } - return FALSE; + return 0; } @@ -1750,6 +1754,7 @@ filter_articles( struct regex_cache *regex_cache_msgid = NULL; struct regex_cache *regex_cache_xref = NULL; t_bool filtered = FALSE; + t_bool error = FALSE; /* * check if there are any global filter rules @@ -1793,31 +1798,40 @@ filter_articles( regex_cache_xref[j].extra = NULL; } } - mesg[0] = '\0'; /* Clear system message field */ /* * loop thru all arts applying global & local filtering rules */ - for (i = 0; (i < top_art) && (mesg[0] == '\0'); i++) { + for (i = 0; (i < top_art) && !error; i++) { arts[i].score = 0; - /* - * do we really need to 'reset' mesg for every article? - */ - mesg[0] = '\0'; /* Clear system message field */ - if (tinrc.kill_level == KILL_UNREAD && IS_READ(i)) /* skip only when the article is read */ continue; - for (j = 0; j < num; j++) { + for (j = 0; j < num && !error; j++) { if (ptr[j].inscope) { /* * Filter on Subject: line */ if (ptr[j].subj != NULL) { - if (test_regex(arts[i].subject, ptr[j].subj, ptr[j].icase, ®ex_cache_subj[j])) { - SET_FILTER(group, i, j); + char *tmp = my_strdup(arts[i].subject); + +#if defined(CHARSET_CONVERSION) || defined(HAVE_UNICODE_NORMALIZATION) + if (IS_LOCAL_CHARSET("UTF-8")) + utf8_valid(tmp); +#endif /* CHARSET_CONVERSION || HAVE_UNICODE_NORMALIZATION */ + + switch (test_regex(tmp, ptr[j].subj, ptr[j].icase, ®ex_cache_subj[j])) { + case 1: + SET_FILTER(group, i, j); + break; + case -1: + error = TRUE; + break; + default: + break; } + free(tmp); } /* @@ -1828,8 +1842,23 @@ filter_articles( snprintf(buf, sizeof(buf), "%s (%s)", arts[i].from, arts[i].name); else strcpy(buf, arts[i].from); - if (test_regex(buf, ptr[j].from, ptr[j].icase, ®ex_cache_from[j])) { - SET_FILTER(group, i, j); + +#if defined(CHARSET_CONVERSION) || defined(HAVE_UNICODE_NORMALIZATION) + if (IS_LOCAL_CHARSET("UTF-8")) + utf8_valid(buf); +#endif /* CHARSET_CONVERSION || HAVE_UNICODE_NORMALIZATION */ + + switch (test_regex(buf, ptr[j].from, ptr[j].icase, ®ex_cache_from[j])) { + case 1: + SET_FILTER(group, i, j); + break; + + case -1: + error = TRUE; + break; + + default: + break; } } @@ -1840,10 +1869,11 @@ filter_articles( * Case is important here */ if (ptr[j].msgid != NULL) { - struct t_article *art = &arts[i]; char *refs = NULL; const char *myrefs = NULL; const char *mymsgid = NULL; + int x; + struct t_article *art = &arts[i]; /* * TODO: nice idea del'd; better apply one rule on all * fitting articles, so we can switch to an appropriate @@ -1881,10 +1911,20 @@ filter_articles( break; } - if (test_regex(myrefs, ptr[j].msgid, FALSE, ®ex_cache_msgid[j])) { - SET_FILTER(group, i, j); - } else if (test_regex(mymsgid, ptr[j].msgid, FALSE, ®ex_cache_msgid[j])) { - SET_FILTER(group, i, j); + x = test_regex(myrefs, ptr[j].msgid, FALSE, ®ex_cache_msgid[j]); + if (x == 0) /* no match */ + x = test_regex(mymsgid, ptr[j].msgid, FALSE, ®ex_cache_msgid[j]); + switch (x) { + case 1: + SET_FILTER(group, i, j); + break; + + case -1: + error = TRUE; + break; + + default: + break; } FreeIfNeeded(refs); } @@ -1987,8 +2027,15 @@ wait_message(1, "FILTERED Lines arts[%d] *--e = '\0'; if (ptr[j].xref != NULL) { - if (test_regex(k, ptr[j].xref, ptr[j].icase, ®ex_cache_xref[j])) { - SET_FILTER(group, i, j); + switch (test_regex(k, ptr[j].xref, ptr[j].icase, ®ex_cache_xref[j])) { + case 1: + SET_FILTER(group, i, j); + break; + case -1: + error = TRUE; + break; + default: + break; } } free(k); @@ -1998,9 +2045,6 @@ wait_message(1, "FILTERED Lines arts[%d] } } - if (mesg[0] != '\0') - error_message(mesg); - /* * throw away the contents of all regex_caches */ @@ -2025,7 +2069,7 @@ wait_message(1, "FILTERED Lines arts[%d] * now entering the main filter loop: * all articles have scored, so do kill & select */ - if (mesg[0] == '\0') { + if (!error) { for_each_art(i) { if (arts[i].score <= tinrc.score_limit_kill) { if (arts[i].status == ART_UNREAD) diff -Nurp tin-1.7.3/src/getline.c tin-1.7.4/src/getline.c --- tin-1.7.3/src/getline.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/getline.c Mon Feb 23 11:45:48 2004 @@ -3,7 +3,7 @@ * Module : getline.c * Author : Chris Thewalt & Iain Lea * Created : 1991-11-09 - * Updated : 2003-08-03 + * Updated : 2004-02-23 * Notes : emacs style line editing input package. * Copyright : (c) Copyright 1991-99 by Chris Thewalt & Iain Lea * Permission to use, copy, modify, and distribute this @@ -66,7 +66,6 @@ static t_bool is_passwd; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ static void gl_del(int loc); static void gl_fixup(int change, int cursor); -static void gl_redraw(void); static void gl_newline(int w); static void gl_kill(void); static void gl_kill_back_word(void); @@ -100,6 +99,8 @@ tin_getline( char *buf = gl_buf; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + input_context = cGetline; + is_passwd = passwd; set_xclick_off(); @@ -227,6 +228,7 @@ tin_getline( break; default: + input_context = cNone; return (char *) 0; } break; @@ -237,6 +239,7 @@ tin_getline( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) wcstombs(buf, gl_buf, BUF_SIZE - 1); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + input_context = cNone; return buf; case CTRL_A: @@ -254,6 +257,7 @@ tin_getline( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) wcstombs(buf, gl_buf, BUF_SIZE - 1); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + input_context = cNone; return buf; } else gl_del(0); @@ -314,6 +318,7 @@ tin_getline( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) wcstombs(buf, gl_buf, BUF_SIZE - 1); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + input_context = cNone; return buf; } @@ -493,15 +498,21 @@ gl_kill_back_word( /* * emit a newline, reset and redraw prompt and current input line */ -static void +void gl_redraw( void) { - if (gl_init_done == -1) { + if (gl_init_done == -1) { /* terminal */ my_fputc('\n', stdout); my_fputs(gl_prompt, stdout); gl_pos = 0; gl_fixup(0, BUF_SIZE); + } else if (gl_init_done == 0) { /* screen */ + clear_message(); + my_fputs(gl_prompt, stdout); + gl_pos = 0; + gl_fixup(0, BUF_SIZE); + cursoron(); } } diff -Nurp tin-1.7.3/src/global.c tin-1.7.4/src/global.c --- tin-1.7.3/src/global.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/global.c Sun Dec 28 15:17:49 2003 @@ -6,7 +6,7 @@ * Updated : 2000-01-05 * Notes : Generic nagivation and key handling routines * - * Copyright (c) 1999-2003 Jason Faultless + * Copyright (c) 1999-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/group.c tin-1.7.4/src/group.c --- tin-1.7.3/src/group.c Fri Dec 19 15:37:34 2003 +++ tin-1.7.4/src/group.c Mon Feb 23 11:08:32 2004 @@ -3,10 +3,10 @@ * Module : group.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-12-19 + * Updated : 2004-02-21 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,10 +61,6 @@ */ struct t_group *curr_group; -static const char *spaces = "XXXX"; -static int len_from; -static int len_subj; - /* * Local prototypes */ @@ -177,15 +173,16 @@ group_page( /* * update index file. quit group level if user aborts indexing */ - if (!index_group(group)) + if (!index_group(group)) { + curr_group = NULL; return GRP_RETSELECT; + } /* * Position 'grpmenu.curr' accordingly */ pos_first_unread_thread(); - set_subj_from_size(cCOLS); clear_note_area(); if (group->attribute->auto_select) { @@ -401,7 +398,8 @@ group_page( break; case iKeyGroupToggleSubjDisplay: /* toggle display of subject & subj/author */ - toggle_subject_from(); + if (++curr_group->attribute->show_author > SHOW_FROM_BOTH) + curr_group->attribute->show_author = SHOW_FROM_NONE; show_group_page(); break; @@ -468,7 +466,6 @@ group_page( n = tinrc.sort_article_type; if ((change_config_file(group) == NO_FILTERING) && n != tinrc.sort_article_type) make_threads(group, TRUE); - set_subj_from_size(cCOLS); grpmenu.curr = find_new_pos(old_top, old_artnum, grpmenu.curr); show_group_page(); break; @@ -806,11 +803,15 @@ group_page( case iKeyGroupSelPattern: /* select matching patterns */ { char pat[128]; + char *prompt; struct regex_cache cache = { NULL, NULL }; - snprintf(mesg, sizeof(mesg), _(txt_select_pattern), tinrc.default_select_pattern); - if (!(prompt_string_default(mesg, tinrc.default_select_pattern, _(txt_info_no_previous_expression), HIST_SELECT_PATTERN))) + prompt = fmt_string(_(txt_select_pattern), tinrc.default_select_pattern); + if (!(prompt_string_default(prompt, tinrc.default_select_pattern, _(txt_info_no_previous_expression), HIST_SELECT_PATTERN))) { + free(prompt); break; + } + free(prompt); if (STRCMPEQ(tinrc.default_select_pattern, "*")) { /* all */ if (tinrc.wildcard) @@ -894,6 +895,8 @@ group_page( art_close(&pgart); /* Close any open art */ + curr_group = NULL; + return ret_code; } @@ -936,7 +939,6 @@ show_group_page( info_message(_(txt_end_of_arts)); draw_subject_arrow(); - } @@ -1100,60 +1102,6 @@ mark_screen( } -void -set_subj_from_size( - int num_cols) -{ - int show_author; - int max_from; - int max_subj; - - /* - * This function is called early during startup when we only have - * very limited information loaded. - */ - show_author = ((selmenu.max && CURR_GROUP.attribute) ? CURR_GROUP.attribute->show_author : tinrc.show_author); - max_subj = ((show_author == SHOW_FROM_BOTH) ? ((num_cols / 2) - 4): ((num_cols / 2) + 3)); - max_from = (num_cols - max_subj) - 17; - - if (show_author != SHOW_FROM_BOTH) { - if (max_from > 25) { - max_subj += max_from - 25; - max_from = 25; - } - } - - if (show_author != SHOW_FROM_NONE) { - len_from = max_from - BLANK_GROUP_COLS; - len_subj = max_subj; - spaces = " "; - } else { - len_from = 0; - len_subj = (max_subj + max_from + 2) - BLANK_GROUP_COLS; - spaces = ""; - } - - /* which information should be displayed? */ - if (CURR_GROUP.attribute && CURR_GROUP.attribute->show_info == SHOW_INFO_NOTHING) - len_subj += 11; - else if (CURR_GROUP.attribute && CURR_GROUP.attribute->show_info == SHOW_INFO_LINES) - len_subj += 6; - else if (CURR_GROUP.attribute && CURR_GROUP.attribute->show_info == SHOW_INFO_SCORE) - len_subj += 5; -} - - -void -toggle_subject_from( - void) -{ - if (++curr_group->attribute->show_author > SHOW_FROM_BOTH) - curr_group->attribute->show_author = SHOW_FROM_NONE; - - set_subj_from_size(cCOLS); -} - - /* * Builds the correct header for multipart messages when sorting via * THREAD_MULTI. @@ -1195,12 +1143,15 @@ static void build_sline( int i) { + const char *spaces = "XXXX"; char from[HEADER_LEN]; char new_resps[8]; char art_cnt[10]; char arts_sub[255]; int respnum; int n, j; + int len_from; + int len_subj; struct t_art_stat sbuf; char *buffer; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) @@ -1211,6 +1162,48 @@ build_sline( wchar_t tmp_from[HEADER_LEN], tmp_from2[HEADER_LEN]; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + /* set len_from and len_subj */ + { + int max_from; + int max_subj; + int num_cols = cCOLS - 1; + + max_subj = ((curr_group->attribute->show_author == SHOW_FROM_BOTH) ? ((num_cols / 2) - 4): ((num_cols / 2) + 3)); + max_from = (num_cols - max_subj) - 17; + + if (curr_group->attribute->show_author != SHOW_FROM_BOTH) { + if (max_from > 25) { + max_subj += max_from - 25; + max_from = 25; + } + } + + if (curr_group->attribute->show_author != SHOW_FROM_NONE) { + len_from = max_from - BLANK_GROUP_COLS; + len_subj = max_subj; + spaces = " "; + } else { + len_from = 0; + len_subj = (max_subj + max_from + 2) - BLANK_GROUP_COLS; + spaces = ""; + } + + /* which information should be displayed? */ + switch (curr_group->attribute->show_info) { + case SHOW_INFO_NOTHING: + len_subj += 11; + break; + + case SHOW_INFO_LINES: + len_subj += 6; + break; + + case SHOW_INFO_SCORE: + len_subj += 5; + break; + } + } + #ifdef USE_CURSES /* * Allocate line buffer @@ -1283,6 +1276,13 @@ build_sline( else strncpy(arts_sub, arts[j].subject, sizeof(arts_sub) - 1); +#if defined(CHARSET_CONVERSION) || defined(HAVE_UNICODE_NORMALIZATION) + if (IS_LOCAL_CHARSET("UTF-8")) { + utf8_valid(from); + utf8_valid(arts_sub); + } +#endif /* CHARSET_CONVERSION || HAVE_UNICODE_NORMALIZATION */ + #ifndef USE_CURSES buffer = screen[INDEX2SNUM(i)].col; #endif /* !USE_CURSES */ @@ -1701,6 +1701,7 @@ mark_thd_read( case iKeyQuit: /* cancel operation */ case iKeyAbort: return; + /* NOTREACHED */ break; } diff -Nurp tin-1.7.3/src/hashstr.c tin-1.7.4/src/hashstr.c --- tin-1.7.3/src/hashstr.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/hashstr.c Sun Dec 28 15:18:23 2003 @@ -6,7 +6,7 @@ * Updated : 2003-09-19 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * diff -Nurp tin-1.7.3/src/header.c tin-1.7.4/src/header.c --- tin-1.7.3/src/header.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/header.c Sun Dec 28 15:18:31 2003 @@ -5,7 +5,7 @@ * Created : 1997-03-10 * Updated : 2003-09-19 * - * Copyright (c) 1997-2003 Urs Janssen + * Copyright (c) 1997-2004 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/help.c tin-1.7.4/src/help.c --- tin-1.7.3/src/help.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/help.c Mon Feb 23 11:08:43 2004 @@ -3,10 +3,10 @@ * Module : help.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-05-15 + * Updated : 2004-02-21 * Notes : * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -152,11 +152,11 @@ static t_help_page group_help_page[] = { { txt_help_group_first_thread, iKeyFirstPage }, { txt_help_group_last_thread, iKeyLastPage }, { txt_help_group_thread_by_num, 0 }, - { txt_help_group_goto_group, iKeyGroupGoto }, + { txt_help_select_goto_group, iKeyGroupGoto }, { txt_help_group_next, iKeyGroupNextGroup }, { txt_help_group_prev, iKeyGroupPrevGroup }, - { txt_help_group_next_unread_art, iKeyGroupNextUnreadArt }, - { txt_help_group_prev_unread_art, iKeyGroupPrevUnreadArt }, + { txt_help_article_next_unread, iKeyGroupNextUnreadArt }, + { txt_help_article_prev_unread, iKeyGroupPrevUnreadArt }, { txt_help_global_last_art, iKeyLastViewed }, { txt_help_global_lookup_art, iKeyLookupMessage }, { txt_help_group_list_thread, iKeyGroupListThd }, @@ -172,7 +172,7 @@ static t_help_page group_help_page[] = { { txt_help_title_disp, 0 }, { txt_help_group_toggle_read_articles, iKeyGroupToggleReadUnread }, { txt_help_global_toggle_info_line, iKeyToggleInfoLastLine }, - { txt_help_group_toggle_subj_display, iKeyGroupToggleSubjDisplay }, + { txt_help_global_toggle_subj_display, iKeyGroupToggleSubjDisplay }, { txt_help_global_toggle_inverse_video, iKeyToggleInverseVideo }, #ifdef HAVE_COLOR { txt_help_global_toggle_color, iKeyToggleColor }, @@ -183,12 +183,12 @@ static t_help_page group_help_page[] = { { txt_help_group_toggle_getart_limit, iKeyGroupToggleGetartLimit }, { txt_help_empty_line, 0 }, { txt_help_title_ops, 0 }, - { txt_help_group_read_article, iKeyGroupReadBasenote }, - { txt_help_group_next_unread_article, iKeyGroupNextUnreadArtOrGrp }, + { txt_help_thread_read_article, iKeyGroupReadBasenote }, + { txt_help_article_next_unread, iKeyGroupNextUnreadArtOrGrp }, { txt_help_global_post, iKeyPost }, { txt_help_global_post_postponed, iKeyPostponed2 }, { txt_help_global_post_postponed, iKeyPostponed }, - { txt_help_group_repost, iKeyGroupRepost }, + { txt_help_article_repost, iKeyGroupRepost }, { txt_help_empty_line, 0 }, { txt_help_global_article_range, iKeySetRange }, { txt_help_empty_line, 0 }, @@ -272,7 +272,7 @@ static t_help_page thread_help_page[] = { txt_help_empty_line, 0 }, { txt_help_title_disp, 0 }, { txt_help_global_toggle_info_line, iKeyToggleInfoLastLine }, - { txt_help_thread_toggle_subj_display, iKeyThreadToggleSubjDisplay }, + { txt_help_global_toggle_subj_display, iKeyThreadToggleSubjDisplay }, { txt_help_global_toggle_inverse_video, iKeyToggleInverseVideo }, #ifdef HAVE_COLOR { txt_help_global_toggle_color, iKeyToggleColor }, @@ -280,7 +280,7 @@ static t_help_page thread_help_page[] = { txt_help_empty_line, 0 }, { txt_help_title_ops, 0 }, { txt_help_thread_read_article, iKeyThreadReadArt }, - { txt_help_article_read_next_unread, iKeyThreadReadNextArtOrThread }, + { txt_help_article_next_unread, iKeyThreadReadNextArtOrThread }, { txt_help_global_post, iKeyPost }, { txt_help_global_post_postponed, iKeyPostponed2 }, { txt_help_global_post_postponed, iKeyPostponed }, @@ -342,7 +342,7 @@ static t_help_page page_help_page[] = { { txt_help_empty_line, 0 }, { txt_help_article_by_num, 0 }, { txt_help_article_next_thread, iKeyPageNextThd }, - { txt_help_article_read_next_unread, iKeyPageNextUnread }, + { txt_help_article_next_unread, iKeyPageNextUnread }, { txt_help_article_next, iKeyPageNextArt }, { txt_help_article_next_unread, iKeyPageNextUnreadArt }, { txt_help_article_prev, iKeyPagePrevArt }, diff -Nurp tin-1.7.3/src/inews.c tin-1.7.4/src/inews.c --- tin-1.7.3/src/inews.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/inews.c Sun Dec 28 15:18:51 2003 @@ -6,7 +6,7 @@ * Updated : 2003-10-12 * Notes : NNTP built in version of inews * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/init.c tin-1.7.4/src/init.c --- tin-1.7.3/src/init.c Wed Dec 17 19:13:18 2003 +++ tin-1.7.4/src/init.c Wed Jan 7 11:39:53 2004 @@ -3,10 +3,10 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-12-17 + * Updated : 2004-01-07 * Notes : * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -82,7 +82,6 @@ char domain_name[MAXHOSTNAMELEN]; char global_attributes_file[PATH_LEN]; char global_config_file[PATH_LEN]; char homedir[PATH_LEN]; -char host_name[MAXHOSTNAMELEN]; char index_maildir[PATH_LEN]; char index_newsdir[PATH_LEN]; /* directory for private overview data */ char index_savedir[PATH_LEN]; @@ -95,7 +94,6 @@ char local_newsgroups_file[PATH_LEN]; /* char local_newsrctable_file[PATH_LEN]; char lock_file[PATH_LEN]; /* contains name of index lock file */ char filter_file[PATH_LEN]; -char mail_active_file[PATH_LEN]; char mail_news_user[LEN]; /* mail new news to this user address */ char mailbox[PATH_LEN]; /* system mailbox for each user */ char mailer[PATH_LEN]; /* mail program */ @@ -114,6 +112,7 @@ char tin_progname[PATH_LEN]; /* program char txt_help_bug_report[LEN]; /* address to send bug reports to */ char userid[PATH_LEN]; #ifdef HAVE_MH_MAIL_HANDLING + char mail_active_file[PATH_LEN]; char mailgroups_file[PATH_LEN]; #endif /* HAVE_MH_MAIL_HANDLING */ #ifndef NNTP_ONLY @@ -135,7 +134,6 @@ int num_headers_to_not_display; /* num int system_status; int xmouse, xrow, xcol; /* xterm button pressing information */ -mode_t real_umask; pid_t process_id; /* Useful to have around for .suffixes */ t_bool batch_mode; /* update index files only mode */ @@ -419,6 +417,8 @@ struct t_config tinrc = { #endif /* HAVE_UNICODE_NORMALIZATION */ }; +static mode_t real_umask; + #ifdef HAVE_COLOR # define DFT_FORE -1 @@ -506,7 +506,6 @@ init_selfinfo( struct stat sb; struct passwd *myentry; - host_name[0] = '\0'; domain_name[0] = '\0'; #if defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) @@ -518,9 +517,6 @@ init_selfinfo( } #endif /* HAVE_SYS_UTSNAME_H && HAVE_UNAME */ - if ((cptr = get_host_name()) != NULL) - strcpy(host_name, cptr); - #ifdef DOMAIN_NAME if ((cptr = get_domain_name()) != NULL) strcpy(domain_name, cptr); @@ -528,7 +524,7 @@ init_selfinfo( #ifdef HAVE_GETHOSTBYNAME if (domain_name[0] == '\0') { - cptr = ((host_name[0] == '\0') ? get_fqdn((char *) 0) : get_fqdn(host_name)); + cptr = get_fqdn(get_host_name()); if (cptr != (char *) 0) strcpy(domain_name, cptr); } @@ -778,7 +774,9 @@ init_selfinfo( joinpath(local_input_history_file, rcdir, INPUT_HISTORY_FILE); joinpath(local_newsrctable_file, rcdir, NEWSRCTABLE_FILE); joinpath(local_newsgroups_file, rcdir, NEWSGROUPS_FILE); +#ifdef HAVE_MH_MAIL_HANDLING joinpath(mail_active_file, rcdir, ACTIVE_MAIL_FILE); +#endif /* HAVE_MH_MAIL_HANDLING */ #ifdef VMS joinpath(mailbox, DEFAULT_MAILBOX, "MAIL.TXT"); #else diff -Nurp tin-1.7.3/src/joinpath.c tin-1.7.4/src/joinpath.c --- tin-1.7.3/src/joinpath.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/joinpath.c Tue Jan 20 15:21:00 2004 @@ -1,12 +1,12 @@ /* * Project : tin - a Usenet reader * Module : joinpath.c - * Author : Thomas Dickey + * Author : Thomas Dickey * Created : 1997-01-10 * Updated : 2003-09-19 * Notes : * - * Copyright (c) 1997-2003 Thomas Dickey + * Copyright (c) 1997-2004 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/keymap.c tin-1.7.4/src/keymap.c --- tin-1.7.3/src/keymap.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/keymap.c Sun Dec 28 15:19:19 2003 @@ -6,7 +6,7 @@ * Updated : 2003-05-14 * Notes : This file contains key mapping routines and variables. * - * Copyright (c) 2000-2003 Dirk Nimmich + * Copyright (c) 2000-2004 Dirk Nimmich * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/lang.c tin-1.7.4/src/lang.c --- tin-1.7.3/src/lang.c Tue Dec 9 09:46:19 2003 +++ tin-1.7.4/src/lang.c Mon Feb 23 11:08:53 2004 @@ -3,10 +3,10 @@ * Module : lang.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-12-09 + * Updated : 2004-02-21 * Notes : * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -94,7 +94,7 @@ constext txt_base_article_range[] = N_(" 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_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"); @@ -280,7 +280,7 @@ constext txt_help_article_autokill[] = N 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"); constext txt_help_article_by_num[] = N_("0 - 9\t display article by number in current thread"); -constext txt_help_article_cancel[] = N_("cancel (delete) current article; must have been posted by you"); +constext txt_help_article_cancel[] = N_("cancel (delete) or supersede (overwrite) current article"); constext txt_help_article_edit[] = N_("edit article (mail-groups only)"); constext txt_help_article_first_in_thread[] = N_("display first article in current thread"); constext txt_help_article_first_page[] = N_("display first page of article"); @@ -299,7 +299,6 @@ constext txt_help_article_prev_unread[] constext txt_help_article_quick_kill[] = N_("quickly kill an article using defaults"); constext txt_help_article_quick_select[] = N_("quickly auto-select (hot) an article using defaults"); constext txt_help_article_quit_to_select_level[] = N_("return to group selection level"); -constext txt_help_article_read_next_unread[] = N_("display next unread article"); constext txt_help_article_reply[] = N_("reply through mail to author"); constext txt_help_article_reply_no_quote[] = N_("reply through mail (don't copy text) to author"); constext txt_help_article_reply_with_header[] = N_("reply through mail to author quoting complete headers"); @@ -346,11 +345,11 @@ constext txt_help_global_tag[] = N_("tag 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"); +constext txt_help_global_toggle_subj_display[] = N_("cycle the display of authors email address, real name, both or neither"); constext txt_help_global_version[] = N_("show version information"); constext txt_help_group_catchup[] = N_("mark all articles as read and return to group selection menu"); constext txt_help_group_catchup_next[] = N_("mark all articles as read and enter next group with unread articles"); constext txt_help_group_first_thread[] = N_("choose first thread in list"); -constext txt_help_group_goto_group[] = N_("choose group by name"); constext txt_help_group_last_thread[] = N_("choose last thread in list"); constext txt_help_group_list_thread[] = N_("list articles within current thread (bring up Thread sub-menu)"); constext txt_help_group_mark_article_unread[] = N_("mark article as unread"); @@ -358,12 +357,7 @@ constext txt_help_group_mark_thread_read constext txt_help_group_mark_thread_unread[] = N_("mark thread as unread"); constext txt_help_group_mark_unsel_art_read[] = N_("toggle display of all/selected articles"); constext txt_help_group_next[] = N_("display next group"); -constext txt_help_group_next_unread_art[] = N_("display next unread article"); -constext txt_help_group_next_unread_article[] = N_("display next unread article"); constext txt_help_group_prev[] = N_("display previous group"); -constext txt_help_group_prev_unread_art[] = N_("display previous unread article"); -constext txt_help_group_read_article[] = N_("read chosen article"); -constext txt_help_group_repost[] = N_("repost chosen article to another group"); constext txt_help_group_reverse_thread_selection[] = N_("toggle all selections (all articles)"); constext txt_help_group_select_all[] = N_("select group (make \"hot\")"); constext txt_help_group_select_thread[] = N_("select thread"); @@ -373,7 +367,6 @@ constext txt_help_group_tag_parts[] = N_ constext txt_help_group_thread_by_num[] = N_("0 - 9\t choose thread by number"); constext txt_help_group_toggle_getart_limit[] = N_("toggle limit number of articles to get, and reload"); constext txt_help_group_toggle_read_articles[] = N_("toggle display of all/unread articles"); -constext txt_help_group_toggle_subj_display[] = N_("cycle the display of authors email address, real name, both or neither"); constext txt_help_group_toggle_thread_selection[] = N_("toggle selection of thread"); constext txt_help_group_toggle_threading[] = N_("cycle through threading options available"); constext txt_help_group_undo_thread_selection[] = N_("undo all selections (all articles)"); @@ -411,7 +404,6 @@ constext txt_help_thread_first_article[] constext txt_help_thread_last_article[] = N_("choose last article in list"); constext txt_help_thread_mark_article_read[] = N_("mark article or tagged articles as read and move cursor to next unread article"); constext txt_help_thread_read_article[] = N_("read chosen article"); -constext txt_help_thread_toggle_subj_display[] = N_("cycle the display of authors email address, real name, both or neither"); constext txt_help_title_disp[] = N_("Display properties\n------------------"); constext txt_help_title_misc[] = N_("Miscellaneous\n-------------"); constext txt_help_title_navi[] = N_("Moving around\n-------------"); @@ -491,7 +483,7 @@ constext txt_marked_as_unread[] = N_("%s constext txt_marked_tagged_arts_as_read[] = N_("Marked %d of %d tagged %s as read"); constext txt_mark_arts_read[] = N_("Mark all articles as read%s?"); constext txt_mark_art_read_tagged_current[] = N_("Mark %s=tagged articles, %s=current article, %s=quit: "); -constext txt_mark_group_read[] = N_("Mark group %.*s as read?"); +constext txt_mark_group_read[] = N_("Mark group %s as read?"); constext txt_mark_thread_read[] = N_("Mark thread as read%s?"); constext txt_mark_thread_read_tagged_current[] = N_("Mark %s=tagged articles/threads, %s=current thread, %s=quit: "); constext txt_matching_cmd_line_groups[] = N_("Matching %s groups..."); @@ -577,7 +569,7 @@ constext txt_post_processing_finished[] constext txt_post_subject[] = N_("Post subject [%s]> "); 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_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_prefix_untagged[] = N_("Untagged %s"); @@ -590,7 +582,7 @@ constext txt_prompt_see_postponed[] = N_ 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?"); -constext txt_quit_cancel[] = N_("%s=edit cancel message, %s=quit, %s=delete (cancel) [%%.*s]: "); +constext txt_quit_cancel[] = N_("%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: "); constext txt_quit_despite_tags[] = N_("You have tagged articles in this group - quit anyway?"); constext txt_quit_edit_postpone[] = N_("%s=quit, %s=edit, %s=postpone: "); constext txt_quit_edit_save_kill[] = N_("%s=quit %s=edit %s=save kill description: "); @@ -679,7 +671,7 @@ constext txt_subscribe_pattern[] = N_("E constext txt_subscribed_num_groups[] = N_("subscribed to %d groups"); constext txt_subscribed_to[] = N_("Subscribed to %s"); constext txt_subscribing[] = N_("Subscribing... "); -constext txt_supersede_article[] = N_("Repost or supersede article(s) [%%.*s]? (%s/%s/%s): "); +constext txt_supersede_article[] = N_("Repost or supersede article(s) [%%s]? (%s/%s/%s): "); 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"); @@ -887,27 +879,27 @@ Warning: Posting is in %s and contains c 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]: "); + 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]: "); + 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]: "); + 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]: "); + 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_UNIX - constext txt_copyright_notice[] = "%s (c) Copyright 1991-2003 Iain Lea."; + constext txt_copyright_notice[] = "%s (c) Copyright 1991-2004 Iain Lea."; #endif /* M_UNIX */ #ifdef NNTP_ABLE @@ -959,7 +951,7 @@ Tin will try to use XHDR XREF instead (s #endif /* NNTP_INEWS */ #ifdef VMS - constext txt_copyright_notice[] = "%s (c) Copyright 1991-2003 Iain Lea & Tod McQuillin & other."; + constext txt_copyright_notice[] = "%s (c) Copyright 1991-2004 Iain Lea & Tod McQuillin & other."; #endif /* VMS */ #ifndef DISABLE_PRINTING diff -Nurp tin-1.7.3/src/langinfo.c tin-1.7.4/src/langinfo.c --- tin-1.7.3/src/langinfo.c Sun Dec 7 16:19:31 2003 +++ tin-1.7.4/src/langinfo.c Tue Jan 20 15:21:00 2004 @@ -51,7 +51,7 @@ static char buf[16]; -char * +const char * tin_nl_langinfo( nl_item item) { @@ -117,7 +117,7 @@ tin_nl_langinfo( return C_CODESET; } # else -char * +const char * tin_nl_langinfo( nl_item item) { diff -Nurp tin-1.7.3/src/list.c tin-1.7.4/src/list.c --- tin-1.7.3/src/list.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/list.c Sun Dec 28 15:19:39 2003 @@ -6,7 +6,7 @@ * Updated : 2002-05-13 * Notes : Low level functions handling the active[] list and its group_hash index * - * Copyright (c) 1993-2003 Iain Lea + * Copyright (c) 1993-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/lock.c tin-1.7.4/src/lock.c --- tin-1.7.3/src/lock.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/lock.c Sun Dec 28 15:19:49 2003 @@ -6,7 +6,7 @@ * Updated : 2003-05-16 * Notes : * - * Copyright (c) 1998-2003 Urs Janssen + * Copyright (c) 1998-2004 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/mail.c tin-1.7.4/src/mail.c --- tin-1.7.3/src/mail.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/mail.c Sun Dec 28 15:19:57 2003 @@ -6,7 +6,7 @@ * Updated : 2003-11-18 * Notes : Mail handling routines for creating pseudo newsgroups * - * Copyright (c) 1992-2003 Iain Lea + * Copyright (c) 1992-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/main.c tin-1.7.4/src/main.c --- tin-1.7.3/src/main.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/main.c Mon Jan 12 19:56:58 2004 @@ -3,10 +3,10 @@ * Module : main.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-11-18 + * Updated : 2004-01-12 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -209,7 +209,7 @@ main( } #endif /* DEBUG_NEWSRC */ - if (!batch_mode) { + if (!(batch_mode || post_postponed_and_exit)) { /* * Read user specific keybindings and input history */ @@ -328,7 +328,7 @@ main( * Check/start if any new/unread articles */ if (check_any_unread) - exit(check_start_save_any_news(CHECK_ANY_NEWS, catchup)); + tin_done(check_start_save_any_news(CHECK_ANY_NEWS, catchup)); if (start_any_unread) { batch_mode = TRUE; /* Suppress some unwanted on-screen garbage */ @@ -434,7 +434,7 @@ read_cmd_line_options( break; case 'c': - /* TODO: should -c enter batch-mode? */ + batch_mode = TRUE; catchup = TRUE; break; @@ -511,6 +511,10 @@ read_cmd_line_options( case 'o': /* post postponed articles & exit */ #ifndef NO_POSTING + /* + * TODO: autoposting currently does some screen output, so we + * can't set batch_mode + */ post_postponed_and_exit = TRUE; check_for_new_newsgroups = FALSE; #else diff -Nurp tin-1.7.3/src/makecfg.c tin-1.7.4/src/makecfg.c --- tin-1.7.3/src/makecfg.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/makecfg.c Sun Dec 28 15:20:23 2003 @@ -6,7 +6,7 @@ * Updated : 2001-11-10 * Notes : #defines and structs for config.c * - * Copyright (c) 1997-2003 Thomas E. Dickey + * Copyright (c) 1997-2004 Thomas E. Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/memory.c tin-1.7.4/src/memory.c --- tin-1.7.3/src/memory.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/memory.c Sun Dec 28 15:20:32 2003 @@ -6,7 +6,7 @@ * Updated : 2003-10-12 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/mimetypes.c tin-1.7.4/src/mimetypes.c --- tin-1.7.3/src/mimetypes.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/mimetypes.c Sun Dec 28 15:20:43 2003 @@ -6,7 +6,7 @@ * Updated : 2003-08-26 * Notes : mime.types handling * - * Copyright (c) 2000-2003 Jason Faultless + * Copyright (c) 2000-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/misc.c tin-1.7.4/src/misc.c --- tin-1.7.3/src/misc.c Tue Dec 9 09:46:30 2003 +++ tin-1.7.4/src/misc.c Wed Feb 4 11:48:33 2004 @@ -3,10 +3,10 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-12-09 + * Updated : 2003-12-28 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -473,13 +473,16 @@ void shell_escape( void) { - char *p; + char *p, *tmp; char shell[LEN]; - snprintf(mesg, sizeof(mesg), _(txt_shell_escape), tinrc.default_shell_command); + tmp = fmt_string(_(txt_shell_escape), tinrc.default_shell_command); - if (!prompt_string(mesg, shell, HIST_SHELL_COMMAND)) + if (!prompt_string(tmp, shell, HIST_SHELL_COMMAND)) { + free(tmp); return; + } + free(tmp); for (p = shell; *p && isspace((int) *p); p++) continue; @@ -492,8 +495,9 @@ shell_escape( } ClearScreen(); - snprintf(mesg, sizeof(mesg), _(txt_shell_command), p); - center_line(0, TRUE, mesg); + tmp = fmt_string(_(txt_shell_command), p); + center_line(0, TRUE, tmp); + free(tmp); MoveCursor(INDEX_TOP, 0); (void) invoke_cmd(p); @@ -1747,6 +1751,13 @@ strfmailer( if (dest == NULL || format == NULL || maxsize == 0) return 0; + /* + * TODO: shouldn't we better check for no % OR format > maxsize? + * as no replacemnt doesn't make sense (hardcoded To, Subject + * and filename) and the resulting string usuly is longer after + * replacemnts were done (nobody uses enough %% to make the + * result shorter than the input). + */ if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) return 0; diff -Nurp tin-1.7.3/src/my_tmpfile.c tin-1.7.4/src/my_tmpfile.c --- tin-1.7.3/src/my_tmpfile.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/my_tmpfile.c Sun Dec 28 15:21:11 2003 @@ -6,7 +6,7 @@ * Updated : 2001-04-23 * Notes : * - * Copyright (c) 2001-2003 Urs Janssen + * Copyright (c) 2001-2004 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/newsrc.c tin-1.7.4/src/newsrc.c --- tin-1.7.3/src/newsrc.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/newsrc.c Sun Dec 28 15:21:20 2003 @@ -6,7 +6,7 @@ * Updated : 2003-11-21 * Notes : ArtCount = (ArtMax - ArtMin) + 1 [could have holes] * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/nntplib.c tin-1.7.4/src/nntplib.c --- tin-1.7.3/src/nntplib.c Thu Dec 11 13:43:48 2003 +++ tin-1.7.4/src/nntplib.c Mon Feb 16 02:20:30 2004 @@ -3,7 +3,7 @@ * Module : nntplib.c * Author : S. Barber & I. Lea * Created : 1991-01-12 - * Updated : 2003-12-11 + * Updated : 2004-02-16 * 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 @@ -29,9 +29,6 @@ # undef VMS #endif /* VMS */ -/* Copy of last NNTP command sent, so we can retry it if needed */ -static char last_put[NNTP_STRLEN]; - char *nntp_server = NULL; constext *xover_cmd = NULL; #ifdef NO_POSTING @@ -43,19 +40,20 @@ constext *xover_cmd = NULL; /* Flag to show whether tin did reconnect in last get_server() */ t_bool reconnected_in_last_get_server = FALSE; -/* Set so we don't reconnect just to QUIT */ -t_bool quitting = FALSE; - static TCP *nntp_rd_fp = NULL; static TCP *nntp_wr_fp = NULL; #ifdef NNTP_ABLE + /* Copy of last NNTP command sent, so we can retry it if needed */ + static char last_put[NNTP_STRLEN]; static constext *xover_cmds = "XOVER"; # if 0 /* currently not used */ static constext *xhdr_cmd = NULL; static constext *xhdr_cmds = "XHDR"; # endif /* 0 */ static t_bool have_list_extensions = FALSE; + /* Set so we don't reconnect just to QUIT */ + static t_bool quitting = FALSE; #endif /* NNTP_ABLE */ /* @@ -223,7 +221,7 @@ server_init( { # ifndef INET6 char temp[256]; - char *service = strncpy(temp, cservice, 255); /* ...calls non-const funcs */ + char *service = strncpy(temp, cservice, sizeof(temp) - 1); /* ...calls non-const funcs */ # endif /* !INET6 */ # ifndef VMS int sockt_rd, sockt_wr; @@ -614,7 +612,7 @@ get_tcp6_socket( { char mymachine[MAXHOSTNAMELEN + 1]; char myport[12]; - int s = -1, err = -1; + int c = -1, s = -1, err = -1; struct addrinfo hints, *res, *res0; snprintf(mymachine, sizeof(mymachine), "%s", machine); @@ -645,7 +643,7 @@ get_tcp6_socket( for (res = res0; res; res = res->ai_next) { if ((s = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) < 0) continue; - if (connect(s, res->ai_addr, res->ai_addrlen) < 0) + if ((c = connect(s, res->ai_addr, res->ai_addrlen)) < 0) close(s); else { err = 0; @@ -655,6 +653,9 @@ get_tcp6_socket( if (res0 != NULL) freeaddrinfo(res0); if (err < 0) { + /* + * TODO: issue a more usefull error-message + */ my_fprintf(stderr, _(txt_error_socket_or_connect_problem)); return -1; } @@ -1297,9 +1298,13 @@ nntp_open( else wait_message(2, _(txt_caching_off)); } +#if 0 } else { - /* TODO: issue warning if old index files found? */ - /* in index_newsdir ? */ + /* + * TODO: issue warning if old index files found? + * in index_newsdir? + */ +#endif /* 0 */ } # if 0 diff -Nurp tin-1.7.3/src/nrctbl.c tin-1.7.4/src/nrctbl.c --- tin-1.7.3/src/nrctbl.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/nrctbl.c Sun Dec 28 15:21:36 2003 @@ -9,7 +9,7 @@ * and the name of the newsrc file for a given * alias of the server. * - * Copyright (c) 1996-2003 Sven Paulus + * Copyright (c) 1996-2004 Sven Paulus * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/page.c tin-1.7.4/src/page.c --- tin-1.7.3/src/page.c Wed Dec 17 19:13:26 2003 +++ tin-1.7.4/src/page.c Mon Feb 23 11:09:03 2004 @@ -3,10 +3,10 @@ * Module : page.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-12-17 + * Updated : 2004-02-21 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -74,8 +74,6 @@ t_openartinfo pgart = /* Global context NULL, NULL, NULL, NULL, }; -int MORE_POS; /* set in set_win_size() */ - int last_resp; /* previous & current article # in arts[] for '-' command */ int this_resp; @@ -870,7 +868,6 @@ return_to_index: XFACE_CLEAR(); if (change_config_file(group) == FILTERING) filter_state = FILTERING; - set_subj_from_size(cCOLS); draw_page(group->name, 0); break; @@ -1038,9 +1035,6 @@ print_message_page( int bytes; size_t i = begin; t_lineinfo *curr; -# if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t wline[LEN]; -# endif /* MULTIBYTE_ABLE && !NO_LOCALE */ for (; i < end; i++) { if (base_line + i >= messagelines) /* ran out of message */ @@ -1052,26 +1046,14 @@ print_message_page( if ((line = tin_fgets(file, FALSE)) == NULL) break; /* ran out of message */ - bytes = strlen(line); -# if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (mbstowcs(wline, line, ARRAY_SIZE(wline) - 1) != (size_t) -1) { - wline[ARRAY_SIZE(wline) - 1] = (wchar_t) '\0'; - if (wcswidth(wline, ARRAY_SIZE(wline) - 1) >= cCOLS) { - wline[cCOLS] = (wint_t) '\0'; - if ((bytes = (int) wcstombs(NULL, wline, 0)) <= 0) - bytes = strlen(line);; - } - } else -# endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - { - if (IS_LOCAL_CHARSET("Big5")) - bytes = 2 * cCOLS; - else { - if ((int) strlen(line) >= cCOLS) - bytes = cCOLS; - } + /* + * use the offsets gained while doing line wrapping to + * determine the correct position to truncate the line + */ + if (base_line + i < messagelines - 1) { /* not last line of message*/ + bytes = (curr + 1)->offset - curr->offset; + line[bytes] = '\0'; } - line[bytes] = '\0'; /* * rotN encoding on body and sig data only @@ -1093,7 +1075,7 @@ print_message_page( #endif /* !USE_CURSES */ MoveCursor(i + scroll_region_top, 0); - draw_pager_line(line, curr->flags); + draw_pager_line(line, curr->flags, show_all_headers); /* * Highlight URL's and mail addresses @@ -1289,7 +1271,8 @@ invoke_metamail( /* This is needed if we are viewing the raw art */ fseek(fp, offset, SEEK_SET); /* goto old position */ - MoveCursor(cLINES, MORE_POS - (5 + BLANK_PAGE_COLS)); + /* FIXME: values do differ for different languages */ + MoveCursor(cLINES, cCOLS - 20 - BLANK_PAGE_COLS); StartInverse(); my_flush(); EndInverse(); @@ -1476,6 +1459,8 @@ draw_page_header( */ strncpy(buf, (note_h->subj ? note_h->subj : arts[this_resp].subject), line_len); buf[line_len - 1] = '\0'; + if (IS_LOCAL_CHARSET("UTF-8")) + utf8_valid(buf); if (mbstowcs(wtmp, buf, line_len) == (size_t) (-1)) wtmp[0] = (wchar_t) '\0'; /* conversion failed */ else @@ -1552,6 +1537,9 @@ draw_page_header( free(p); } + if (IS_LOCAL_CHARSET("UTF-8")) + utf8_valid(buf); + if (mbstowcs(wbuf, buf, line_len) == (size_t) (-1)) line[0] = (wchar_t) '\0'; wstrunc(wbuf, line, line_len, cCOLS - 1); @@ -1573,7 +1561,7 @@ draw_page_header( wtmp[0] = (wchar_t) ' '; wtmp[1] = (wchar_t) '\0'; - while(wcswidth(line, line_len) < i && wcslen(line) < line_len - 1) + while (wcswidth(line, line_len) < i && wcslen(line) < line_len - 1) wcscat(line, wtmp); wcsncat(line, wbuf, line_len - wcslen(line) - 1); } @@ -1810,17 +1798,20 @@ load_article( int new_respnum, struct t_group *group) { - if (read_news_via_nntp) - wait_message(0, _(txt_reading_article)); - #ifdef DEBUG fprintf(stderr, "load_art %s(new=%d, curr=%d)\n", (new_respnum == this_resp) ? "ALREADY OPEN!" : "", new_respnum, this_resp); #endif /* DEBUG */ if (new_respnum != this_resp) { + char *progress_mesg; + int ret; + art_close(&pgart); /* close previously opened art in pager */ - switch (art_open(TRUE, &arts[new_respnum], group, &pgart, TRUE)) { + progress_mesg = my_strdup(_(txt_reading_article)); + ret = art_open(TRUE, &arts[new_respnum], group, &pgart, TRUE, progress_mesg); + free(progress_mesg); + switch (ret) { case ART_UNAVAILABLE: art_mark(group, &arts[new_respnum], ART_READ); wait_message(1, _(txt_art_unavailable)); @@ -1983,7 +1974,6 @@ toggle_raw( if (!pgart.rawl) { /* Already done this for this article? */ char *line; char *p; - int num_chars; long offset; j = 0; @@ -1992,10 +1982,10 @@ toggle_raw( offset = ftell(pgart.raw); while (NULL != (line = tin_fgets(pgart.raw, FALSE))) { + int space; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) int num_bytes; - t_bool is_illegal = TRUE; - wchar_t wline[LEN]; + wchar_t wc; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ pgart.rawl[j].offset = offset; @@ -2006,61 +1996,46 @@ toggle_raw( pgart.rawl = my_realloc(pgart.rawl, sizeof(t_lineinfo) * chunk); } -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if ((size_t) -1 != mbstowcs(wline, line, ARRAY_SIZE(wline) - 1)) { - wline[ARRAY_SIZE(wline) - 1] = (wchar_t) '\0'; - num_chars = wcswidth(wline, ARRAY_SIZE(wline) -1); - is_illegal = FALSE; - } else -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - { - if (IS_LOCAL_CHARSET("Big5")) { - char c; - - num_chars = 0; - p = line; - while ((c = *p++)) { - num_chars++; - if (0 == (c & 0x7f)) /* ASCII char, only 1 byte */ - continue; - if (*p) - p++; /* Big5 char, takes 2 bytes */ - } - } else - num_chars = (int) strlen(line); - } - - if (num_chars <= cCOLS) { - offset = ftell(pgart.raw); - continue; /* line fits on screen, next line */ - } - - /* - * Line exceeds current column width; we need to split - * over several screen lines - */ p = line; while (*p) { - int space = cCOLS; + space = cCOLS - 1; while ((space > 0) && *p) { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (!is_illegal) { - num_bytes = mbtowc(wline, p, MB_CUR_MAX); - if ((space -= wcwidth(wline[0])) < 0) + num_bytes = mbtowc(&wc, p, MB_CUR_MAX); + if (num_bytes != -1 && iswprint(wc)) { + if ((space -= wcwidth(wc)) < 0) break; p += num_bytes; offset += num_bytes; - } else -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - { + } +#else + if (my_isprint((int) *p)) { + space--; p++; offset++; - if (IS_LOCAL_CHARSET("Big5") && ((*p & 0x7f) > 0)) { - p++; /* non-ASCII chars take 2 bytes */ - offset++; - } + } +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + else if (IS_LOCAL_CHARSET("Big5") && (unsigned char) *p >= 0xa1 && (unsigned char) *p <= 0xfe && *(p + 1)) { + /* + * Big5: ASCII chars are handled by the normal code + * check only for 2-byte chars + * TODO: should we also check if the second byte is + * also valid? + */ + p += 2; + offset += 2; space--; + } else { + /* + * the current character can't be displayed print it as + * an octal value (needs 4 columns) see also + * color.c:draw_pager_line() + */ + if ((space -= 4) < 0 ) + break; + offset++; + p++; } } /* diff -Nurp tin-1.7.3/src/parsdate.y tin-1.7.4/src/parsdate.y --- tin-1.7.3/src/parsdate.y Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/parsdate.y Thu Jan 1 18:25:26 2004 @@ -839,7 +839,7 @@ parsedate( yyMonth = tm->tm_mon + 1; yyDay = tm->tm_mday; yyTimezone = now->tzone; - if(tm->tm_isdst) /* Correct timezone offset for DST */ + if (tm->tm_isdst) /* Correct timezone offset for DST */ yyTimezone += DST_OFFSET * 60; yyDSTmode = DSTmaybe; yyHour = 0; diff -Nurp tin-1.7.3/src/pgp.c tin-1.7.4/src/pgp.c --- tin-1.7.3/src/pgp.c Sat Nov 29 22:30:23 2003 +++ tin-1.7.4/src/pgp.c Wed Jan 7 11:38:41 2004 @@ -3,10 +3,10 @@ * Module : pgp.c * Author : Steven J. Madsen * Created : 1995-05-12 - * Updated : 2003-11-24 + * Updated : 2004-01-07 * Notes : PGP support * - * Copyright (c) 1995-2003 Steven J. Madsen + * Copyright (c) 1995-2004 Steven J. Madsen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -280,7 +280,7 @@ pgp_append_public_key( if ((CURR_GROUP.attribute->from) != NULL && strlen(CURR_GROUP.attribute->from)) strip_name(CURR_GROUP.attribute->from, buf); else - snprintf(buf, sizeof(buf), "%s@%s", userid, host_name); + snprintf(buf, sizeof(buf), "%s@%s", userid, BlankIfNull(get_host_name())); snprintf(keyfile, sizeof(keyfile), KEYFILE, TMPDIR, process_id); diff -Nurp tin-1.7.3/src/post.c tin-1.7.4/src/post.c --- tin-1.7.3/src/post.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/post.c Sat Jan 10 04:01:47 2004 @@ -3,10 +3,10 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-11-21 + * Updated : 2004-01-07 * Notes : mail/post/replyto/followup/repost & cancel articles * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -184,6 +184,8 @@ static char prompt_to_send( const char *subject) { + char *smsg; + char option; char buf[LEN]; char keyedit[MAXKEYLEN]; char keyquit[MAXKEYLEN]; @@ -206,8 +208,10 @@ prompt_to_send( #endif /* HAVE_PGP_GPG */ printascii(keysend, map_to_local(iKeyPostSend, &menukeymap.post_send))); - return prompt_slk_response(iKeyPostSend, &menukeymap.post_send, "%s", - sized_message(buf, subject)); + option = prompt_slk_response(iKeyPostSend, &menukeymap.post_send, "%s", + sized_message(&smsg, buf, subject)); + free(smsg); + return option; } @@ -1577,6 +1581,7 @@ post_article_loop: printascii(keypost, map_to_local(iKeyPostPost3, &menukeymap.post_post)), printascii(keypostpone, map_to_local(iKeyPostPostpone, &menukeymap.post_post))); } else { + char *smsg; char buf[LEN]; char keyedit[MAXKEYLEN], keypost[MAXKEYLEN]; char keypostpone[MAXKEYLEN], keyquit[MAXKEYLEN]; @@ -1603,8 +1608,9 @@ post_article_loop: /* Superfluous force_command stuff not used in current code */ ch = ( /* force_command ? ch_default : */ prompt_slk_response(ch, - &menukeymap.post_post, "%s", sized_message(buf, + &menukeymap.post_post, "%s", sized_message(&smsg, buf, "" /* TODO: was note_h.subj */ ))); + free(smsg); } } @@ -1767,12 +1773,14 @@ check_moderated( } if (group->moderated == 'm') { - snprintf(mesg, sizeof(mesg), _(txt_group_is_moderated), groupname); - if (prompt_yn(cLINES, mesg, TRUE) != 1) { + char *prompt = fmt_string(_(txt_group_is_moderated), groupname); + if (prompt_yn(cLINES, prompt, TRUE) != 1) { /* Raw(FALSE); */ error_message(failmsg); + free(prompt); return NULL; } + free(prompt); } } while ((groupname = strtok(NULL, ",")) != NULL); @@ -1799,14 +1807,18 @@ create_normal_article_headers( FILE *fp; char from_name[HEADER_LEN]; char tmp[HEADER_LEN]; + char *prompt; /* Get subject for posting article - Limit the display if needed */ strunc(tinrc.default_post_subject, tmp, sizeof(tmp), DISPLAY_SUBJECT_LEN); - snprintf(mesg, sizeof(mesg), _(txt_post_subject), tmp); + prompt = fmt_string(_(txt_post_subject), tmp); - if (!(prompt_string_default(mesg, tinrc.default_post_subject, _(txt_no_subject), HIST_POST_SUBJECT))) + if (!(prompt_string_default(prompt, tinrc.default_post_subject, _(txt_no_subject), HIST_POST_SUBJECT))) { + free(prompt); return FALSE; + } + free(prompt); if ((fp = fopen(article, "w")) == NULL) { perror_message(_(txt_cannot_open), article); @@ -2102,6 +2114,7 @@ pickup_postponed_articles( return TRUE; if (!all) { + char *smsg; char buf[LEN]; char keyall[MAXKEYLEN], keyno[MAXKEYLEN], keyoverride[MAXKEYLEN]; char keyquit[MAXKEYLEN], keyyes[MAXKEYLEN]; @@ -2114,7 +2127,8 @@ pickup_postponed_articles( printascii(keyquit, map_to_local(iKeyQuit, &menukeymap.post_postpone))); ch = prompt_slk_response(iKeyPromptYes, &menukeymap.post_postpone, - "%s", sized_message(buf, subject)); + "%s", sized_message(&smsg, buf, subject)); + free(smsg); if (ch == iKeyPostponeAll) all = TRUE; @@ -2284,12 +2298,12 @@ is_crosspost( /* - * Widespread news software like INN's nnrpd restricts the size of several - * headers, notably the references header, to 512 characters. Oh well... - * guess that's what son of RFC 1036 calls a "desperate last resort" :-/ - * From TIN's point of view, this could be HEADER_LEN. + * with folding there would not be a length limit, but currently we don't do + * folding and some of our code has a 2048 byte limit. also there are + * several newsservers out there which do have some length limit, so + * shortening to 998 is a good idea. */ -#define MAXREFSIZE 512 +#define MAXREFSIZE 998 /* @@ -2839,22 +2853,24 @@ mail_loop( case iKeyPostSend: case iKeyPostSend2: - { - t_bool confirm = TRUE; + { + t_bool confirm = TRUE; - if (prompt) { - clear_message(); - if (prompt_yn(cLINES, prompt, FALSE) != 1) - confirm = FALSE; - } + if (prompt) { + clear_message(); + if (prompt_yn(cLINES, prompt, FALSE) != 1) + confirm = FALSE; + } - /* TODO: wrap article into message/rfc822? */ - if (confirm && submit_mail_file(filename, group)) { - info_message(_(txt_articles_mailed), 1, _(txt_article_singular)); - return POSTED_OK; + /* TODO: wrap article into message/rfc822? */ + if (confirm && submit_mail_file(filename, group)) { + info_message(_(txt_articles_mailed), 1, _(txt_article_singular)); + return POSTED_OK; + } } - return ret; - } + return ret; + /* NOTREACHED */ + break; default: break; @@ -3289,6 +3305,7 @@ cancel_article( return redraw_screen; #endif /* FORGERY */ } else { + char *smsg; char buff[LEN]; char keycancel[MAXKEYLEN], keyquit[MAXKEYLEN], keysupersede[MAXKEYLEN]; @@ -3298,7 +3315,8 @@ cancel_article( printascii(keyquit, map_to_local(iKeyQuit, &menukeymap.post_delete))); option = prompt_slk_response(option_default, &menukeymap.post_delete, - "%s", sized_message(buff, art->subject)); + "%s", sized_message(&smsg, buff, art->subject)); + free(smsg); switch (option) { case iKeyPostCancel: @@ -3430,6 +3448,7 @@ cancel_article( forever { { + char *smsg; char buff[LEN]; char keycancel[MAXKEYLEN], keyedit[MAXKEYLEN], keyquit[MAXKEYLEN]; @@ -3438,7 +3457,8 @@ cancel_article( printascii(keyquit, map_to_local(iKeyQuit, &menukeymap.post_cancel)), printascii(keycancel, map_to_local(iKeyPostCancel, &menukeymap.post_cancel))); - ch = prompt_slk_response(ch_default, &menukeymap.post_cancel, "%s", sized_message(buff, note_h.subj)); + ch = prompt_slk_response(ch_default, &menukeymap.post_cancel, "%s", sized_message(&smsg, buff, note_h.subj)); + free(smsg); } switch (ch) { @@ -3472,6 +3492,8 @@ cancel_article( unlink(cancel); clear_message(); return redraw_screen; + /* NOTREACHED */ + break; default: break; @@ -3665,6 +3687,7 @@ repost_article( ch = ch_default; if (!force_command) { + char *smsg; char buff[LEN]; char keyedit[MAXKEYLEN], keypost[MAXKEYLEN]; char keypostpone[MAXKEYLEN], keyquit[MAXKEYLEN]; @@ -3690,7 +3713,8 @@ repost_article( printascii(keypostpone, map_to_local(iKeyPostPostpone, &menukeymap.post_post))); ch = prompt_slk_response(ch_default, &menukeymap.post_post, - "%s", sized_message(buff, note_h.subj)); + "%s", sized_message(&smsg, buff, note_h.subj)); + free(smsg); } return (post_loop(POST_REPOST, group, ch, (Superseding ? _(txt_superseding_art) : _(txt_repost_an_article)), art_type, start_line_offset)); } diff -Nurp tin-1.7.3/src/prompt.c tin-1.7.4/src/prompt.c --- tin-1.7.3/src/prompt.c Tue Dec 2 21:18:38 2003 +++ tin-1.7.4/src/prompt.c Mon Feb 9 16:45:31 2004 @@ -3,10 +3,10 @@ * Module : prompt.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-12-02 + * Updated : 2004-02-09 * Notes : * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,15 +56,16 @@ prompt_num( const char *prompt) { char *p; + char tmp[LEN]; int num; clear_message(); - snprintf(mesg, sizeof(mesg), "%c", ch); + snprintf(tmp, sizeof(tmp), "%c", ch); - if ((p = tin_getline(prompt, TRUE, mesg, 0, FALSE, HIST_OTHER)) != NULL) { - strcpy(mesg, p); - num = atoi(mesg); + if ((p = tin_getline(prompt, TRUE, tmp, 0, FALSE, HIST_OTHER)) != NULL) { + STRCPY(tmp, p); + num = atoi(tmp); } else num = -1; @@ -529,24 +530,40 @@ prompt_msgid( /* * Format a message such that it'll fit within the screen width * Useful for fitting long Subjects and newsgroup names into prompts - * TODO: maybe add a '...' to the string to show it was truncated. - * You can use strunc() for it. + * result will contain a pointer to the malloced memory containing the + * sized message */ char * sized_message( + char **result, const char *format, const char *subject) { - /* The formatting info (%.*s) wastes 4 chars, but our prompt needs 1 char */ - int have = cCOLS - strlen(format) + 4 - 1; - int want = strlen(subject); - - if (want > 0 && subject[want - 1] == '\n') - want--; - if (have > want) - have = want; - snprintf(mesg, sizeof(mesg), format, have, subject); - return mesg; + char *buf; + int max_len; +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + wchar_t *wformat; + size_t format_len; + + format_len = mbstowcs(NULL, format, 0); + if (format_len != (size_t) (-1)) { + wformat = my_malloc(sizeof(wchar_t) * (format_len + 1)); + mbstowcs(wformat, format, format_len + 1); + wconvert_to_printable(wformat); + /* The formatting info (%s) wastes 2 chars, but our prompt needs 1 char */ + max_len = cCOLS - wcswidth(wformat, format_len + 1) + 2 - 1; + free(wformat); + } else +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + max_len = cCOLS - strlen(format) + 2 - 1; /* The formatting info (%s) wastes 2 chars, but our prompt needs 1 char */ + + buf = my_malloc(strlen(subject) + 1); + strunc(subject, buf, strlen(subject) + 1, max_len); + + *result = fmt_string(format, buf); + free(buf); + + return *result; } @@ -578,6 +595,30 @@ prompt_slk_response( if ((ch = ReadCh()) == '\r' || ch == '\n') ch = ch_default; + + /* + * TODO: ignore special-keys which are represented as a + * multibyte ESC-seq to avoid interpreting them as 'ESC' only + * like it's done in the ugly code below. + */ +#if 0 + if (ch == ESC) { + switch (get_arrow_key(ch)) { + case KEYMAP_UP: + case KEYMAP_DOWN: + case KEYMAP_LEFT: + case KEYMAP_RIGHT: + case KEYMAP_PAGE_DOWN: + case KEYMAP_PAGE_UP: + case KEYMAP_HOME: + case KEYMAP_END: + ch = '\0'; + + default: + break; + } + } +#endif /* 0 */ } while (!strchr(responses->localkeys, ch)); diff -Nurp tin-1.7.3/src/read.c tin-1.7.4/src/read.c --- tin-1.7.3/src/read.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/read.c Sun Dec 28 15:22:43 2003 @@ -5,7 +5,7 @@ * Created : 1997-04-10 * Updated : 2003-09-19 * - * Copyright (c) 1997-2003 Jason Faultless + * Copyright (c) 1997-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/refs.c tin-1.7.4/src/refs.c --- tin-1.7.3/src/refs.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/refs.c Wed Feb 11 04:15:14 2004 @@ -3,12 +3,12 @@ * Module : refs.c * Author : Jason Faultless * Created : 1996-05-09 - * Updated : 2003-10-03 + * Updated : 2004-02-10 * Notes : Cacheing of message ids / References based threading * Credits : Richard Hodson * hash_msgid, free_msgid * - * Copyright (c) 1996-2003 Jason Faultless + * Copyright (c) 1996-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,6 +61,7 @@ static char *_get_references(struct t_ms static struct t_msgid *add_msgid(int key, const char *msgid, struct t_msgid *newparent); static struct t_msgid *find_next(struct t_msgid *ptr); static struct t_msgid *parse_references(char *r); +static t_bool valid_msgid(const char *msgid); static unsigned int hash_msgid(const char *key); static void add_to_parent(struct t_msgid *ptr); static void build_thread(struct t_msgid *ptr); @@ -177,6 +178,36 @@ add_to_parent( /* + * Checks if Message-ID has valid format + * Returns TRUE if it does, FALSE if it does not + * + * TODO: combine with post.c:damaged_id()? + */ +static t_bool +valid_msgid( + const char *msgid) +{ + size_t mlen = 0; + t_bool at_present = 0; + + if (!msgid || *msgid != '<') + return FALSE; + + while (isascii((unsigned char) *msgid) && isgraph((unsigned char) *msgid) && !iscntrl((unsigned char) *msgid) && *msgid != '>') { + if (*msgid == '@') + at_present = TRUE; + mlen++; + msgid++; + } + + if (!at_present || (*msgid != '>') || mlen <= 2 || *(msgid + 1)) + return FALSE; + + return TRUE; +} + + +/* * Adds or updates a message id in the cache. * We return a ptr to the msgid, whether located or newly created. * @@ -367,11 +398,17 @@ parse_references( * By definition, the head of the thread has no parent */ parent = NULL; + + if (!valid_msgid(ptr)) + return NULL; + current = add_msgid(REF_REF, ptr, parent); while ((ptr = strtok(NULL, REF_SEP)) != NULL) { - parent = current; - current = add_msgid(REF_REF, ptr, parent); + if (valid_msgid(ptr)) { + parent = current; + current = add_msgid(REF_REF, ptr, parent); + } } return current; @@ -874,7 +911,7 @@ void build_references( struct t_group *group) { - char *s, *t; + char *s; int i; struct t_article *art; struct t_msgid *refs; @@ -914,32 +951,45 @@ build_references( * * TODO: do this in a single pass */ - while (((s = strrchr(art->refs, ' ')) != NULL) && (!strcmp(art->msgid, s + 1))) { + + s = art->refs + strlen (art->refs) - 1; + + /* + * Trim trailing blanks + */ + while ((s > art->refs) && ((*s == ' ') || (*s == '\t'))) + *s-- = '\0'; + /* + * Skip over supposed Message-ID + */ + while ((s > art->refs) && (*s != ' ') && (*s != '\t')) + s--; + /* + * Move to Message-ID start + */ + if ((*s == ' ') || (*s == '\t')) + s++; + + if (!strcmp(art->msgid, s)) { /* * Remove circular reference to current article */ - DEBUG_PRINT((dbgfd, "removing circular reference to%s\n", s)); + DEBUG_PRINT((dbgfd, "removing circular reference to: %s\n", s)); *s = '\0'; } - while (((t = strrchr(art->refs, '\t')) != NULL) && (!strcmp(art->msgid, t + 1))) { - /* - * Remove circular reference to current article - */ - DEBUG_PRINT((dbgfd, "removing circular reference to%s\n", t)); - *t = '\0'; - } - if (t > s) - s = t; if (s != NULL) { - art->refptr = add_msgid(MSGID_REF, art->msgid, add_msgid(REF_REF, s + 1, NULL)); + if (valid_msgid(art->msgid)) + art->refptr = add_msgid(MSGID_REF, art->msgid, add_msgid(REF_REF, s, NULL)); *s = '\0'; } else { - art->refptr = add_msgid(MSGID_REF, art->msgid, add_msgid(REF_REF, art->refs, NULL)); + if (valid_msgid(art->msgid)) + art->refptr = add_msgid(MSGID_REF, art->msgid, add_msgid(REF_REF, art->refs, NULL)); FreeAndNull(art->refs); } } else - art->refptr = add_msgid(MSGID_REF, art->msgid, NULL); + if (valid_msgid(art->msgid)) + art->refptr = add_msgid(MSGID_REF, art->msgid, NULL); FreeAndNull(art->msgid); /* Now cached - discard this */ } @@ -961,7 +1011,7 @@ build_references( refs = parse_references(art->refs); - if (art->refptr->parent) + if (art->refptr->parent && valid_msgid(art->refptr->parent->txt)) add_msgid(REF_REF, art->refptr->parent->txt, refs); FreeAndNull(art->refs); diff -Nurp tin-1.7.3/src/regex.c tin-1.7.4/src/regex.c --- tin-1.7.3/src/regex.c Wed Dec 17 19:13:35 2003 +++ tin-1.7.4/src/regex.c Sun Dec 28 15:23:01 2003 @@ -7,7 +7,7 @@ * Notes : Regular expression subroutines * Credits : * - * Copyright (c) 1997-2003 Jason Faultless + * Copyright (c) 1997-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/rfc1524.c tin-1.7.4/src/rfc1524.c --- tin-1.7.3/src/rfc1524.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/rfc1524.c Sun Dec 28 15:23:16 2003 @@ -6,7 +6,7 @@ * Updated : 2002-08-24 * Notes : mailcap parsing as defined in RFC 1524 * - * Copyright (c) 2000-2003 Urs Janssen , Jason Faultless + * Copyright (c) 2000-2004 Urs Janssen , Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/rfc2045.c tin-1.7.4/src/rfc2045.c --- tin-1.7.3/src/rfc2045.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/rfc2045.c Sun Dec 28 15:23:30 2003 @@ -6,7 +6,7 @@ * Updated : 2003-02-01 * Notes : RFC 2045/2047 encoding * - * Copyright (c) 1995-2003 Chris Blum + * Copyright (c) 1995-2004 Chris Blum * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/rfc2046.c tin-1.7.4/src/rfc2046.c --- tin-1.7.3/src/rfc2046.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/rfc2046.c Mon Jan 5 04:00:57 2004 @@ -3,10 +3,10 @@ * Module : rfc2046.c * Author : Jason Faultless * Created : 2000-02-18 - * Updated : 2003-11-18 + * Updated : 2004-01-05 * Notes : RFC 2046 MIME article parsing * - * Copyright (c) 2000-2003 Jason Faultless + * Copyright (c) 2000-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,6 +69,7 @@ static void progress(int line_count); * Local variables */ static int art_lines = 0; /* lines in art on spool */ +static char *progress_mesg = NULL; /* message progress() should display */ #define PARAM_SEP "; \n" /* default parameters for Content-Type */ @@ -82,8 +83,8 @@ static void progress( int line_count) { - if (line_count && line_count % MODULO_COUNT_NUM == 0) - show_progress(mesg, line_count, art_lines); + if (progress_mesg != NULL && line_count && line_count % MODULO_COUNT_NUM == 0) + show_progress(progress_mesg, line_count, art_lines); } @@ -1148,7 +1149,8 @@ art_open( struct t_article *art, struct t_group *group, t_openartinfo *artinfo, - t_bool show_progress_meter) + t_bool show_progress_meter, + char *pmesg) { FILE *fp; @@ -1161,8 +1163,12 @@ art_open( fprintf(stderr, "art_open(%p)\n", (void *) artinfo); #endif /* DEBUG_ART */ - if (parse_rfc2045_article(fp, art->line_count, artinfo, show_progress_meter) != 0) + progress_mesg = pmesg; + if (parse_rfc2045_article(fp, art->line_count, artinfo, show_progress_meter) != 0) { + progress_mesg = NULL; return ART_ABORT; + } + progress_mesg = NULL; /* * TODO: compare art->msgid and artinfo->hdr.messageid and issue a diff -Nurp tin-1.7.3/src/rfc2047.c tin-1.7.4/src/rfc2047.c --- tin-1.7.3/src/rfc2047.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/rfc2047.c Sun Dec 28 15:23:51 2003 @@ -6,7 +6,7 @@ * Updated : 2003-04-08 * Notes : MIME header encoding/decoding stuff * - * Copyright (c) 1995-2003 Chris Blum + * Copyright (c) 1995-2004 Chris Blum * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/save.c tin-1.7.4/src/save.c --- tin-1.7.3/src/save.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/save.c Mon Jan 12 20:05:27 2004 @@ -3,10 +3,10 @@ * Module : save.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-08-26 + * Updated : 2004-01-12 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -203,10 +203,8 @@ check_start_save_any_news( art_count++; if (arts[j].score >= tinrc.score_select) hot_count++; -#if 0 /* is "-cZ" usefull? */ if (catchup) art_mark(group, &arts[j], ART_READ); -#endif /* 0 */ break; case START_ANY_NEWS: @@ -288,7 +286,10 @@ check_start_save_any_news( switch (function) { case CHECK_ANY_NEWS: - if (unread_news) + /* + * TODO: shall we return 2 or 0 in the -cZ case? + */ + if (unread_news && !catchup) return 2; else { if (verbose) diff -Nurp tin-1.7.3/src/screen.c tin-1.7.4/src/screen.c --- tin-1.7.3/src/screen.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/screen.c Mon Jan 5 04:01:51 2004 @@ -3,10 +3,10 @@ * Module : screen.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-09-12 + * Updated : 2004-01-05 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,13 +42,17 @@ # include "tcurses.h" #endif /* !TCURSES_H */ -char mesg[LEN]; - #ifndef USE_CURSES struct t_screen *screen; #endif /* !USE_CURSES */ /* + * Local prototypes + */ +static char *fmt_message(const char *fmt, va_list ap); + + +/* * Move the cursor to the lower-left of the screen, where it won't be annoying */ void @@ -61,6 +65,34 @@ stow_cursor( /* + * helper for the varius *_message() functions + * returns a pointer to an allocated buffer with the formated message + * must be freed if not needed anymore + */ +static char * +fmt_message( + const char *fmt, + va_list ap) +{ + char *msg; +#ifdef HAVE_VASPRINTF + int n; + + if ((n = vasprintf(&msg, fmt, ap)) == -1) /* something went wrong */ +#endif /* HAVE_VASPRINTF */ + { + size_t size = LEN; + + msg = my_malloc(size); + /* TODO: realloc msg if necessary */ + vsnprintf(msg, size, fmt, ap); + } + + return msg; +} + + +/* * Centre a formatted colour message at the bottom of the screen */ void @@ -68,6 +100,7 @@ info_message( const char *fmt, ...) { + char *buf; va_list ap; va_start(ap, fmt); @@ -77,9 +110,9 @@ info_message( fcol(tinrc.col_message); #endif /* HAVE_COLOR */ - vsnprintf(mesg, sizeof(mesg), fmt, ap); - - center_line(cLINES, FALSE, mesg); /* center the message at screen bottom */ + buf = fmt_message(fmt, ap); + center_line(cLINES, FALSE, buf); /* center the message at screen bottom */ + free(buf); #ifdef HAVE_COLOR fcol(tinrc.col_normal); @@ -99,6 +132,7 @@ wait_message( const char *fmt, ...) { + char *buf; va_list ap; va_start(ap, fmt); @@ -108,8 +142,9 @@ wait_message( fcol(tinrc.col_message); #endif /* HAVE_COLOR */ - vsnprintf(mesg, sizeof(mesg), fmt, ap); - my_fputs(mesg, stdout); + buf = fmt_message(fmt, ap); + my_fputs(buf, stdout); + free(buf); #ifdef HAVE_COLOR fcol(tinrc.col_normal); @@ -132,16 +167,18 @@ error_message( const char *fmt, ...) { + char *buf; va_list ap; va_start(ap, fmt); errno = 0; clear_message(); - vsnprintf(mesg, sizeof(mesg), fmt, ap); - my_fputs(mesg, stderr); /* don't use my_fprintf() here due to %format chars */ + buf = fmt_message(fmt, ap); + my_fputs(buf, stderr); /* don't use my_fprintf() here due to %format chars */ my_fflush(stderr); + free(buf); if (cmd_line) { my_fputc('\n', stderr); @@ -165,7 +202,7 @@ perror_message( const char *fmt, ...) { - char buf[LEN]; + char *buf; int err; va_list ap; @@ -174,11 +211,12 @@ perror_message( clear_message(); - vsnprintf(buf, sizeof(buf), fmt, ap); + if ((buf = fmt_message(fmt, ap)) != NULL) { + error_message("%s: Error: %s", buf, strerror(err)); + free(buf); + } va_end(ap); - - error_message("%s: Error: %s", buf, strerror(err)); return; } diff -Nurp tin-1.7.3/src/search.c tin-1.7.4/src/search.c --- tin-1.7.3/src/search.c Wed Dec 17 19:13:42 2003 +++ tin-1.7.4/src/search.c Mon Jan 5 04:01:09 2004 @@ -3,10 +3,10 @@ * Module : search.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-12-17 + * Updated : 2004-01-05 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -53,11 +53,6 @@ static int search_group(t_bool forward, /* - * The search function may place error text into mesg - */ -#define MATCH_MSG (mesg[0] ? mesg : _(txt_no_match)) - -/* * Kludge to maintain some internal state for body search */ static int total_cnt = 0, curr_cnt = 0; @@ -254,7 +249,7 @@ search_active( FreeAndNull(search_regex.re); FreeAndNull(search_regex.extra); } - info_message(MATCH_MSG); + info_message(_(txt_no_match)); return -1; } @@ -271,10 +266,11 @@ body_search( int i, char *searchbuf) { + static char msg[LEN]; /* show_progress needs a constant message buffer */ char *line, *tmp; t_openartinfo artinfo; - switch (art_open(TRUE, &arts[i], curr_group, &artinfo, FALSE)) { + switch (art_open(TRUE, &arts[i], curr_group, &artinfo, FALSE, NULL)) { case ART_ABORT: /* User 'q'uit */ art_close(&artinfo); return -1; @@ -295,8 +291,8 @@ body_search( /* * Now search the body */ - snprintf(mesg, sizeof(mesg), _(txt_searching_body), ++curr_cnt, total_cnt); - show_progress(mesg, curr_cnt, total_cnt); + snprintf(msg, sizeof(msg), _(txt_searching_body), ++curr_cnt, total_cnt); + show_progress(msg, curr_cnt, total_cnt); while ((tmp = tin_fgets(artinfo.cooked, FALSE)) != NULL) { #ifdef HAVE_UNICODE_NORMALIZATION if (IS_LOCAL_CHARSET("UTF-8")) @@ -337,7 +333,7 @@ body_search( } art_close(&artinfo); -/* info_message(MATCH_MSG); */ +/* info_message(_(txt_no_match)); */ return 0; } diff -Nurp tin-1.7.3/src/select.c tin-1.7.4/src/select.c --- tin-1.7.3/src/select.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/select.c Mon Jan 5 04:00:26 2004 @@ -3,10 +3,10 @@ * Module : select.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-07-20 + * Updated : 2004-01-05 * Notes : * - * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -492,11 +492,15 @@ selection_page( break; } grp_mark_unread(&CURR_GROUP); - if (CURR_GROUP.newsrc.num_unread) - strcpy(mesg, tin_ltoa(CURR_GROUP.newsrc.num_unread, 5)); - else - strcpy(mesg, " "); - mark_screen(SELECT_LEVEL, selmenu.curr - selmenu.first, 9, mesg); + { + char tmp[6]; + + if (CURR_GROUP.newsrc.num_unread) + STRCPY(tmp, tin_ltoa(CURR_GROUP.newsrc.num_unread, 5)); + else + STRCPY(tmp, " "); + mark_screen(SELECT_LEVEL, selmenu.curr - selmenu.first, 9, tmp); + } break; default: @@ -755,11 +759,15 @@ choose_new_group( void) { int idx; + char *prompt; - snprintf(mesg, sizeof(mesg), _(txt_newsgroup), tinrc.default_goto_group); + prompt = fmt_string(_(txt_newsgroup), tinrc.default_goto_group); - if (!(prompt_string_default(mesg, tinrc.default_goto_group, "", HIST_GOTO_GROUP))) + if (!(prompt_string_default(prompt, tinrc.default_goto_group, "", HIST_GOTO_GROUP))) { + free(prompt); return -1; + } + free(prompt); str_trim(tinrc.default_goto_group); @@ -895,7 +903,9 @@ catchup_group( struct t_group *group, t_bool goto_next_unread_group) { - if ((!TINRC_CONFIRM_ACTION) || prompt_yn(cLINES, sized_message(_(txt_mark_group_read), group->name), TRUE) == 1) { + char *smsg; + + if ((!TINRC_CONFIRM_ACTION) || prompt_yn(cLINES, sized_message(&smsg, _(txt_mark_group_read), group->name), TRUE) == 1) { grp_mark_read(group, NULL); mark_screen(SELECT_LEVEL, selmenu.curr - selmenu.first, 9, " "); @@ -904,6 +914,7 @@ catchup_group( else move_down(); } + free(smsg); } diff -Nurp tin-1.7.3/src/sigfile.c tin-1.7.4/src/sigfile.c --- tin-1.7.3/src/sigfile.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/sigfile.c Sun Dec 28 15:24:33 2003 @@ -6,7 +6,7 @@ * Updated : 2003-09-19 * Notes : Generate random signature for posting/mailing etc. * - * Copyright (c) 1992-2003 Mike Gleason + * Copyright (c) 1992-2004 Mike Gleason * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/signal.c tin-1.7.4/src/signal.c --- tin-1.7.3/src/signal.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/signal.c Mon Feb 23 19:22:03 2004 @@ -3,10 +3,10 @@ * Module : signal.c * Author : I.Lea * Created : 1991-04-01 - * Updated : 2003-09-29 + * Updated : 2004-02-23 * Notes : signal handlers for different modes and window resizing * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -106,6 +106,7 @@ static void _CDECL signal_handler(SIG_AR #endif /* SIGTSTP */ int signal_context = cMain; +int input_context = cNone; int need_resize = cNo; /* * # lines of non-static data available for display @@ -157,9 +158,9 @@ static const struct { # ifdef SIGTERM { SIGTERM, "SIGTERM" }, /* termination */ # endif /* SIGTERM */ -# ifdef SIGWINCH +# if defined(SIGWINCH) && !(defined(USE_CURSES) && defined(KEY_RESIZE)) { SIGWINCH, "SIGWINCH" }, /* window-size change */ -# endif /* SIGWINCH */ +# endif /* SIGWINCH && !(USE_CURSES && KEY_RESIZE) */ }; #endif /* !__LCLINT__ */ @@ -209,9 +210,9 @@ allow_resize( if (!allow) sa.sa_flags |= SA_RESTART; # endif /* SA_RESTART */ -# ifdef SIGWINCH +# if defined(SIGWINCH) && !(defined(USE_CURSES) && defined(KEY_RESIZE)) sigaction(SIGWINCH, &sa, &osa); -# endif /* SIGWINCH */ +# endif /* SIGWINCH && !(USE_CURSES && KEY_RESIZE) */ # ifdef SIGTSTP sigaction(SIGTSTP, &sa, &osa); # endif /* SIGTSTP */ @@ -297,6 +298,13 @@ handle_resize( case cMain: break; } + switch (input_context) { + case cGetline: + gl_redraw(); + break; + default: + break; + } my_fflush(stdout); #endif /* SIGWINCH || SIGTSTP */ } @@ -446,9 +454,9 @@ set_signal_catcher( sigdisp(SIGTSTP, flag ? signal_handler : SIG_DFL); #endif /* SIGTSTP */ -#ifdef SIGWINCH +#if defined(SIGWINCH) && !(defined(USE_CURSES) && defined(KEY_RESIZE)) sigdisp(SIGWINCH, flag ? signal_handler : SIG_DFL); -#endif /* SIGWINCH */ +#endif /* SIGWINCH && !(USE_CURSES && KEY_RESIZE) */ } @@ -540,10 +548,6 @@ set_win_size( #endif /* HAVE_XCURSES */ - set_subj_from_size(*num_cols); - - /* FIXME: values do differ for different languages */ - MORE_POS = *num_cols - 15; set_noteslines(*num_lines); return (*num_lines != old_lines || *num_cols != old_cols); } diff -Nurp tin-1.7.3/src/strftime.c tin-1.7.4/src/strftime.c --- tin-1.7.3/src/strftime.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/strftime.c Sun Dec 28 15:24:56 2003 @@ -12,7 +12,7 @@ * tm = localtime(&secs); * num = strftime(buf, sizeof(buf), "%a %d-%m-%y %H:%M:%S", tm); * - * Copyright (c) 1991-2003 Arnold Robbins + * Copyright (c) 1991-2004 Arnold Robbins * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/string.c tin-1.7.4/src/string.c --- tin-1.7.3/src/string.c Tue Dec 9 10:03:03 2003 +++ tin-1.7.4/src/string.c Sun Dec 28 15:41:51 2003 @@ -3,10 +3,10 @@ * Module : string.c * Author : Urs Janssen * Created : 1997-01-20 - * Updated : 2003-12-09 + * Updated : 2003-12-28 * Notes : * - * Copyright (c) 1997-2003 Urs Janssen + * Copyright (c) 1997-2004 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -919,3 +919,34 @@ normalize( # endif /* HAVE_LIBICUUC */ } #endif /* HAVE_UNICODE_NORMALIZATION */ + + +/* + * returns a pointer to allocated buffer containing the formated string + * must be freed if not needed anymore + */ +char * +fmt_string( + const char *fmt, + ...) { + char *str; +#ifdef HAVE_VASPRINTF + int n; +#endif /* HAVE_VASPRINTF */ + va_list ap; + + va_start(ap, fmt); +#ifdef HAVE_VASPRINTF + if ((n = vasprintf(&str, fmt, ap)) == -1) /* something went wrong */ +#endif /* HAVE_VASPRINTF */ + { + size_t size = LEN; + + str = my_malloc(size); + /* TODO: realloc str if necessary */ + vsnprintf(str, size, fmt, ap); + } + va_end(ap); + + return str; +} diff -Nurp tin-1.7.3/src/tags.c tin-1.7.4/src/tags.c --- tin-1.7.3/src/tags.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/tags.c Sun Dec 28 15:11:06 2003 @@ -3,10 +3,10 @@ * Module : tags.c * Author : Jason Faultless * Created : 1999-12-06 - * Updated : 2003-07-19 + * Updated : 2003-12-28 * Notes : Split out from other modules * - * Copyright (c) 1999-2003 Jason Faultless + * Copyright (c) 1999-2004 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -354,6 +354,7 @@ set_range( int curr) { char *range; + char *prompt; int artnum; int i; int depth; @@ -380,10 +381,13 @@ set_range( #if 0 error_message("Min=[%d] Max=[%d] Cur=[%d] DefRng=[%s]", min, max, curr, range); #endif /* 0 */ - snprintf(mesg, sizeof(mesg), _(txt_enter_range), range); + prompt = fmt_string(_(txt_enter_range), range); - if (!(prompt_string_default(mesg, range, _(txt_range_invalid), HIST_OTHER))) + if (!(prompt_string_default(prompt, range, _(txt_range_invalid), HIST_OTHER))) { + free(prompt); return FALSE; + } + free(prompt); /* * Parse range string diff -Nurp tin-1.7.3/src/tcurses.c tin-1.7.4/src/tcurses.c --- tin-1.7.3/src/tcurses.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/tcurses.c Tue Feb 24 10:46:39 2004 @@ -1,13 +1,13 @@ /* * Project : tin - a Usenet reader * Module : tcurses.c - * Author : Thomas Dickey + * Author : Thomas Dickey * Created : 1997-03-02 - * Updated : 2003-10-15 + * Updated : 2004-02-24 * Notes : This is a set of wrapper functions adapting the termcap * interface of tin to use SVr4 curses (e.g., ncurses). * - * Copyright (c) 1997-2003 Thomas Dickey + * Copyright (c) 1997-2004 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -508,26 +508,27 @@ ReadCh( if (cmd_line) ch = cmdReadCh(); else { -# if 0 again: -# endif /* 0 */ allow_resize(TRUE); -# ifdef KEY_RESIZE - while ((ch = getch()) == KEY_RESIZE) - ; +# if defined(KEY_RESIZE) && defined(USE_CURSES) + if ((ch = getch()) == KEY_RESIZE) + need_resize = cYes; +# if 0 /* Don't use it at the moment as it breaks "redrawing" from prompt_slk_response() */ + if (ch == ERR) + goto again; +# endif /* 0 */ # else ch = getch(); -# endif /* KEY_RESIZE */ +# endif /* KEY_RESIZE && USE_CURSES */ allow_resize(FALSE); if (need_resize) { handle_resize((need_resize == cRedraw) ? TRUE : FALSE); -# if 0 - if (need_resize == cRedraw) { - need_resize = cNo; - goto again; /* Shouldn't fall through if doing resize */ - } -# endif /* 0 */ need_resize = cNo; +# if defined(KEY_RESIZE) && defined(USE_CURSES) + if (ch == KEY_RESIZE) + goto again; +# endif /* KEY_RESIZE && USE_CURSES */ + } if (ch == KEY_BACKSPACE) ch = '\010'; /* fix for Ctrl-H - show headers */ @@ -552,12 +553,23 @@ ReadWch( if (cmd_line) wch = cmdReadWch(); else { +again: allow_resize(TRUE); -# ifdef HAVE_NCURSESW /* TODO: catch KEY_RESIZE */ +# ifdef HAVE_NCURSESW +# if defined(KEY_RESIZE) && defined(USE_CURSES) + if ((res = get_wch(&wch)) == KEY_CODE_YES && wch == KEY_RESIZE) + need_resize = cYes; + if (res == ERR) + goto again; +# else res = get_wch(&wch); +# endif /* KEY_RESIZE && USE_CURSES */ # else wch = (wint_t) getch(); + if (wch == (wint_t) ERR) + goto again; + if (wch < KEY_MIN) { /* read in the multibyte sequence */ char *mbs = my_malloc(MB_CUR_MAX + 1); @@ -580,13 +592,22 @@ ReadWch( return WEOF; /* error */ else res = OK; - } else + } else { res = KEY_CODE_YES; +# if defined(KEY_RESIZE) && defined(USE_CURSES) + if (wch == KEY_RESIZE) + need_resize = cYes; +# endif /* KEY_RESIZE && USE_CURSES */ + } # endif /* HAVE_NCURSESW */ allow_resize(FALSE); if (need_resize) { handle_resize((need_resize == cRedraw) ? TRUE : FALSE); need_resize = cNo; +# if defined(KEY_RESIZE) && defined(USE_CURSES) + if (wch == KEY_RESIZE) + goto again; +# endif /* KEY_RESIZE && USE_CURSES */ } if (wch == KEY_BACKSPACE) wch = (wint_t) '\010'; /* fix for Ctrl-H - show headers */ @@ -620,9 +641,9 @@ my_printf( vprintf(fmt, ap); if (flag) Raw(TRUE); - } else { - vwprintw(stdscr, (char *) fmt, ap); - } + } else + vwprintw(stdscr, fmt, ap); + va_end(ap); } @@ -644,9 +665,9 @@ my_fprintf( vfprintf(stream, fmt, ap); if (flag) Raw(TRUE); - } else { - vwprintw(stdscr, (char *) fmt, ap); - } + } else + vwprintw(stdscr, fmt, ap); + va_end(ap); } diff -Nurp tin-1.7.3/src/thread.c tin-1.7.4/src/thread.c --- tin-1.7.3/src/thread.c Fri Dec 19 15:38:32 2003 +++ tin-1.7.4/src/thread.c Mon Feb 23 11:09:28 2004 @@ -3,10 +3,10 @@ * Module : thread.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-12-19 + * Updated : 2004-02-21 * Notes : * - * Copyright (c) 1991-2003 Iain Lea + * Copyright (c) 1991-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -230,12 +230,18 @@ build_tline( ; if (!(ptr && arts[ptr->article].subject == art->subject)) { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (mbstowcs(wtmp2, art->subject, ARRAY_SIZE(wtmp2) - 1) != (size_t) -1) { + char *buf = my_strdup(art->subject); + + if (IS_LOCAL_CHARSET("UTF-8")) + utf8_valid(buf); + + if (mbstowcs(wtmp2, buf, ARRAY_SIZE(wtmp2) - 1) != (size_t) -1) { wtmp2[ARRAY_SIZE(wtmp2) - 1] = (wchar_t) '\0'; wcspart(wtmp, wtmp2, gap, ARRAY_SIZE(wtmp), TRUE); if (wcstombs(tmp, wtmp, sizeof(tmp) - 1) != (size_t) -1) strncat(buffer, tmp, cCOLS * MB_CUR_MAX - len - 1); } + free(buf); } #else strncat(buffer, art->subject, gap); @@ -267,6 +273,9 @@ build_tline( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) get_author(TRUE, art, tmp, sizeof(tmp) - 1); + if (IS_LOCAL_CHARSET("UTF-8")) + utf8_valid(tmp); + if (mbstowcs(wtmp2, tmp, ARRAY_SIZE(wtmp2) - 1) != (size_t) -1) { wtmp2[ARRAY_SIZE(wtmp2) - 1] = (wchar_t) '\0'; wcspart(wtmp, wtmp2, len_from, ARRAY_SIZE(wtmp), TRUE); @@ -608,7 +617,8 @@ thread_page( case iKeyThreadToggleSubjDisplay: /* toggle display of subject & subj/author */ if (show_subject) { - toggle_subject_from(); + if (++curr_group->attribute->show_author > SHOW_FROM_BOTH) + curr_group->attribute->show_author = SHOW_FROM_NONE; show_thread_page(); } break; @@ -802,6 +812,7 @@ show_thread_page( void) { int i, art; + char *title; signal_context = cThread; currmenu = &thdmenu; @@ -818,16 +829,11 @@ show_thread_page( show_subject = ((arts[thread_respnum].archive != NULL) || (curr_group->attribute->thread_arts == THREAD_REFS) || (curr_group->attribute->thread_arts == THREAD_BOTH)); if (show_subject) - snprintf(mesg, sizeof(mesg), _(txt_stp_list_thread), grpmenu.curr + 1, grpmenu.max); + title = fmt_string(_(txt_stp_list_thread), grpmenu.curr + 1, grpmenu.max); else - snprintf(mesg, sizeof(mesg), _(txt_stp_thread), cCOLS - 23, arts[thread_respnum].subject); - - /* - * Slight misuse of the 'mesg' buffer here. We need to clear it so that progress messages - * are displayed correctly - */ - show_title(mesg); - mesg[0] = '\0'; + title = fmt_string(_(txt_stp_thread), cCOLS - 23, arts[thread_respnum].subject); + show_title(title); + free(title); MoveCursor(INDEX_TOP, 0); @@ -1549,6 +1555,7 @@ mark_art_read( case iKeyQuit: /* cancel operation */ case iKeyAbort: return 0; + /* NOTREACHED */ break; } diff -Nurp tin-1.7.3/src/tincfg.tbl tin-1.7.4/src/tincfg.tbl --- tin-1.7.3/src/tincfg.tbl Tue Dec 9 09:47:37 2003 +++ tin-1.7.4/src/tincfg.tbl Tue Dec 30 13:43:10 2003 @@ -5,7 +5,7 @@ ; Updated : 2003-12-09 ; Notes : #defines and structs for config.c ; -; Copyright (c) 1996-2003 Thomas E. Dickey +; Copyright (c) 1996-2004 Thomas E. Dickey ; All rights reserved. ; ; Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/trace.c tin-1.7.4/src/trace.c --- tin-1.7.3/src/trace.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/trace.c Tue Jan 20 15:21:00 2004 @@ -1,12 +1,12 @@ /* * Project : tin - a Usenet reader * Module : trace.c - * Author : Thomas Dickey + * Author : Thomas Dickey * Created : 1997-03-22 * Updated : 2001-07-22 * Notes : debugging support via TRACE macro. * - * Copyright (c) 1997-2003 Thomas Dickey + * Copyright (c) 1997-2004 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/version.c tin-1.7.4/src/version.c --- tin-1.7.3/src/version.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/version.c Mon Jan 12 11:50:06 2004 @@ -6,7 +6,7 @@ * Updated : 2003-08-21 * Notes : * - * Copyright (c) 2003 Urs Janssen + * Copyright (c) 2003-2004 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,15 +46,15 @@ #endif /* !MENUKEYS_H */ /* - * line is the entire line we should check - * skip must be the leading portion of the version line not including the - * version number (which must be a dotted triple) - * verson is the version number (dotted triple) we expect to match + * line is the entire line we should check + * skip must be the leading portion of the version line not including the + * version number (which must be a dotted triple) + * version is the version number (dotted triple) we expect to match * * returns RC_IGNORE 1st args dotted triple matches 3rd arg * RC_UPGRADE 1st args dotted triple is older than 3rd arg * RC_DOWNGRADE 1st args dotted triple is newer than 3rd arg - * RC_ERROR 3rd args is not a dotted triple (usage error) + * RC_ERROR 3rd arg is not a dotted triple (usage error) */ int check_upgrade( diff -Nurp tin-1.7.3/src/wildmat.c tin-1.7.4/src/wildmat.c --- tin-1.7.3/src/wildmat.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/wildmat.c Sun Dec 28 15:03:05 2003 @@ -143,8 +143,6 @@ wildmat( return TRUE; #endif /* OPTIMIZE_JUST_STAR */ - mesg[0] = '\0'; - if (icase) { txt = my_strdup(text); str_lwr(txt); @@ -191,8 +189,6 @@ wildmatpos( return TRUE; } #endif /* OPTIMIZE_JUST_STAR */ - - mesg[0] = '\0'; txt = my_strdup(text); if (icase) { diff -Nurp tin-1.7.3/src/xface.c tin-1.7.4/src/xface.c --- tin-1.7.3/src/xface.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/xface.c Sun Dec 28 15:26:14 2003 @@ -6,7 +6,7 @@ * Updated : 2003-06-27 * Notes : * - * Copyright (c) Joshua Crawford & Drazen Kacar + * Copyright (c) 2003-2004 Joshua Crawford & Drazen Kacar * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp tin-1.7.3/src/xref.c tin-1.7.4/src/xref.c --- tin-1.7.3/src/xref.c Sat Nov 29 22:30:24 2003 +++ tin-1.7.4/src/xref.c Sun Dec 28 15:11:47 2003 @@ -3,10 +3,10 @@ * Module : xref.c * Author : I. Lea & H. Brugge * Created : 1993-07-01 - * Updated : 2003-11-18 + * Updated : 2003-12-28 * Notes : * - * Copyright (c) 1993-2003 Iain Lea + * Copyright (c) 1993-2004 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -171,6 +171,9 @@ art_mark_xref_read( char *ptr, c; long artnum; struct t_group *group; +#ifdef DEBUG + char debug_mesg; +#endif /* DEBUG */ #if defined(NNTP_ABLE) && defined(XHDR_XREF) /* xref_supported => xref info was already read in xover record */ @@ -217,15 +220,16 @@ art_mark_xref_read( #ifdef DEBUG if (debug == 3) { - snprintf(mesg, sizeof(mesg), "LOOKUP Xref: [%s:%ld] active=[%s] num_unread=[%ld]", + debug_mesg = fmt_string("LOOKUP Xref: [%s:%ld] active=[%s] num_unread=[%ld]", groupname, artnum, (group ? group->name : ""), (group ? group->newsrc.num_unread : 0)); # ifdef DEBUG_NEWSRC - debug_print_comment(mesg); + debug_print_comment(debug_mesg); debug_print_bitmap(group, NULL); # endif /* DEBUG_NEWSRC */ - error_message(mesg); + error_message(debug_mesg); + free(debug_mesg); } #endif /* DEBUG */ @@ -237,13 +241,14 @@ art_mark_xref_read( group->newsrc.num_unread--; #ifdef DEBUG if (debug == 3) { - snprintf(mesg, sizeof(mesg), "FOUND!Xref: [%s:%ld] marked READ num_unread=[%ld]", + debug_mesg = fmt_string("FOUND!Xref: [%s:%ld] marked READ num_unread=[%ld]", groupname, artnum, group->newsrc.num_unread); # ifdef DEBUG_NEWSRC - debug_print_comment(mesg); + debug_print_comment(debug_mesg); debug_print_bitmap(group, NULL); # endif /* DEBUG_NEWSRC */ - wait_message(2, mesg); + wait_message(2, debug_mesg); + free(debug_mesg); } #endif /* DEBUG */ } diff -Nurp tin-1.7.3/tin.spec tin-1.7.4/tin.spec --- tin-1.7.3/tin.spec Sat Nov 29 22:30:21 2003 +++ tin-1.7.4/tin.spec Fri Dec 26 19:12:01 2003 @@ -1,6 +1,6 @@ Name: tin Summary: tin - an easy-to-use USENET news reader -Version: 1.7.3 +Version: 1.7.4 Release: 1 Copyright: BSD Group: Applications/News diff -Nurp tin-1.7.3/tools/tinews.pl tin-1.7.4/tools/tinews.pl --- tin-1.7.3/tools/tinews.pl Sat Nov 29 22:30:22 2003 +++ tin-1.7.4/tools/tinews.pl Mon Feb 2 00:33:09 2004 @@ -4,7 +4,7 @@ # signs the article and posts it. # # -# Copyright (c) 2002-2003 Urs Janssen , +# Copyright (c) 2002-2004 Urs Janssen , # Marc Brockschmidt # # Redistribution and use in source and binary forms, with or without @@ -32,50 +32,58 @@ # POSSIBILITY OF SUCH DAMAGE. # # -# TODO: - add pgp6 support -# - add debug mode which doesn't dele tmp-files and is verbose +# TODO: - FIXME add debug mode which doesn't delete tmp-files and is verbose +# - add pgp6 support +# - check for ~/.newsauth (and ~/.nntpauth?) and use username/password if found +# - check for /etc/nntpserver (and /etc/news/server) +# - allow config in ~/.tinewsrc +# - add $PGPOPTS, $PGPPATH, $GNUPGHOME support # - cleanup, remove duplicated code -# - turn off echoing if prompting for password -# - check for ~/.newsauth and use username/password if found # # version Number -my $version = "1.1.0"; +my $version = "1.1.6"; -# TODO: put into a "my %config('NNTPServer' => 'news', ... );" array -my $NNTPServer = 'news'; # your NNTP servers name -my $NNTPUser = ''; -my $NNTPPass = ''; -my $PGPSigner = ''; # sign as who? -my $PGPPass = ''; # pgp2 only -my $PathtoPGPPass = ''; # pgp2, pgp5 and gpg +my %config; -my $pgp = '/usr/bin/pgp'; # path to pgp -my $PGPVersion = '2'; # Use 2 for 2.X, 5 for PGP > 2.X and GPG for GPG +$config{'NNTPServer'} = 'news'; # your NNTP servers name +$config{'NNTPPort'} = 119; # NNTP-port +$config{'NNTPUser'} = ''; +$config{'NNTPPass'} = ''; -my $Interactive = 1; # allow interactive usage +$config{'PGPSigner'} = ''; # sign as who? +$config{'PGPPass'} = ''; # pgp2 only +$config{'PathtoPGPPass'}= ''; # pgp2, pgp5 and gpg -my $sendmail = '| /usr/sbin/sendmail -i -t'; # set to '' to disable mail-actions +$config{'pgp'} = '/usr/bin/pgp';# path to pgp +$config{'PGPVersion'} = '2'; # Use 2 for 2.X, 5 for PGP > 2.X and GPG for GPG -my @PGPSignHeaders = ('From', 'Newsgroups', 'Subject', 'Control', +$config{'Interactive'} = "yes"; # allow interactive usage + +$config{'add_signature'}= "yes"; # Add ~/.signature to posting if there is no sig + +$config{'sendmail'} = '| /usr/sbin/sendmail -i -t'; # set to '' to disable mail-actions + +$config{'PGPSignHeaders'} = ['From', 'Newsgroups', 'Subject', 'Control', 'Supersedes', 'Followup-To', 'Date', 'Sender', 'Approved', 'Message-ID', 'Reply-To', 'Cancel-Key', 'Also-Control', - 'Distribution'); -my @PGPorderheaders = ('from', 'newsgroups', 'subject', 'control', + 'Distribution']; +$config{'PGPorderheaders'} = ['from', 'newsgroups', 'subject', 'control', 'supersedes', 'followup-To', 'date', 'organization', 'lines', 'sender', 'approved', 'distribution', 'message-id', 'references', 'reply-to', 'mime-version', 'content-type', 'content-transfer-encoding', 'summary', 'keywords', 'cancel-lock', - 'cancel-key', 'also-control', 'x-pgp', 'user-agent'); + 'cancel-key', 'also-control', 'x-pgp', 'user-agent']; -my $pgptmpf = 'pgptmp'; # temporary file for PGP. +$config{'pgptmpf'} = 'pgptmp'; # temporary file for PGP. -my $pgpheader = 'X-PGP-Sig'; -my $pgpbegin = '-----BEGIN PGP SIGNATURE-----'; # Begin of PGP-Signature -my $pgpend = '-----END PGP SIGNATURE-----'; # End of PGP-Signature +$config{'pgpheader'} = 'X-PGP-Sig'; +$config{'pgpbegin'} = '-----BEGIN PGP SIGNATURE-----'; # Begin of PGP-Signature +$config{'pgpend'} = '-----END PGP SIGNATURE-----'; # End of PGP-Signature ################################################################################ use strict; +use Getopt::Long qw(GetOptions); use Net::NNTP; use Time::Local; use Term::ReadLine; @@ -83,29 +91,105 @@ use Term::ReadLine; my $pname = $0; $pname =~ s#^.*/##; +my %cli_headers; + +$config{'NNTPServer'} = $ENV{'NNTPSERVER'} if ($ENV{'NNTPSERVER'}); +$config{'NNTPPort'} = $ENV{'NNTPPORT'} if ($ENV{'NNTPPORT'}); + +# Get options: +$Getopt::Long::ignorecase=0; +GetOptions('A|V|W|O|no-organization|h|headers' => [], #do nothing + 'debug|D|N' => \$config{'debug'}, #XXX + 'port|p=i' => \$config{'NNTPPort'}, + 'no-sign|X' => \$config{'no_sign'}, + 'no-control|R' => \$config{'no_control'}, + 'no-signature|S' => \$config{'no_signature'}, + 'approved|a=s' => \$config{'approved'}, + 'control|c=s' => \$config{'control'}, + 'distribution|d=s' => \$config{'distribution'}, + 'expires|e=s' => \$config{'expires'}, + 'from|f=s' => \$config{'from'}, + 'followupto|w=s' => \$config{'followup-to'}, + 'newsgroups|n=s' => \$config{'newsgroups'}, + 'replyto|r=s' => \$config{'reply-to'}, + 'subject|t=s' => \$config{'subject'}, + 'references|F=s' => \$config{'references'}, + 'organization|o=s' => \$config{'organization'}, + 'path|x=s' => \$config{'path'}, + 'help|H' => \$config{'help'} +); + +foreach (@ARGV) { + print STDERR "Unknown argument $_."; + usage(); +} + +usage() if($config{'help'}); + my $term = new Term::ReadLine 'tinews'; +my $attribs = $term->Attribs; my $in_header = 1; my (@Header, %Header, @Body, $PGPCommand); -$NNTPServer = $ENV{'NNTPSERVER'} if ($ENV{'NNTPSERVER'}); -$PGPSigner = $ENV{'SIGNER'} if ($ENV{'SIGNER'}); +if (! $config{'no_sign'}) { + $config{'PGPSigner'} = $ENV{'SIGNER'} if ($ENV{'SIGNER'}); -$PathtoPGPPass = $ENV{'PGPPASSFILE'} if ($ENV{'PGPPASSFILE'}); -if ($PathtoPGPPass) { - open (PGPPass, "$PathtoPGPPass") or die ("$0: Can't open $PathtoPGPPass: $!"); - # TODO: ignore any errors if running $Interactive as we can prompt - # the user later? - chomp ($PGPPass = ); - close(PGPPass); -} -if ($PGPVersion eq '2') { - $PGPPass = $ENV{'PGPPASS'} if ($ENV{'PGPPASS'}); + $config{'PathtoPGPPass'} = $ENV{'PGPPASSFILE'} if ($ENV{'PGPPASSFILE'}); + if ($config{'PathtoPGPPass'}) { + open (PGPPass, $config{'PathtoPGPPass'}) or + $config{'Interactive'} && die ("$0: Can't open ".$config{'PathtoPGPPass'}.": $!"); + chomp ($config{'PGPPass'} = ); + close(PGPPass); + } + if ($config{'PGPVersion'} eq '2') { + $config{'PGPPass'} = $ENV{'PGPPASS'} if ($ENV{'PGPPASS'}); + } } # Read the message and split the header readarticle(\%Header, \@Body); +# Add signature if there is none +if (!$config{'no_signature'}) { + if ($config{'add_signature'} && !grep /^-- /, @Body) { + if (-r (glob("~/.signature"))[0]) { + my $l = 0; + push @Body, "-- \n"; + open SIGNATURE, (glob("~/.signature"))[0] or die "Can't open ~/.signature: $!"; + while (){ + die "~/.signature longer than 4 lines!" if (++$l > 4); + push @Body, $_; + } + close SIGNATURE; + } else { + warn "Tried to add ~/.signature, but ~/.signature is not readable"; + } + } +} + +# import headers set in the environment +if (!defined($Header{'reply-to'})) { + if ($ENV{'REPLYTO'}) { + chomp ($Header{'reply-to'} = "Reply-To: " . $ENV{'REPLYTO'}); + $Header{'reply-to'} .= "\n"; + } +} +foreach ('DISTRIBUTION', 'ORGANIZATION') { + if (!defined($Header{lc($_)}) && $ENV{$_}) { + chomp ($Header{lc($_)} = ucfirst($_).": " . $ENV{$_}); + $Header{lc($_)} .= "\n"; + } +} + +# overwrite headers if specified via cmd-line +foreach ('Approved', 'Control', 'Distribution', 'Expires', + 'From', 'Followup-To', 'Newsgroups',' Reply-To', 'Subject', + 'References', 'Organization', 'Path') { + next if (!defined($config{lc($_)})); + chomp ($Header{lc($_)} = $_ . ": " . $config{lc($_)}); + $Header{lc($_)} .= "\n"; +} # verify/add/remove headers foreach ('From', 'Subject') { @@ -119,20 +203,13 @@ if (defined($Header{'user-agent'})) { $Header{'user-agent'} = $Header{'user-agent'}." ".$pname."/".$version."\n"; } -delete $Header{'x-pgp-key'} if (defined($Header{'x-pgp-key'})); +delete $Header{'x-pgp-key'} if (!$config{'no_sign'} && defined($Header{'x-pgp-key'})); -if (!defined($Header{'organization'})) { - if ($ENV{'ORGANIZATION'}) { - chomp ($Header{'organization'} = "Organization: " . $ENV{'ORGANIZATION'}); - $Header{'organization'} .= "\n"; - } -} -if (!defined($Header{'reply-to'})) { - if ($ENV{'REPLYTO'}) { - chomp ($Header{'reply-to'} = "Reply-To: " . $ENV{'REPLYTO'}); - $Header{'reply-to'} .= "\n"; - } +# No control messages allowed when using -R|--no-control +if ($config{'no_control'} and $Header{control}) { + print STDERR "No control messages allowed.\n"; + exit 1; } if (defined($Header{'newsgroups'}) && !defined($Header{'message-id'})) { @@ -151,7 +228,7 @@ if (!defined($Header{'message-id'})) { } # set Posted-And-Mailed if we send a mailcopy to someone else -if ($sendmail && defined($Header{'newsgroups'}) && (defined($Header{'to'}) || defined($Header{'cc'}) || defined($Header{'bcc'}))) { +if ($config{'sendmail'} && defined($Header{'newsgroups'}) && (defined($Header{'to'}) || defined($Header{'cc'}) || defined($Header{'bcc'}))) { foreach ('to', 'bcc', 'cc') { if (defined($Header{$_}) && $Header{$_} ne $Header{'from'}) { $Header{'posted-and-mailed'} = "Posted-And-Mailed: yes\n"; @@ -160,11 +237,13 @@ if ($sendmail && defined($Header{'newsgr } } -if (!$PGPSigner) { - chomp ($PGPSigner = $Header{'from'}); - $PGPSigner =~ s/^[^\s:]+: (.*)/$1/; +if (! $config{'no_sign'}) { + if (!$config{'PGPSigner'}) { + chomp ($config{'PGPSigner'} = $Header{'from'}); + $config{'PGPSigner'} =~ s/^[^\s:]+: (.*)/$1/; + } + $PGPCommand = getpgpcommand($config{'PGPVersion'}); } -$PGPCommand = getpgpcommand($PGPVersion); # (re)move mail-headers my ($To, $Cc, $Bcc, $Newsgroups) = ''; @@ -174,19 +253,27 @@ $Bcc = $Header{'bcc'} if (defined($Heade delete $Header{$_} foreach ('to', 'cc', 'bcc'); $Newsgroups = $Header{'newsgroups'} if (defined($Header{'newsgroups'})); -# sign article -my $SignedMessageR = signarticle(\%Header, \@Body); +my $MessageR = []; + +if ($config{'no_sign'}) { + # don't sign article + push @$MessageR, $Header{$_} for (keys %Header); + push @$MessageR, "\n", @Body; +} else { + # sign article + $MessageR = signarticle(\%Header, \@Body); +} # post article -postarticle($SignedMessageR) if ($Newsgroups); +postarticle($MessageR) if ($Newsgroups); # mail article -if (($To || $Cc || $Bcc) && $sendmail) { - open(MAIL, $sendmail) || die "$!"; - unshift @$SignedMessageR, "$To" if ($To); - unshift @$SignedMessageR, "$Cc" if ($Cc); - unshift @$SignedMessageR, "$Bcc" if ($Bcc); - print(MAIL @$SignedMessageR); +if (($To || $Cc || $Bcc) && $config{'sendmail'}) { + open(MAIL, $config{'sendmail'}) || die "$!"; + unshift @$MessageR, "$To" if ($To); + unshift @$MessageR, "$Cc" if ($Cc); + unshift @$MessageR, "$Bcc" if ($Bcc); + print(MAIL @$MessageR); close(MAIL); } @@ -218,19 +305,6 @@ sub readarticle { } } -#-------- sub askuser -# askuser uses Term::Readline to ask the user a question and returns his -# answer(s). -# -# Receives: -# - $AnsRef: A reference to a scalar which will hold the answer. -# - $Question: A scalar containing the question. -sub askuser { - my ($AnsRef, $Question) = @_; - $$AnsRef = $term->readline($Question); -} - - #-------- sub getdate # getdate generates a date and returns it. # @@ -260,12 +334,13 @@ sub getdate { #-------- sub AuthonNNTP # AuthonNNTP opens the connection to a Server and returns a Net::NNTP-Object. # -# User, Password and Server are defined before as global -# scalars ($NNTPServer, $NNTPUser, $NNTPPass). If no values -# for user or password are defined, the sub will try to -# ask the user (only if $Interactive is != 0). +# User, Password and Server are defined before as elements +# of the global hash %config. If no values for user or password +# are defined, the sub will try to ask the user (only if +# $config{'Interactive'} is != 0). sub AuthonNNTP { - my $Server = Net::NNTP->new($NNTPServer, Reader => 1, Debug => 0) or die "$0: Can't connect to $NNTPServer!\n"; + my $Server = Net::NNTP->new($config{'NNTPServer'}, Reader => 1, Debug => 0, Port => $config{'NNTPPort'}) + or die "$0: Can't connect to ".$config{'NNTPServer'}.":".$config{'NNTPPort'}."!\n"; my $ServerMsg = ""; my $ServerCod = $Server->code(); @@ -278,17 +353,18 @@ sub AuthonNNTP { # read access - try auth if ($ServerCod == 201) { - if ($NNTPPass eq "") { - if ($Interactive) { - askuser(\$NNTPUser, "Your Username at $NNTPServer: "); - askuser(\$NNTPPass, "Password for $NNTPUser at $NNTPServer: "); + if ($config{'NNTPPass'} eq "") { + if ($config{'Interactive'}) { + $config{'NNTPUser'} = $term->readline("Your Username at ".$config{'NNTPServer'}.": "); + $attribs->{redisplay_function} = $attribs->{shadow_redisplay}; + $config{'NNTPPass'} = $term->readline("Password for ".$config{'NNTPUser'}." at ".$config{'NNTPServer'}.": "); } else { $ServerMsg = $Server->message(); $Server->quit(); die ($0.": ".$ServerCod." ".$ServerMsg."\n"); } } - $Server->authinfo($NNTPUser, $NNTPPass); + $Server->authinfo($config{'NNTPUser'}, $config{'NNTPPass'}); $ServerCod = $Server->code(); $ServerMsg = $Server->message(); if ($ServerCod != 281) { # auth failed @@ -300,17 +376,18 @@ sub AuthonNNTP { $Server->post(); $ServerCod = $Server->code(); if ($ServerCod == 480) { - if ($NNTPPass eq "") { - if ($Interactive) { - askuser(\$NNTPUser, "Your Username at $NNTPServer: "); - askuser(\$NNTPPass, "Password for $NNTPUser at $NNTPServer: "); + if ($config{'NNTPPass'} eq "") { + if ($config{'Interactive'}) { + $config{'NNTPUser'} = $term->readline("Your Username at ".$config{'NNTPServer'}.": "); + $attribs->{redisplay_function} = $attribs->{shadow_redisplay}; + $config{'NNTPPass'} = $term->readline("Password for ".$config{'NNTPUser'}." at ".$config{'NNTPServer'}.": "); } else { $ServerMsg = $Server->message(); $Server->quit(); die ($0.": ".$ServerCod." ".$ServerMsg."\n"); } } - $Server->authinfo($NNTPUser, $NNTPPass); + $Server->authinfo($config{'NNTPUser'}, $config{'NNTPPass'}); $Server->post(); } return $Server; @@ -327,26 +404,26 @@ sub getpgpcommand { my $PGPCommand; if ($PGPVersion eq '2') { - if ($PGPPass) { - $PGPCommand = "PGPPASS=\"".$PGPPass."\" ".$pgp." -z -u \"".$PGPSigner."\" +verbose=0 language='en' -saft <".$pgptmpf.".txt >".$pgptmpf.".txt.asc"; - } elsif ($Interactive) { - $PGPCommand = $pgp." -z -u \"".$PGPSigner."\" +verbose=0 language='en' -saft <".$pgptmpf.".txt >".$pgptmpf.".txt.asc"; + if ($config{'PGPPass'}) { + $PGPCommand = "PGPPASS=\"".$config{'PGPPass'}."\" ".$config{'pgp'}." -z -u \"".$config{'PGPSigner'}."\" +verbose=0 language='en' -saft <".$config{'pgptmpf'}.".txt >".$config{'pgptmpf'}.".txt.asc"; + } elsif ($config{'Interactive'}) { + $PGPCommand = $config{'pgp'}." -z -u \"".$config{'PGPSigner'}."\" +verbose=0 language='en' -saft <".$config{'pgptmpf'}.".txt >".$config{'pgptmpf'}.".txt.asc"; } else { die "$0: Passphrase is unknown!\n"; } } elsif ($PGPVersion eq '5') { - if ($PathtoPGPPass) { - $PGPCommand = "PGPPASSFD=42 ".$pgp."s -u \"".$PGPSigner."\" -t --armor -o ".$pgptmpf.".txt.asc -z -f < ".$pgptmpf.".txt 42<".$PathtoPGPPass; - } elsif ($Interactive) { - $PGPCommand = $pgp."s -u \"".$PGPSigner."\" -t --armor -o ".$pgptmpf.".txt.asc -z -f < ".$pgptmpf.".txt"; + if ($config{'PathtoPGPPass'}) { + $PGPCommand = "PGPPASSFD=42 ".$config{'pgp'}."s -u \"".$config{'PGPSigner'}."\" -t --armor -o ".$config{'pgptmpf'}.".txt.asc -z -f < ".$config{'pgptmpf'}.".txt 42<".$config{'PathtoPGPPass'}; + } elsif ($config{'Interactive'}) { + $PGPCommand = $config{'pgp'}."s -u \"".$config{'PGPSigner'}."\" -t --armor -o ".$config{'pgptmpf'}.".txt.asc -z -f < ".$config{'pgptmpf'}.".txt"; } else { die "$0: Passphrase is unknown!\n"; } } elsif ($PGPVersion =~ m/GPG/io) { - if ($PathtoPGPPass) { - $PGPCommand = $pgp." --digest-algo MD5 -a -u \"".$PGPSigner."\" -o ".$pgptmpf.".txt.asc --no-tty --batch --passphrase-fd 42 42<".$PathtoPGPPass." --clearsign ".$pgptmpf.".txt"; - } elsif ($Interactive) { - $PGPCommand = $pgp." --digest-algo MD5 -a -u \"".$PGPSigner."\" -o ".$pgptmpf.".txt.asc --no-secmem-warning --no-batch --clearsign ".$pgptmpf.".txt"; + if ($config{'PathtoPGPPass'}) { + $PGPCommand = $config{'pgp'}." --digest-algo MD5 -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd 42 42<".$config{'PathtoPGPPass'}." --clearsign ".$config{'pgptmpf'}.".txt"; + } elsif ($config{'Interactive'}) { + $PGPCommand = $config{'pgp'}." --digest-algo MD5 -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-secmem-warning --no-batch --clearsign ".$config{'pgptmpf'}.".txt"; } else { die "$0: Passphrase is unknown!\n"; } @@ -396,7 +473,7 @@ sub signarticle { my ($HeaderR, $BodyR) = @_; my (@pgphead, @pgpbody, $pgphead, $pgpbody, $header, $signheaders, @signheaders); - foreach (@PGPSignHeaders) { + foreach (@{$config{'PGPSignHeaders'}}) { if (defined($$HeaderR{lc($_)}) && $$HeaderR{lc($_)} =~ m/^[^\s:]+: .+/o) { push @signheaders, $_; } @@ -405,8 +482,8 @@ sub signarticle { $pgpbody = join ("", @$BodyR); # Delete and create the temporary pgp-Files - unlink "$pgptmpf.txt"; - unlink "$pgptmpf.txt.asc"; + unlink $config{'pgptmpf'}.".txt"; + unlink $config{'pgptmpf'}.".txt.asc"; $signheaders = join(",", @signheaders); $pgphead = "X-Signed-Headers: $signheaders\n"; @@ -416,35 +493,34 @@ sub signarticle { } } - open(FH, ">" . $pgptmpf . ".txt") or die "$0: can't open $pgptmpf: $!\n"; + open(FH, ">" . $config{'pgptmpf'} . ".txt") or die "$0: can't open ".$config{'pgptmpf'}.": $!\n"; print FH $pgphead, "\n", $pgpbody; - print FH "\n" if ($PGPVersion =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify + print FH "\n" if ($config{'PGPVersion'} =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify close(FH) or warn "$0: Couldn't close TMP: $!\n"; # Start PGP, then read the signature; `$PGPCommand`; - open (FH, "<" . $pgptmpf . ".txt.asc") or die "$0: can't open ".$pgptmpf.".txt.asc: $!\n"; - $/ = "$pgpbegin\n"; + open (FH, "<" . $config{'pgptmpf'} . ".txt.asc") or die "$0: can't open ".$config{'pgptmpf'}.".txt.asc: $!\n"; + $/ = $config{'pgpbegin'}."\n"; $_ = ; - unless (m/\Q$pgpbegin\E$/o) { - unlink $pgptmpf . ".txt"; - unlink $pgptmpf . ".txt.asc"; - die "$0: $pgpbegin not found in ".$pgptmpf.".txt.asc\n" + unless (m/\Q$config{'pgpbegin'}\E$/o) { + unlink $config{'pgptmpf'} . ".txt"; + unlink $config{'pgptmpf'} . ".txt.asc"; + die "$0: ".$config{'pgpbegin'}." not found in ".$config{'pgptmpf'}.".txt.asc\n" } - unlink($pgptmpf . ".txt") or warn "$0: Couldn't unlink $pgptmpf.txt: $!\n"; + unlink($config{'pgptmpf'} . ".txt") or warn "$0: Couldn't unlink ".$config{'pgptmpf'}.".txt: $!\n"; $/ = "\n"; $_ = ; unless (m/^Version: (\S+)(?:\s(\S+))?/o) { - unlink $pgptmpf . ".txt"; - unlink $pgptmpf . ".txt.asc"; + unlink $config{'pgptmpf'} . ".txt.asc"; die "$0: didn't find PGP Version line where expected.\n"; } if (defined($2)) { - $$HeaderR{$pgpheader} = $1."-".$2." ".$signheaders; + $$HeaderR{$config{'pgpheader'}} = $1."-".$2." ".$signheaders; } else { - $$HeaderR{$pgpheader} = $1." ".$signheaders; + $$HeaderR{$config{'pgpheader'}} = $1." ".$signheaders; } do { # skip other pgp headers like $_ = ; # "charset:"||"comment:" until empty line @@ -452,25 +528,24 @@ sub signarticle { while () { chomp; - last if /^\Q$pgpend\E$/; - $$HeaderR{$pgpheader} .= "\n\t$_"; + last if /^\Q$config{'pgpend'}\E$/; + $$HeaderR{$config{'pgpheader'}} .= "\n\t$_"; } - $$HeaderR{$pgpheader} .= "\n" unless ($$HeaderR{$pgpheader} =~ /\n$/s); + $$HeaderR{$config{'pgpheader'}} .= "\n" unless ($$HeaderR{$config{'pgpheader'}} =~ /\n$/s); $_ = ; unless (eof(FH)) { - unlink $pgptmpf . ".txt"; - unlink $pgptmpf . ".txt.asc"; - die "$0: unexpected data following $pgpend\n"; + unlink $config{'pgptmpf'} . ".txt.asc"; + die "$0: unexpected data following ".$config{'pgpend'}."\n"; } close(FH); - unlink "$pgptmpf.txt.asc"; + unlink $config{'pgptmpf'} . ".txt.asc"; - my $tmppgpheader = $pgpheader . ": " . $$HeaderR{$pgpheader}; - delete $$HeaderR{$pgpheader}; + my $tmppgpheader = $config{'pgpheader'} . ": " . $$HeaderR{$config{'pgpheader'}}; + delete $$HeaderR{$config{'pgpheader'}}; @pgphead = (); - foreach $header (@PGPorderheaders) { + foreach $header (@{$config{PGPorderheaders}}) { if ($$HeaderR{$header} && $$HeaderR{$header} ne "\n") { push(@pgphead, "$$HeaderR{$header}"); delete $$HeaderR{$header}; @@ -484,7 +559,7 @@ sub signarticle { } } - push @pgphead, ("X-PGP-Key: " . $PGPSigner . "\n"), $tmppgpheader; + push @pgphead, ("X-PGP-Key: " . $config{'PGPSigner'} . "\n"), $tmppgpheader; undef $tmppgpheader; @pgpbody = split /$/m, $pgpbody; @@ -492,6 +567,29 @@ sub signarticle { return \@pgpmessage; } + +sub usage { + print $pname." ".$version."\n"; + print "Usage: ".$pname." [OPTS] < article\n"; + print " -a string set Approved:-header to string\n"; + print " -c string set Control:-header to string\n"; + print " -d string set Distribution:-header to string\n"; + print " -e string set Expires:-header to string\n"; + print " -f string set From:-header to string\n"; + print " -n string set Newsgroups:-header to string\n"; + print " -o string set Organization:-header to string\n"; + print " -p port use port as NNTP port [default=".$config{'NNTPPort'}."]\n"; + print " -r string set Reply-To:-header to string\n"; + print " -t string set Subject:-header to string\n"; + print " -w string set Followup-To:-header to string\n"; + print " -x string set Path:-header to string\n"; + print " -H show help\n"; + print " -R disallow control messages\n"; + print " -S do not append \$HOME/.signature\n"; + print " -X do not sign article\n"; + exit 0; +} + __END__ =head1 NAME @@ -500,7 +598,7 @@ tinews.pl - Post and sign an article via =head1 SYNOPSIS -B E I +B [B] E I =head1 DESCRIPTION @@ -513,7 +611,87 @@ to the article and send out the mail-cop =head1 OPTIONS -None. +=over 4 + +=item -B C | --B C + +Set the article header field Approved: to the given value. + +=item -B C | --B C + +Set the article header field Control: to the given value. + +=item -B C | --B C + +Set the article header field Distribution: to the given value. + +=item -B C | --B C + +Set the article header field Expires: to the given value. + +=item -B C | --B C + +Set the article header field From: to the given value. + +=item -B C | --B C + +Set the article header field Newsgroups: to the given value. + +=item -B C | --B C + +Set the article header field Organization: to the given value. + +=item -B

C | --B C + +use C as NNTP-port + +=item -B C | --B C + +Set the article header field Reply-To: to the given value. + +=item -B C | --B C + +Set the article header field Subject: to the given value. + +=item -B C | --B C + +Set the article header field Followup-To: to the given value. + +=item -B C | --B C + +Set the article header field Path: to the given value. + +=item -B | --B + +Show help-page. + +=item -B | --B + +Restricted mode, disallow control-messages. + +=item -B | --B + +Do not append F<$HOME/.signature> + +=item -B | --B + +Do not sign the article. + +=item -B -B -B + +These options are accepted for compatibility reasons but ignored. + +=item -B | --B + +These options are accepted for compatibility reasons but ignored. + +=item -B | --B + +These options are accepted for compatibility reasons but ignored. + +=item -B | -B | --B + +These options are accepted but do not have any functionality yet. =head1 EXIT STATUS @@ -521,7 +699,7 @@ The following exit values are returned: =over 4 -=item S< 0> +=item S< 0> Successful completion. @@ -539,6 +717,12 @@ An error occurred. Set to override the NNTP server configured in the source. +=item B<$NNTPPORT> + +The NNTP TCP-port to post news to. This variable only needs to be set if the +TCP-port is not 119 (the default). The '-B

' command-line option overrides +B<$NNTPPORT>. + =item B<$PGPPASS> Set to override the passphrase configured in the source (used for @@ -558,11 +742,19 @@ From:-field will be used. Set the article header field Reply-To: to the return address specified by the variable if there isn't already a Reply-To: header in the article. +The '-B' command-line option overrides B<$REPLYTO>. =item B<$ORGANIZATION> Set the article header field Organization: to the contents of the variable -if there isn't already a Organization: header in the article. +if there isn't already a Organization: header in the article. The '-B' +command-line option overrides B<$ORGANIZATION>. + +=item B<$DISTRIBUTION> + +Set the article header field Distribution: to the contents of the variable +if there isn't already a Distribution: header in the article. The '-B' +command-line option overrides B<$DISTRIBUTION>. =back @@ -572,23 +764,24 @@ if there isn't already a Organization: h =item F -Temporary file used to store the reformated article +Temporary file used to store the reformatted article =item F -Temporary file used to store the reformated and signed article +Temporary file used to store the reformatted and signed article =item F<$PGPPASSFILE> The passphrase file to be used for B(1) or B(1). +=item F<$HOME/.signature> + +Signature-file which will be automatically included. + =back =head1 SECURITY -If interactive usage is configured and B prompts for the -NNTP-password the input is echoed to the terminal. - 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 @@ -600,7 +793,8 @@ B is designed to be used with B(1)-5 and B(1). B requires the following standard modules to be installed: -B(3pm), B(3pm) and B(3pm). +B(3pm), B(3pm), B(3pm) and +B(3pm). =head1 AUTHOR @@ -609,7 +803,7 @@ Marc Brockschmidt Emarc@marcbrocksch =head1 SEE ALSO -B(1), B(1), B(1), B(3pm), B(3pm), -B(3pm) +B(1), B(1), B(1), B(3pm), B(3pm), +B(3pm), B(3pm) =cut