----------------------------------------------------------------------------- MANIFEST | 147 +- Makefile | 7 config.guess | 59 - config.sub | 34 configure | 2861 ++++++++++++++++++++++++++++--------------------- configure.in | 40 doc/CHANGES | 43 doc/CREDITS | 90 - doc/INSTALL | 23 doc/TODO | 31 doc/WHATSNEW | 2 doc/tin.1 | 10 doc/tin.5 | 4 include/autoconf.hin | 7 include/extern.h | 5 include/policy.h | 12 include/proto.h | 38 include/tcurses.h | 4 include/tin.h | 28 include/version.h | 6 po/POTFILES.in | 1 po/de.gmo |binary po/de.po | 1600 +++++++++++++-------------- po/en_GB.gmo |binary po/en_GB.po | 1577 +++++++++++++-------------- po/et.gmo |binary po/et.po | 1580 +++++++++++++-------------- po/fr.gmo |binary po/fr.po | 1587 +++++++++++++-------------- po/tin.pot | 1581 +++++++++++++-------------- src/Makefile.in | 12 src/active.c | 12 src/art.c | 259 ++-- src/attrib.c | 30 src/auth.c | 6 src/charset.c | 13 src/config.c | 1175 -------------------- src/cook.c | 12 src/curses.c | 9 src/envarg.c | 2 src/filter.c | 252 ++-- src/getline.c | 23 src/group.c | 127 +- src/hashstr.c | 2 src/header.c | 4 src/init.c | 17 src/lang.c | 11 src/mail.c | 6 src/main.c | 227 --- src/misc.c | 276 ++++ src/my_tmpfile.c | 5 src/nntplib.c | 6 src/options_menu.c | 1427 ++++++++++++++++++++++++ src/page.c | 23 src/post.c | 83 - src/prompt.c | 99 + src/read.c | 6 src/rfc1524.c | 20 src/rfc2046.c | 12 src/rfc2047.c | 2 src/save.c | 9 src/screen.c | 52 src/search.c | 22 src/select.c | 11 src/string.c | 83 - src/tags.c | 4 src/tcurses.c | 3 src/thread.c | 211 +-- src/tincfg.tbl | 2 src/tmpfile.c | 2 src/xface.c | 10 src/xref.c | 4 tin.spec | 2 tools/tinews.pl | 7 tools/w2r.pl | 12 75 files changed, 8499 insertions(+), 7470 deletions(-) ----------------------------------------------------------------------------- diff -Nurp tin-1.7.5/MANIFEST tin-1.7.6/MANIFEST --- tin-1.7.5/MANIFEST 2004-08-20 10:35:09.000000000 +0200 +++ tin-1.7.6/MANIFEST 2004-09-06 11:07:24.000000000 +0200 @@ -1,28 +1,28 @@ -MANIFEST for tin-1.7.5 (Tue Jun 15 11:53:02 CEST 2004) +MANIFEST for tin-1.7.6 (Mon Sep 6 11:07:23 CEST 2004) ---------------------------------------------------- - 12908 ./Makefile - 7381 ./MANIFEST + 12936 ./Makefile + 7410 ./MANIFEST 1440 ./README 564 ./README.MAC 2209 ./README.VMS 1006 ./README.WIN 138874 ./aclocal.m4 882 ./conf-tin - 43548 ./config.guess - 31111 ./config.sub - 474446 ./configure - 30416 ./configure.in + 43209 ./config.guess + 31254 ./config.sub + 486848 ./configure + 30835 ./configure.in 7123 ./install.sh 777 ./mkdirs.sh 1505 ./tin.spec 18847 ./doc/ABOUT-NLS - 14960 ./doc/CHANGES + 16865 ./doc/CHANGES 226345 ./doc/CHANGES.old - 4634 ./doc/CREDITS + 4654 ./doc/CREDITS 1469 ./doc/DEBUG_REFS - 29542 ./doc/INSTALL - 30328 ./doc/TODO - 699 ./doc/WHATSNEW + 29793 ./doc/INSTALL + 30218 ./doc/TODO + 750 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1700 ./doc/article.txt 3862 ./doc/auth.txt @@ -48,104 +48,105 @@ MANIFEST for tin-1.7.5 (Tue Jun 15 11:53 4168 ./doc/mmdf.5 2128 ./doc/newsoverview.5 6963 ./doc/plp_snprintf.3 - 117684 ./doc/tin.1 - 72475 ./doc/tin.5 + 117717 ./doc/tin.1 + 72480 ./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 - 24930 ./tools/tinews.pl + 24945 ./tools/tinews.pl 1561 ./tools/url_handler.sh - 3172 ./tools/w2r.pl + 3347 ./tools/w2r.pl 1661 ./tools/expand_aliases.tgz 2778 ./include/bool.h 2039 ./include/bugrep.h 9502 ./include/oldconfig.h - 57686 ./include/extern.h + 57776 ./include/extern.h 11429 ./include/keymap.h 15886 ./include/menukeys.h 6340 ./include/newsrc.h 6507 ./include/nntplib.h 665 ./include/plp_snprintf.h - 12162 ./include/policy.h - 30135 ./include/proto.h + 12209 ./include/policy.h + 30228 ./include/proto.h 5047 ./include/rfc2046.h 3373 ./include/stpwatch.h - 5722 ./include/tcurses.h - 62195 ./include/tin.h + 5756 ./include/tcurses.h + 62980 ./include/tin.h 13273 ./include/tinrc.h 5670 ./include/tnntp.h 2264 ./include/trace.h - 2528 ./include/version.h - 25931 ./src/active.c - 53947 ./src/art.c - 31443 ./src/attrib.c - 12365 ./src/auth.c - 13650 ./src/charset.c + 2531 ./include/version.h + 25899 ./src/active.c + 55400 ./src/art.c + 31543 ./src/attrib.c + 12354 ./src/auth.c + 13712 ./src/charset.c 8220 ./src/color.c - 89776 ./src/config.c - 29738 ./src/cook.c - 30471 ./src/curses.c + 57537 ./src/config.c + 29822 ./src/cook.c + 30473 ./src/curses.c 9791 ./src/debug.c - 3414 ./src/envarg.c + 3408 ./src/envarg.c 26001 ./src/feed.c - 54874 ./src/filter.c - 18336 ./src/getline.c + 54994 ./src/filter.c + 18114 ./src/getline.c 7254 ./src/global.c - 44936 ./src/group.c - 3906 ./src/hashstr.c - 8775 ./src/header.c + 45013 ./src/group.c + 3900 ./src/hashstr.c + 8763 ./src/header.c 27937 ./src/help.c 13862 ./src/inews.c - 32717 ./src/init.c + 32715 ./src/init.c 2216 ./src/joinpath.c 38018 ./src/keymap.c - 113530 ./src/lang.c + 113648 ./src/lang.c 4486 ./src/langinfo.c 7033 ./src/list.c 6662 ./src/lock.c - 13370 ./src/mail.c - 25885 ./src/main.c + 13352 ./src/mail.c + 21002 ./src/main.c 10197 ./src/makecfg.c 12294 ./src/memory.c 5257 ./src/mimetypes.c - 83985 ./src/misc.c + 89299 ./src/misc.c 40349 ./src/newsrc.c - 37198 ./src/nntplib.c + 37180 ./src/nntplib.c 7291 ./src/nrctbl.c - 60825 ./src/page.c + 39978 ./src/options_menu.c + 60591 ./src/page.c 24133 ./src/parsdate.y 16966 ./src/plp_snprintf.c 12695 ./src/pgp.c - 133347 ./src/post.c - 16878 ./src/prompt.c - 10680 ./src/read.c + 133340 ./src/post.c + 17609 ./src/prompt.c + 10683 ./src/read.c 25572 ./src/refs.c 5276 ./src/regex.c - 14482 ./src/rfc1524.c + 14422 ./src/rfc1524.c 5553 ./src/rfc2045.c - 29624 ./src/rfc2046.c - 32745 ./src/rfc2047.c - 37058 ./src/save.c - 11351 ./src/screen.c - 15401 ./src/search.c - 30718 ./src/select.c + 29740 ./src/rfc2046.c + 32733 ./src/rfc2047.c + 37285 ./src/save.c + 11489 ./src/screen.c + 15480 ./src/search.c + 30671 ./src/select.c 7590 ./src/sigfile.c 12655 ./src/signal.c 7215 ./src/strftime.c - 22817 ./src/string.c - 13886 ./src/tags.c - 16949 ./src/tcurses.c - 3058 ./src/tmpfile.c - 3376 ./src/my_tmpfile.c - 40362 ./src/thread.c + 23023 ./src/string.c + 13874 ./src/tags.c + 16944 ./src/tcurses.c + 3071 ./src/tmpfile.c + 3364 ./src/my_tmpfile.c + 39438 ./src/thread.c 2472 ./src/trace.c 4117 ./src/version.c 5453 ./src/wildmat.c - 7139 ./src/xface.c - 7746 ./src/xref.c + 7153 ./src/xface.c + 7747 ./src/xref.c 3013 ./vms/dir.h 424 ./vms/filetypes.h 21451 ./vms/getopt.c @@ -210,9 +211,9 @@ MANIFEST for tin-1.7.5 (Tue Jun 15 11:53 1528 ./pcre/testdata/testoutput3 14786 ./pcre/testdata/testoutput4 22706 ./pcre/testdata/testoutput5 - 19662 ./include/autoconf.hin + 19771 ./include/autoconf.hin 5800 ./pcre/pcre.mms - 20816 ./src/Makefile.in + 20961 ./src/Makefile.in 7634 ./src/tincfg.tbl 8747 ./src/descrip.mms 954 ./libcanlock/Build @@ -274,14 +275,14 @@ MANIFEST for tin-1.7.5 (Tue Jun 15 11:53 4481 ./intl/textdomain.c 41 ./intl/VERSION 4962 ./po/Makefile.inn - 828 ./po/POTFILES.in - 117310 ./po/tin.pot - 158956 ./po/de.gmo - 189462 ./po/de.po + 847 ./po/POTFILES.in + 117391 ./po/tin.pot + 159859 ./po/de.gmo + 189901 ./po/de.po 6547 ./po/en_GB.gmo - 119471 ./po/en_GB.po - 150987 ./po/et.gmo - 181170 ./po/et.po - 125558 ./po/fr.gmo - 172615 ./po/fr.po -6010906 total + 119552 ./po/en_GB.po + 151003 ./po/et.gmo + 181283 ./po/et.po + 125574 ./po/fr.gmo + 172706 ./po/fr.po +6039072 total diff -Nurp tin-1.7.5/Makefile tin-1.7.6/Makefile --- tin-1.7.5/Makefile 2004-08-20 10:35:09.000000000 +0200 +++ tin-1.7.6/Makefile 2004-09-06 11:07:20.000000000 +0200 @@ -1,15 +1,15 @@ # Top level Makefile for tin # - for configuration options read the doc/INSTALL file. # -# Updated: 2003-11-18 +# Updated: 2004-09-05 # PROJECT = tin LVER = 1 PVER = 7 -SVER = 5 +SVER = 6 VER = $(LVER).$(PVER).$(SVER) -DVER = 20040615 +DVER = 20040906 EXE = tin # directory structure @@ -83,6 +83,7 @@ CFILES = \ $(SRCDIR)/newsrc.c\ $(SRCDIR)/nntplib.c \ $(SRCDIR)/nrctbl.c \ + $(SRCDIR)/options_menu.c \ $(SRCDIR)/page.c \ $(SRCDIR)/parsdate.y \ $(SRCDIR)/plp_snprintf.c \ diff -Nurp tin-1.7.5/config.guess tin-1.7.6/config.guess --- tin-1.7.5/config.guess 2004-08-20 10:35:09.000000000 +0200 +++ tin-1.7.6/config.guess 2004-08-31 22:50:35.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-06-11' +timestamp='2004-08-29' # 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 @@ -53,7 +53,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -203,9 +203,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ 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 ;; @@ -230,18 +227,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} + echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -307,9 +298,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -764,7 +752,7 @@ EOF echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -787,21 +775,7 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -850,6 +824,9 @@ EOF cris:Linux:*:*) echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -1098,7 +1075,7 @@ EOF exit 0 ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1196,17 +1173,18 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; @@ -1260,6 +1238,13 @@ EOF *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nurp tin-1.7.5/config.sub tin-1.7.6/config.sub --- tin-1.7.5/config.sub 2004-08-20 10:35:09.000000000 +0200 +++ tin-1.7.6/config.sub 2004-08-31 22:50:39.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-03-12' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ Report bugs and patches to &6 -echo "configure:669: checking host system type" >&5 +echo "configure:671: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -761,7 +763,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:765: checking for $ac_word" >&5 +echo "configure:767: 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 @@ -811,7 +813,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:815: checking for $ac_word" >&5 +echo "configure:817: 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 @@ -841,7 +843,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:845: checking for $ac_word" >&5 +echo "configure:847: 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 @@ -892,7 +894,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:896: checking for $ac_word" >&5 +echo "configure:898: 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 @@ -924,7 +926,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:928: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:930: 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. @@ -935,12 +937,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 939 "configure" +#line 941 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:946: \"$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 @@ -966,12 +968,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:970: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:972: 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:975: checking whether we are using GNU C" >&5 +echo "configure:977: 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 @@ -980,7 +982,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:984: \"$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:986: \"$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 @@ -999,7 +1001,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:1003: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1005: 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 @@ -1031,7 +1033,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1035: checking how to run the C preprocessor" >&5 +echo "configure:1037: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1046,13 +1048,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:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1058: \"$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 : @@ -1063,13 +1065,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:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1075: \"$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 : @@ -1080,13 +1082,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:1090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1092: \"$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 : @@ -1112,13 +1114,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:1116: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1118: 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 @@ -1136,7 +1138,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1158,7 +1160,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:1162: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1164: 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 @@ -1196,7 +1198,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:1200: checking for a BSD compatible install" >&5 +echo "configure:1202: 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 @@ -1273,14 +1275,14 @@ EOF do rm -f y.tab.ch echo $ac_n "checking for $cf_prog""... $ac_c" 1>&6 -echo "configure:1277: checking for $cf_prog" >&5 +echo "configure:1279: checking for $cf_prog" >&5 cf_command="$cf_prog conftest.y" cf_result=no - if { (eval echo configure:1280: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then + if { (eval echo configure:1282: \"$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:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then + if { (eval echo configure:1286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then cf_result=yes fi else @@ -1304,7 +1306,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:1308: checking for $ac_word" >&5 +echo "configure:1310: 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 @@ -1335,13 +1337,13 @@ done echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1339: checking if we must define _GNU_SOURCE" >&5 +echo "configure:1341: 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() { @@ -1351,7 +1353,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1361,7 +1363,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1371,7 +1373,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1393,7 +1395,7 @@ test "$cf_cv_gnu_source" = yes && CPPFLA echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1397: checking for strerror in -lcposix" >&5 +echo "configure:1399: 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 @@ -1401,7 +1403,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:1418: \"$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 @@ -1436,7 +1438,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1440: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1442: 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 @@ -1492,7 +1494,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1576,12 +1578,12 @@ You have the following choices: fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1580: checking for Cygwin environment" >&5 +echo "configure:1582: 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 +if { (eval echo configure:1598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1609,19 +1611,19 @@ 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:1613: checking for mingw32 environment" >&5 +echo "configure:1615: 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 +if { (eval echo configure:1627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1653,7 +1655,7 @@ esac echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1657: checking for executable suffix" >&5 +echo "configure:1659: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1663,7 +1665,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1684,13 +1686,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1688: checking for object suffix" >&5 +echo "configure:1690: 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:1694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1725,7 +1727,7 @@ LIB_PREFIX=$LIB_PREFIX echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1729: checking whether ln -s works" >&5 +echo "configure:1731: 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 @@ -1769,7 +1771,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:1773: checking for $ac_word" >&5 +echo "configure:1775: 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 @@ -1862,7 +1864,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1866: checking build system type" >&5 +echo "configure:1868: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1888,7 +1890,7 @@ 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:1892: checking for $ac_word" >&5 +echo "configure:1894: 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 @@ -1920,7 +1922,7 @@ 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:1924: checking for $ac_word" >&5 +echo "configure:1926: 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 @@ -1955,7 +1957,7 @@ 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:1959: checking for $ac_word" >&5 +echo "configure:1961: 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 @@ -1987,7 +1989,7 @@ 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:1991: checking for $ac_word" >&5 +echo "configure:1993: 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 @@ -2022,7 +2024,7 @@ 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:2026: checking for $ac_word" >&5 +echo "configure:2028: 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 @@ -2054,7 +2056,7 @@ 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:2058: checking for $ac_word" >&5 +echo "configure:2060: 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 @@ -2091,7 +2093,7 @@ if eval "test \"`echo '$''{'cf_cv_subst_ else echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:2095: checking for archiver options (symbol AR_OPTS)" >&5 +echo "configure:2097: checking for archiver options (symbol AR_OPTS)" >&5 test -z "$AR_OPTS" && AR_OPTS=rv echo "$ac_t""$AR_OPTS" 1>&6 @@ -2137,7 +2139,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:2141: checking for ispell" >&5 +echo "configure:2143: checking for ispell" >&5 ac_cv_path_PATH_ISPELL="$withval" cat >> confdefs.h <&6 -echo "configure:2158: checking for $ac_word" >&5 +echo "configure:2160: 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 @@ -2211,7 +2213,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:2215: checking for metamail" >&5 +echo "configure:2217: checking for metamail" >&5 ac_cv_path_PATH_METAMAIL="$withval" cat >> confdefs.h <&6 -echo "configure:2232: checking for $ac_word" >&5 +echo "configure:2234: 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 @@ -2285,7 +2287,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:2289: checking for sum" >&5 +echo "configure:2291: checking for sum" >&5 ac_cv_path_PATH_SUM="$withval" cat >> confdefs.h <&6 -echo "configure:2306: checking for $ac_word" >&5 +echo "configure:2308: 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 @@ -2349,12 +2351,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:2353: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "configure:2355: 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:2358: \"$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:2360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then ac_cv_prog_sum_r=yes else @@ -2384,7 +2386,7 @@ fi echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:2388: checking for default editor" >&5 +echo "configure:2390: checking for default editor" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then @@ -2412,7 +2414,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:2416: checking for $ac_word" >&5 +echo "configure:2418: 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 @@ -2457,7 +2459,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:2461: checking for $ac_word" >&5 +echo "configure:2463: 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 @@ -2511,7 +2513,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:2515: checking for $ac_word" >&5 +echo "configure:2517: 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 @@ -2548,7 +2550,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:2552: checking for $ac_word" >&5 +echo "configure:2554: 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 @@ -2582,7 +2584,7 @@ fi fi echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:2586: checking for default mailer" >&5 +echo "configure:2588: checking for default mailer" >&5 if test -n "$DEFAULT_MAILER" ; then case $cf_cv_system_name in #(vi @@ -2609,7 +2611,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:2613: checking for incoming-mail directory" >&5 +echo "configure:2615: checking for incoming-mail directory" >&5 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then @@ -2655,7 +2657,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:2659: checking if you want PGP/GPG-Support" >&5 +echo "configure:2661: 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 @@ -2687,7 +2689,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:2691: checking for pgp" >&5 +echo "configure:2693: checking for pgp" >&5 ac_cv_path_PATH_PGP="$withval" cat >> confdefs.h <&6 -echo "configure:2708: checking for $ac_word" >&5 +echo "configure:2710: 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 @@ -2762,7 +2764,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:2766: checking for pgpk" >&5 +echo "configure:2768: checking for pgpk" >&5 ac_cv_path_PATH_PGPK="$withval" cat >> confdefs.h <&6 -echo "configure:2783: checking for $ac_word" >&5 +echo "configure:2785: 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 @@ -2837,7 +2839,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:2841: checking for gpg" >&5 +echo "configure:2843: checking for gpg" >&5 ac_cv_path_PATH_GPG="$withval" cat >> confdefs.h <&6 -echo "configure:2858: checking for $ac_word" >&5 +echo "configure:2860: 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 @@ -2911,13 +2913,13 @@ fi echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:2915: checking for the default shell program" >&5 +echo "configure:2917: 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 < @@ -2930,7 +2932,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:2934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -2940,11 +2942,11 @@ fi rm -f conftest* fi -echo "(line 2944) testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "(line 2946) 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 2948) testing /etc/shells ..." 1>&5 +echo "(line 2950) testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -2979,14 +2981,14 @@ echo "(line 2948) testing /etc/shells .. echo "$ac_t""$DEFAULT_SHELL" 1>&6 else -echo "(line 2983) testing $PATH ..." 1>&5 +echo "(line 2985) 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:2990: checking for $ac_word" >&5 +echo "configure:2992: 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 @@ -3039,7 +3041,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:3043: checking if NNTP-support will be used" >&5 +echo "configure:3045: checking if NNTP-support will be used" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then @@ -3061,7 +3063,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:3065: checking whether to be NNTP_ONLY" >&5 +echo "configure:3067: 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 @@ -3093,7 +3095,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:3097: checking if you want to compile-in debug support" >&5 +echo "configure:3099: 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 @@ -3120,7 +3122,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:3124: checking if you want to see long compiling messages" >&5 +echo "configure:3126: 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 @@ -3165,7 +3167,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:3169: checking if you want to compile with fallback prototypes" >&5 +echo "configure:3171: 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 @@ -3189,7 +3191,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:3193: checking if you want to turn on gcc warnings" >&5 +echo "configure:3195: 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 @@ -3215,7 +3217,7 @@ then GCC_VERSION=none if test "$GCC" = yes ; then echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:3219: checking version of $CC" >&5 +echo "configure:3221: 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 @@ -3226,11 +3228,11 @@ fi if test "$GCC" = yes then cat > conftest.$ac_ext <&6 -echo "configure:3234: checking for $CC warning options" >&5 +echo "configure:3236: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -3249,7 +3251,7 @@ echo "configure:3234: checking for $CC w Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:3253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3255: \"$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 @@ -3279,7 +3281,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:3283: checking for news-library path" >&5 +echo "configure:3285: checking for news-library path" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then @@ -3317,7 +3319,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:3321: checking for news spool-directory path" >&5 +echo "configure:3323: checking for news spool-directory path" >&5 # Check whether --with-spooldir or --without-spooldir was given. if test "${with_spooldir+set}" = set; then @@ -3355,7 +3357,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:3359: checking for news overview-directory path" >&5 +echo "configure:3361: 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 @@ -3393,7 +3395,7 @@ eval NOVROOTDIR="$withval" echo "$ac_t""$NOVROOTDIR" 1>&6 echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:3397: checking for overview filename" >&5 +echo "configure:3399: checking for overview filename" >&5 # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then @@ -3429,7 +3431,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:3433: checking for directory containing \"inews\"" >&5 +echo "configure:3435: 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 @@ -3470,7 +3472,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:3474: checking for $ac_word" >&5 +echo "configure:3476: 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 @@ -3527,7 +3529,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:3531: checking for optional INN-NNTP library" >&5 +echo "configure:3533: 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 @@ -3559,7 +3561,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:3563: checking if you want socks library" >&5 +echo "configure:3565: 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 @@ -3579,7 +3581,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:3583: checking if you want socks5 library" >&5 +echo "configure:3585: 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 @@ -3655,7 +3657,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext < @@ -3664,7 +3666,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -3678,7 +3680,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:3682: checking for network libraries" >&5 +echo "configure:3684: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3689,12 +3691,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3693: checking for $ac_func" >&5 +echo "configure:3695: 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:3723: \"$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 @@ -3740,7 +3742,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:3744: checking for gethostname in -lnsl" >&5 +echo "configure:3746: 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 @@ -3748,7 +3750,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:3765: \"$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 @@ -3792,7 +3794,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:3796: checking for gethostname in -lsocket" >&5 +echo "configure:3798: 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 @@ -3800,7 +3802,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:3817: \"$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 @@ -3856,7 +3858,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:3860: checking for main in -linet" >&5 +echo "configure:3862: 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 @@ -3864,14 +3866,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:3877: \"$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 @@ -3896,12 +3898,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:3900: checking for $ac_func" >&5 +echo "configure:3902: 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:3930: \"$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 @@ -3947,7 +3949,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3951: checking for socket in -lsocket" >&5 +echo "configure:3953: 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 @@ -3955,7 +3957,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:3972: \"$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 @@ -3999,7 +4001,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:4003: checking for socket in -lbsd" >&5 +echo "configure:4005: 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 @@ -4007,7 +4009,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:4024: \"$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 @@ -4063,12 +4065,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4067: checking for $ac_func" >&5 +echo "configure:4069: 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:4097: \"$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 @@ -4114,7 +4116,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4118: checking for gethostbyname in -lnsl" >&5 +echo "configure:4120: 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 @@ -4122,7 +4124,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:4139: \"$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 @@ -4174,12 +4176,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4178: checking for $ac_func" >&5 +echo "configure:4180: 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:4208: \"$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 @@ -4225,7 +4227,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:4229: checking for strcasecmp in -lresolv" >&5 +echo "configure:4231: 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 @@ -4233,7 +4235,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:4250: \"$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 @@ -4316,10 +4318,10 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:4320: checking if the socks library uses socks4 prefix" >&5 +echo "configure:4322: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext < @@ -4328,7 +4330,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4334: \"$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 @@ -4340,14 +4342,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:4351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -4412,9 +4414,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:4416: checking if socks5p.h is available" >&5 +echo "configure:4418: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -4450,17 +4452,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:4454: checking for $ac_hdr" >&5 +echo "configure:4456: 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:4464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4466: \"$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* @@ -4487,12 +4489,12 @@ fi done echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:4491: checking for fcntl" >&5 +echo "configure:4493: 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:4521: \"$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 @@ -4535,12 +4537,12 @@ else fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:4539: checking for lockf" >&5 +echo "configure:4541: 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:4569: \"$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 @@ -4583,12 +4585,12 @@ else fi echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:4587: checking for flock" >&5 +echo "configure:4589: 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:4617: \"$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 @@ -4632,7 +4634,7 @@ fi echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:4636: checking for file-locking functions" >&5 +echo "configure:4638: 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 @@ -4644,7 +4646,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se case $cf_lock in #(vi fcntl) #(vi cat > conftest.$ac_ext < @@ -4672,7 +4674,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4684,7 +4686,7 @@ rm -f conftest* ;; lockf) #(vi cat > conftest.$ac_ext < @@ -4704,7 +4706,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4716,7 +4718,7 @@ rm -f conftest* ;; flock) cat > conftest.$ac_ext < @@ -4739,7 +4741,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4760,7 +4762,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:4764: checking which locking method should be used" >&5 +echo "configure:4766: checking which locking method should be used" >&5 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -4829,7 +4831,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:4833: checking for screen type" >&5 +echo "configure:4835: checking for screen type" >&5 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -4845,7 +4847,7 @@ use_curses=no use_ncurses=no echo $ac_n "checking if you specified curses install-directory""... $ac_c" 1>&6 -echo "configure:4849: checking if you specified curses install-directory" >&5 +echo "configure:4851: checking if you specified curses install-directory" >&5 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -4902,7 +4904,7 @@ pdcurses) #(vi ;; none) echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:4906: checking if you want to use ncurses library" >&5 +echo "configure:4908: 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 @@ -4915,7 +4917,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:4919: checking if you want curses rather than termcap interface" >&5 +echo "configure:4921: 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 @@ -4952,7 +4954,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:4956: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:4958: 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 @@ -4963,7 +4965,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -5007,7 +5009,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:5011: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:5013: 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 @@ -5102,14 +5104,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:5113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5136,7 +5138,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -5204,14 +5206,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:5215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5266,7 +5268,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:5270: checking for ncurses version" >&5 +echo "configure:5272: 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 @@ -5292,7 +5294,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:5296: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:5298: \"$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" @@ -5301,7 +5303,7 @@ EOF else cat > conftest.$ac_ext < @@ -5325,7 +5327,7 @@ int main() exit(0); } EOF -if { (eval echo configure:5329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5331: \"$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` @@ -5356,7 +5358,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:5360: checking for Gpm_Open in -lgpm" >&5 +echo "configure:5362: 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 @@ -5364,7 +5366,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:5381: \"$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 @@ -5391,7 +5393,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:5395: checking for initscr in -lgpm" >&5 +echo "configure:5397: 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 @@ -5399,7 +5401,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:5416: \"$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 @@ -5441,7 +5443,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:5445: checking for tgoto in -lmytinfo" >&5 +echo "configure:5447: 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 @@ -5449,7 +5451,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:5466: \"$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 @@ -5493,12 +5495,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:5497: checking for initscr" >&5 +echo "configure:5499: 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:5527: \"$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 @@ -5541,17 +5543,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:5545: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:5547: 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:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5557: \"$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' @@ -5620,17 +5622,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:5624: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:5626: 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:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5636: \"$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' @@ -5661,7 +5663,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:5665: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:5667: 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$%%"` @@ -5670,14 +5672,14 @@ echo "configure:5665: 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:5681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5683: \"$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 @@ -5704,9 +5706,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:5708: checking for $cf_hdr" >&5 +echo "configure:5710: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -5714,7 +5716,7 @@ echo "configure:5708: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5720: \"$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* @@ -5741,12 +5743,12 @@ done echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:5745: checking for wide char and multibyte support" >&5 +echo "configure:5747: 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 @@ -5782,7 +5784,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:5786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -5792,7 +5794,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -5818,7 +5820,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=libutf8 else @@ -5859,7 +5861,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:5863: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:5865: 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 @@ -5870,7 +5872,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -5922,7 +5924,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:5926: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:5928: 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 @@ -6017,14 +6019,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:6028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6051,7 +6053,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -6127,14 +6129,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:6138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6189,7 +6191,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6193: checking for ncurses version" >&5 +echo "configure:6195: 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 @@ -6215,7 +6217,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6219: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6221: \"$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" @@ -6224,7 +6226,7 @@ EOF else cat > conftest.$ac_ext < @@ -6248,7 +6250,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6254: \"$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` @@ -6279,7 +6281,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:6283: checking for Gpm_Open in -lgpm" >&5 +echo "configure:6285: 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 @@ -6287,7 +6289,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:6304: \"$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 @@ -6314,7 +6316,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:6318: checking for initscr in -lgpm" >&5 +echo "configure:6320: 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 @@ -6322,7 +6324,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:6339: \"$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 @@ -6364,7 +6366,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:6368: checking for tgoto in -lmytinfo" >&5 +echo "configure:6370: 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 @@ -6372,7 +6374,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:6389: \"$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 @@ -6416,12 +6418,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:6420: checking for initscr" >&5 +echo "configure:6422: 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:6450: \"$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 @@ -6464,17 +6466,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:6468: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:6470: 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:6478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6480: \"$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' @@ -6543,17 +6545,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:6547: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:6549: 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:6557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6559: \"$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' @@ -6584,7 +6586,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:6588: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:6590: 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$%%"` @@ -6593,14 +6595,14 @@ echo "configure:6588: 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:6604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6606: \"$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 @@ -6623,7 +6625,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6627: checking for ncurses version" >&5 +echo "configure:6629: 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 @@ -6649,7 +6651,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6653: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6655: \"$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" @@ -6658,7 +6660,7 @@ EOF else cat > conftest.$ac_ext < @@ -6682,7 +6684,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6688: \"$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` @@ -6705,13 +6707,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:6709: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:6711: 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 < @@ -6723,7 +6725,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:6727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6729: \"$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 @@ -6731,7 +6733,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6750: \"$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 @@ -6767,7 +6769,7 @@ test $cf_cv_need_xopen_extension = yes & echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:6771: checking for extra include directories" >&5 +echo "configure:6773: 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 @@ -6791,7 +6793,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:6795: checking if we have identified curses headers" >&5 +echo "configure:6797: 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 @@ -6804,14 +6806,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:6815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -6834,17 +6836,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:6838: checking for $ac_hdr" >&5 +echo "configure:6840: 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:6848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6850: \"$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* @@ -6875,16 +6877,16 @@ done echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:6879: checking if we have identified curses libraries" >&5 +echo "configure:6881: 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:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6900,7 +6902,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:6904: checking for tgoto in -lmytinfo" >&5 +echo "configure:6906: 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 @@ -6908,7 +6910,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:6925: \"$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 @@ -6942,7 +6944,7 @@ fi ;; hpux10.*|hpux11.*) #(vi echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:6946: checking for initscr in -lcur_colr" >&5 +echo "configure:6948: 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 @@ -6950,7 +6952,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:6967: \"$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 @@ -6984,7 +6986,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:6988: checking for initscr in -lHcurses" >&5 +echo "configure:6990: 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 @@ -6992,7 +6994,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:7009: \"$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 @@ -7056,12 +7058,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:7060: checking for tgoto" >&5 +echo "configure:7062: 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:7090: \"$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 @@ -7105,7 +7107,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:7109: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:7111: 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 @@ -7113,7 +7115,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:7130: \"$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 @@ -7154,7 +7156,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:7158: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:7160: 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 @@ -7162,7 +7164,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:7179: \"$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 @@ -7199,16 +7201,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:7203: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:7205: 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:7212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7224,16 +7226,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:7228: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:7230: 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:7237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -7243,14 +7245,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:7254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7271,7 +7273,7 @@ fi echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7275: checking for ncurses version" >&5 +echo "configure:7277: 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 @@ -7297,7 +7299,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7301: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7303: \"$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" @@ -7306,7 +7308,7 @@ EOF else cat > conftest.$ac_ext < @@ -7330,7 +7332,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7336: \"$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` @@ -7353,13 +7355,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:7357: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:7359: 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 < @@ -7371,7 +7373,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:7375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7377: \"$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 @@ -7379,7 +7381,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7398: \"$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 @@ -7415,7 +7417,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:7419: checking if you want to use installed version of pcre" >&5 +echo "configure:7421: 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 @@ -7488,7 +7490,7 @@ fi debug_malloc=none echo $ac_n "checking if you want to link with dbmalloc for testing""... $ac_c" 1>&6 -echo "configure:7492: checking if you want to link with dbmalloc for testing" >&5 +echo "configure:7494: 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 @@ -7502,17 +7504,17 @@ 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:7506: checking for dbmalloc.h" >&5 +echo "configure:7508: 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:7516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7518: \"$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* @@ -7529,7 +7531,7 @@ 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:7533: checking for debug_malloc in -ldbmalloc" >&5 +echo "configure:7535: checking for debug_malloc in -ldbmalloc" >&5 ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7537,7 +7539,7 @@ 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:7554: \"$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 @@ -7576,7 +7578,7 @@ fi echo $ac_n "checking if you want to link with dmalloc for testing""... $ac_c" 1>&6 -echo "configure:7580: checking if you want to link with dmalloc for testing" >&5 +echo "configure:7582: 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 @@ -7590,17 +7592,17 @@ 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:7594: checking for dmalloc.h" >&5 +echo "configure:7596: 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:7604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7606: \"$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* @@ -7617,7 +7619,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6 -echo "configure:7621: checking for dmalloc_debug in -ldmalloc" >&5 +echo "configure:7623: checking for dmalloc_debug in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7625,7 +7627,7 @@ 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:7642: \"$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 @@ -7664,7 +7666,7 @@ fi echo $ac_n "checking if you want debugging-trace""... $ac_c" 1>&6 -echo "configure:7668: checking if you want debugging-trace" >&5 +echo "configure:7670: checking if you want debugging-trace" >&5 # Check whether --with-trace or --without-trace was given. if test "${with_trace+set}" = set; then @@ -7682,12 +7684,12 @@ EOF EXTRAOBJS="$EXTRAOBJS trace.o" echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:7686: checking for _tracef" >&5 +echo "configure:7688: 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:7716: \"$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 @@ -7732,7 +7734,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:7736: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo "configure:7738: 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 @@ -7740,7 +7742,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:7757: \"$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 @@ -7783,7 +7785,7 @@ fi ## options for miscellaneous definitions echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:7787: checking for domain-name" >&5 +echo "configure:7789: checking for domain-name" >&5 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then @@ -7812,7 +7814,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:7816: checking for NNTP default-server" >&5 +echo "configure:7818: 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 @@ -7878,7 +7880,7 @@ EOF ## optional features echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6 -echo "configure:7882: checking whether to use MH style mail handling for mailgroups" >&5 +echo "configure:7884: 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 @@ -7897,7 +7899,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:7901: checking whether to enable 8-bit keycodes" >&5 +echo "configure:7903: 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 @@ -7923,7 +7925,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:7927: checking whether to enable ANSI-color" >&5 +echo "configure:7929: checking whether to enable ANSI-color" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then @@ -7940,7 +7942,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:7944: checking whether to enable posting-etiquette" >&5 +echo "configure:7946: checking whether to enable posting-etiquette" >&5 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then @@ -7959,7 +7961,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:7963: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "configure:7965: 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 @@ -7978,7 +7980,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:7982: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "configure:7984: 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 @@ -8004,7 +8006,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:8008: checking for MIME character-set" >&5 +echo "configure:8010: 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 @@ -8026,7 +8028,7 @@ EOF echo "$ac_t""$MM_CHARSET" 1>&6 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:8030: checking for default ISO/ASCII table" >&5 +echo "configure:8032: 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 @@ -8048,7 +8050,7 @@ EOF echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:8052: checking whether to enable locale support" >&5 +echo "configure:8054: checking whether to enable locale support" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then @@ -8067,7 +8069,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:8071: checking whether to enable posting" >&5 +echo "configure:8073: checking whether to enable posting" >&5 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then @@ -8086,7 +8088,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:8090: checking whether to enable shell escape" >&5 +echo "configure:8092: 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 @@ -8105,7 +8107,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:8109: checking whether to have fascist newsadmin" >&5 +echo "configure:8111: 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 @@ -8124,7 +8126,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:8128: checking whether to enable inverse video and highlighting" >&5 +echo "configure:8130: 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 @@ -8143,7 +8145,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:8147: checking whether to enable piping support" >&5 +echo "configure:8149: checking whether to enable piping support" >&5 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then @@ -8162,7 +8164,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:8166: checking whether to enable printer support" >&5 +echo "configure:8168: checking whether to enable printer support" >&5 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then @@ -8181,7 +8183,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:8185: checking whether to unique tmp-files by appending .pid" >&5 +echo "configure:8187: 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 @@ -8207,7 +8209,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:8211: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "configure:8213: 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 @@ -8234,7 +8236,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:8238: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "configure:8240: 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 @@ -8252,9 +8254,29 @@ fi echo "$ac_t""$enableval" 1>&6 +### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work +echo $ac_n "checking whether to ignore system()s return value""... $ac_c" 1>&6 +echo "configure:8260: checking whether to ignore system()s return value" >&5 + +# Check whether --enable-broken-system-fix or --disable-broken-system-fix was given. +if test "${enable_broken_system_fix+set}" = set; then + enableval="$enable_broken_system_fix" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + cat >> confdefs.h <<\EOF +#define IGNORE_SYSTEM_STATUS 1 +EOF + + fi +else + enableval=no +fi + +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:8258: checking for directory containing tin.defaults file" >&5 +echo "configure:8280: 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 @@ -8297,7 +8319,7 @@ EOF ### check for ipv6 support echo $ac_n "checking whether to enable IPv6""... $ac_c" 1>&6 -echo "configure:8301: checking whether to enable IPv6" >&5 +echo "configure:8323: checking whether to enable IPv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -8318,7 +8340,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:8322: checking ipv6 stack type" >&5 +echo "configure:8344: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8338,7 +8360,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext < @@ -8356,7 +8378,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext < @@ -8374,7 +8396,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext < @@ -8401,7 +8423,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext < @@ -8419,7 +8441,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext < @@ -8437,7 +8459,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext < @@ -8470,7 +8492,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:8474: checking for IPv6 library if required" >&5 +echo "configure:8496: checking for IPv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -8504,7 +8526,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext < @@ -8515,7 +8537,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -8612,12 +8634,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:8616: checking for getaddrinfo" >&5 +echo "configure:8638: 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:8666: \"$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 @@ -8660,10 +8682,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:8664: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:8686: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext < @@ -8674,7 +8696,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8700: \"$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' @@ -8743,10 +8765,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:8747: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:8769: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext < @@ -8757,7 +8779,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8783: \"$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' @@ -8790,7 +8812,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:8794: checking working getaddrinfo" >&5 +echo "configure:8816: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8799,7 +8821,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext < @@ -8878,7 +8900,7 @@ int main() } EOF -if { (eval echo configure:8882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8904: \"$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 @@ -8922,12 +8944,12 @@ fi for ac_func in getaddrinfo getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8926: checking for $ac_func" >&5 +echo "configure:8948: 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:8976: \"$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 @@ -8979,7 +9001,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:8983: checking whether to make a coffee while compiling" >&5 +echo "configure:9005: 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 @@ -9004,7 +9026,7 @@ fi ### checks for compiler characteristics echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:9008: checking for makeflags variable" >&5 +echo "configure:9030: checking for makeflags variable" >&5 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9049,12 +9071,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:9053: checking for working const" >&5 +echo "configure:9075: 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:9129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9124,21 +9146,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9128: checking for inline" >&5 +echo "configure:9150: 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:9164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9165,13 +9187,13 @@ esac echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6 -echo "configure:9169: checking for ansi token expansion/substitution" >&5 +echo "configure:9191: 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:9205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_expands=yes else @@ -9200,13 +9222,13 @@ EOF echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:9204: checking for ansi token concatenation" >&5 +echo "configure:9226: 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:9240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_concats=yes else @@ -9235,20 +9257,20 @@ EOF echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:9239: checking if nested parameters work" >&5 +echo "configure:9261: 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:9274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_nested_params=yes else @@ -9268,258 +9290,15 @@ EOF -### check for alloca (only required for bison) -case "$YACC" in -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:9278: 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:9290: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_alloca_h=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 -EOF - -fi - -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:9311: 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 < -# define alloca _alloca -# else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif - -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:9344: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_func_alloca_works=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 -if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF - -fi - -if test $ac_cv_func_alloca_works = no; then - # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF - - -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:9376: 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 <&5 | - egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_os_cray=yes -else - rm -rf conftest* - ac_cv_os_cray=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 -if test $ac_cv_os_cray = yes; then -for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9406: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:9434: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <&6 -fi - -done -fi - -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:9461: 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 - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else - cat > conftest.$ac_ext < addr) ? 1 : -1; -} -main () -{ - exit (find_stack_direction() < 0); -} -EOF -if { (eval echo configure:9488: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_stack_direction=-1 -fi -rm -fr conftest* -fi - -fi - -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <&6 -echo "configure:9518: checking for ANSI C header files" >&5 +echo "configure:9297: 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 @@ -9527,7 +9306,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9310: \"$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* @@ -9544,7 +9323,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 @@ -9562,7 +9341,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 @@ -9583,7 +9362,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -9594,7 +9373,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:9598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9622,12 +9401,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:9626: checking for $ac_hdr that defines DIR" >&5 +echo "configure:9405: 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> @@ -9635,7 +9414,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:9639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -9660,7 +9439,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:9664: checking for opendir in -ldir" >&5 +echo "configure:9443: 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 @@ -9668,7 +9447,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:9462: \"$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 @@ -9701,7 +9480,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:9705: checking for opendir in -lx" >&5 +echo "configure:9484: 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 @@ -9709,7 +9488,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:9503: \"$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 @@ -9743,12 +9522,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:9747: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:9526: 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 @@ -9757,7 +9536,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:9761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -9778,12 +9557,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:9782: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:9561: 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 @@ -9799,7 +9578,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:9803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -9878,9 +9657,9 @@ for cf_hdr in \ do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:9882: checking for $cf_hdr" >&5 +echo "configure:9661: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -9888,7 +9667,7 @@ echo "configure:9882: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9671: \"$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* @@ -9924,17 +9703,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:9928: checking for $ac_hdr" >&5 +echo "configure:9707: 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:9938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9717: \"$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* @@ -9965,17 +9744,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:9969: checking for $ac_hdr" >&5 +echo "configure:9748: 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:9979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9758: \"$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* @@ -10010,16 +9789,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:10014: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:9793: 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:10023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -10028,7 +9807,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -10060,7 +9839,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:10064: checking declaration of size-change" >&5 +echo "configure:9843: 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 @@ -10074,7 +9853,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext < #ifdef HAVE_TERMIOS_H @@ -10113,7 +9892,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -10152,7 +9931,7 @@ fi echo $ac_n "checking if sys/time.h conflicts with sys/select.h""... $ac_c" 1>&6 -echo "configure:10156: checking if sys/time.h conflicts with sys/select.h" >&5 +echo "configure:9935: 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 @@ -10160,7 +9939,7 @@ else for cf_opts in no yes do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_select_timeval=$cf_opts break @@ -10212,12 +9991,12 @@ EOF ### Checks for Datatypes. echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:10216: checking for gid_t" >&5 +echo "configure:9995: 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 @@ -10245,12 +10024,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:10249: checking for mode_t" >&5 +echo "configure:10028: 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 @@ -10278,12 +10057,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:10282: checking for off_t" >&5 +echo "configure:10061: 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 @@ -10311,12 +10090,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:10315: checking for pid_t" >&5 +echo "configure:10094: 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 @@ -10344,12 +10123,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:10348: checking for size_t" >&5 +echo "configure:10127: 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 @@ -10377,12 +10156,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:10381: checking for ssize_t" >&5 +echo "configure:10160: 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 @@ -10410,12 +10189,12 @@ EOF fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:10414: checking for time_t" >&5 +echo "configure:10193: 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 @@ -10443,12 +10222,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:10447: checking for uid_t in sys/types.h" >&5 +echo "configure:10226: 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 @@ -10478,9 +10257,9 @@ fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:10482: checking for quad_t" >&5 +echo "configure:10261: checking for quad_t" >&5 cat > conftest.$ac_ext < @@ -10493,7 +10272,7 @@ int main() { quad_t x; x = 0 ; return 0; } EOF -if { (eval echo configure:10497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_quad_t=yes else @@ -10512,9 +10291,9 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:10516: checking for long long" >&5 +echo "configure:10295: checking for long long" >&5 cat > conftest.$ac_ext < @@ -10523,7 +10302,7 @@ int main() { long long x; x = 0 ; return 0; } EOF -if { (eval echo configure:10527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_long_long=yes else @@ -10542,9 +10321,9 @@ EOF fi echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:10546: checking for nl_item" >&5 +echo "configure:10325: checking for nl_item" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_nl_item=yes else @@ -10581,7 +10360,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:10585: checking for UUInitialize in -luu" >&5 +echo "configure:10364: 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 @@ -10589,7 +10368,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:10383: \"$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 @@ -10617,17 +10396,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:10621: checking for uudeview.h" >&5 +echo "configure:10400: 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:10631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10410: \"$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* @@ -10665,7 +10444,7 @@ fi # libidn - Internationalized Domain Names echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:10669: checking for stringprep_check_version in -lidn" >&5 +echo "configure:10448: 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 @@ -10673,7 +10452,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:10467: \"$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 @@ -10701,17 +10480,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:10705: checking for stringprep.h" >&5 +echo "configure:10484: 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:10715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10494: \"$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* @@ -10734,17 +10513,17 @@ EOF ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:10738: checking for idna.h" >&5 +echo "configure:10517: 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:10748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10527: \"$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* @@ -10766,7 +10545,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:10770: checking for idna_to_unicode_lzlz in -lidn" >&5 +echo "configure:10549: 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 @@ -10774,7 +10553,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:10568: \"$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 @@ -10806,9 +10585,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:10810: checking for IDNA_USE_STD3_ASCII_RULES" >&5 +echo "configure:10589: checking for IDNA_USE_STD3_ASCII_RULES" >&5 cat > conftest.$ac_ext < EOF @@ -10857,17 +10636,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:10861: checking for unicode/unorm.h" >&5 +echo "configure:10640: 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:10871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10650: \"$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* @@ -10886,17 +10665,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:10890: checking for unicode/ustring.h" >&5 +echo "configure:10669: 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:10900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10679: \"$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* @@ -10922,12 +10701,12 @@ EOF EOF echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:10926: checking for unorm_normalize in libicuuc" >&5 +echo "configure:10705: checking for unorm_normalize in libicuuc" >&5 cf_save_LIBS="$LIBS" cf_try_icuuc="no" LIBS="$LIBS -licuuc" cat > conftest.$ac_ext < int main() { @@ -10937,7 +10716,7 @@ int main() { needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); ; return 0; } EOF -if { (eval echo configure:10941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -10956,17 +10735,17 @@ rm -f conftest* echo "$ac_t""$cf_try_icuuc" 1>&6 ac_safe=`echo "unicode/ubidi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ubidi.h""... $ac_c" 1>&6 -echo "configure:10960: checking for unicode/ubidi.h" >&5 +echo "configure:10739: checking for unicode/ubidi.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:10970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10749: \"$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* @@ -11013,24 +10792,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:10803: \"$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:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -11059,16 +10838,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:11063: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:10842: 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:10851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -11095,7 +10874,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:11099: checking for initscr in -lcurses" >&5 +echo "configure:10878: 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 @@ -11103,7 +10882,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:10897: \"$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 @@ -11135,7 +10914,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11139: checking for tgoto in -ltermcap" >&5 +echo "configure:10918: 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 @@ -11143,7 +10922,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:10937: \"$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 @@ -11187,11 +10966,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:11191: checking if we should include termcap.h" >&5 +echo "configure:10970: 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:10987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -11222,7 +11001,7 @@ EOF echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:11226: checking for term.h" >&5 +echo "configure:11005: 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 @@ -11235,7 +11014,7 @@ for cf_header in \ term.h do cat > conftest.$ac_ext < @@ -11244,7 +11023,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:11248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -11285,7 +11064,7 @@ esac echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:11289: checking if we should include curses.h or termcap.h" >&5 +echo "configure:11068: 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 @@ -11303,7 +11082,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:11094: \"$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 @@ -11324,7 +11103,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:11115: \"$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 @@ -11408,7 +11187,7 @@ esac echo $ac_n "checking declaration of tputs 3rd param""... $ac_c" 1>&6 -echo "configure:11412: checking declaration of tputs 3rd param" >&5 +echo "configure:11191: 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 @@ -11424,10 +11203,10 @@ for Q in int void; do for R in int char; do for S in "" const; do -echo "(line 11428) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "(line 11207) 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:11219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -11491,14 +11270,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:11281: \"$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 @@ -11517,13 +11296,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:11521: checking if external errno is declared" >&5 +echo "configure:11300: 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:11319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -11564,13 +11343,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:11568: checking if external errno exists" >&5 +echo "configure:11347: 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:11363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_errno=yes else @@ -11612,12 +11391,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11616: checking for $ac_func" >&5 +echo "configure:11395: 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:11423: \"$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 @@ -11667,13 +11446,13 @@ else echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:11671: checking if external sys_nerr is declared" >&5 +echo "configure:11450: 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:11469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -11714,13 +11493,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:11718: checking if external sys_nerr exists" >&5 +echo "configure:11497: 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:11513: \"$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 @@ -11759,13 +11538,13 @@ fi echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:11763: checking if external sys_errlist is declared" >&5 +echo "configure:11542: 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:11561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -11806,13 +11585,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:11810: checking if external sys_errlist exists" >&5 +echo "configure:11589: 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:11605: \"$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 @@ -11916,12 +11695,12 @@ for ac_func in \ $cf_tc_funcs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11920: checking for $ac_func" >&5 +echo "configure:11699: 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:11727: \"$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 @@ -11970,12 +11749,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:11974: checking for flock" >&5 +echo "configure:11753: 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:11781: \"$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 @@ -12020,7 +11799,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:12024: checking for flock in -lbsd" >&5 +echo "configure:11803: 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 @@ -12028,7 +11807,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:11822: \"$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 @@ -12068,12 +11847,12 @@ fi echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:12072: checking for wide char and multibyte support" >&5 +echo "configure:11851: 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 @@ -12109,7 +11888,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:12113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -12119,7 +11898,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -12145,7 +11924,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:12149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=libutf8 else @@ -12179,9 +11958,9 @@ EOF echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:12183: checking if gettimeofday takes two arguments" >&5 +echo "configure:11962: checking if gettimeofday takes two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_gettimeofday_2args=yes else @@ -12212,12 +11991,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:12216: checking return type of signal handlers" >&5 +echo "configure:11995: 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 @@ -12234,7 +12013,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:12238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -12254,7 +12033,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:12258: checking declaration of signal arguments" >&5 +echo "configure:12037: 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 @@ -12263,7 +12042,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -12271,7 +12050,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:12275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -12297,13 +12076,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:12301: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:12080: 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 < @@ -12312,7 +12091,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:12316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -12333,13 +12112,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:12337: checking if we have sigaction/related functions" >&5 +echo "configure:12116: 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:12140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_sigaction_funcs=yes else @@ -12379,7 +12158,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:12383: checking for fork" >&5 +echo "configure:12162: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12388,7 +12167,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:12181: \"$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 @@ -12420,12 +12199,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:12424: checking for memmove" >&5 +echo "configure:12203: 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:12231: \"$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 @@ -12467,12 +12246,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:12471: checking for bcopy" >&5 +echo "configure:12250: 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:12278: \"$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 @@ -12511,7 +12290,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:12515: checking if bcopy does overlapping moves" >&5 +echo "configure:12294: 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 @@ -12520,7 +12299,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:12316: \"$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 @@ -12571,9 +12350,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:12575: checking if select expects int * arguments" >&5 +echo "configure:12354: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -12593,7 +12372,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:12597: checking whether closedir returns void" >&5 +echo "configure:12376: 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 @@ -12601,13 +12380,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:12611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12390: \"$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 @@ -12633,7 +12412,7 @@ fi # 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:12637: checking whether setvbuf arguments are reversed" >&5 +echo "configure:12416: 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 @@ -12641,7 +12420,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. */ @@ -12655,7 +12434,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:12659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12438: \"$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 @@ -12693,12 +12472,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12697: checking for $ac_func" >&5 +echo "configure:12476: 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:12504: \"$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 @@ -12748,13 +12527,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:12752: checking for type sigaction_t" >&5 +echo "configure:12531: 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 < @@ -12762,7 +12541,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:12766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -12782,13 +12561,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:12786: checking for nonconflicting termios.h" >&5 +echo "configure:12565: 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:12593: \"$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 @@ -12841,13 +12620,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:12845: checking for passwd.pw_gecos" >&5 +echo "configure:12624: 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 < @@ -12858,7 +12637,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:12862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -12878,13 +12657,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:12882: checking for tm.tm_gmtoff" >&5 +echo "configure:12661: 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:12687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -12924,7 +12703,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:12928: checking for long file names" >&5 +echo "configure:12707: 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 @@ -12972,17 +12751,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:12976: checking for $ac_hdr" >&5 +echo "configure:12755: 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:12986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12765: \"$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* @@ -13019,17 +12798,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:13023: checking for $ac_hdr" >&5 +echo "configure:12802: 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:13033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12812: \"$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* @@ -13059,17 +12838,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:13063: checking for $ac_hdr" >&5 +echo "configure:12842: 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:13073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12852: \"$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* @@ -13110,13 +12889,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:13114: checking for union wait" >&5 +echo "configure:12893: 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:12910: \"$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 @@ -13138,7 +12917,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:12936: \"$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 @@ -13178,7 +12957,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:13182: checking if the system function returns usable child-status" >&5 +echo "configure:12961: 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 @@ -13187,7 +12966,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -13220,7 +12999,7 @@ int main() } EOF -if { (eval echo configure:13224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13003: \"$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 @@ -13231,11 +13010,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:13018: \"$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 @@ -13278,13 +13057,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:13282: checking for obsolete/broken version of ncurses" >&5 +echo "configure:13061: 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 < @@ -13298,7 +13077,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -13323,13 +13102,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:13327: checking if curses supports color attributes" >&5 +echo "configure:13106: 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 < @@ -13344,7 +13123,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:13348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -13395,7 +13174,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:13399: checking for redefinable signal constants" >&5 +echo "configure:13178: 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 @@ -13407,7 +13186,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:13217: \"$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 @@ -13460,13 +13239,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:13464: checking for ANSI qsort" >&5 +echo "configure:13243: 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:13261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -13506,7 +13285,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:13510: checking if application can dump core" >&5 +echo "configure:13289: 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 @@ -13515,7 +13294,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -13556,7 +13335,7 @@ int main() #endif } EOF -if { (eval echo configure:13560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13339: \"$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 @@ -13602,18 +13381,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:13606: checking for missing "${ac_func}" extern" >&5 +echo "configure:13385: 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 13612) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13391) 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:13410: \"$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 @@ -13635,7 +13414,7 @@ if { (eval echo configure:13631: \"$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:13428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13694,18 +13473,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:13698: checking for missing "${ac_func}" extern" >&5 +echo "configure:13477: 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 13704) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13483) 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:13502: \"$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 @@ -13727,7 +13506,7 @@ if { (eval echo configure:13723: \"$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:13520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13784,18 +13563,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:13788: checking for missing "${ac_func}" extern" >&5 +echo "configure:13567: 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 13794) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13573) 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:13592: \"$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 @@ -13817,7 +13596,7 @@ if { (eval echo configure:13813: \"$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:13610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13925,18 +13704,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:13929: checking for missing "${ac_func}" extern" >&5 +echo "configure:13708: 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 13935) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13714) 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:13733: \"$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 @@ -13958,7 +13737,7 @@ if { (eval echo configure:13954: \"$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:13751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14012,18 +13791,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:14016: checking for missing "${ac_func}" extern" >&5 +echo "configure:13795: 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 14022) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13801) 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:13820: \"$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 @@ -14045,7 +13824,7 @@ if { (eval echo configure:14041: \"$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:13838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14102,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:14106: 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 14112) 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 @@ -14135,7 +13914,7 @@ if { (eval echo configure:14131: \"$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 @@ -14183,7 +13962,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:14187: checking for working TIOCGWINSZ" >&5 +echo "configure:13966: 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 @@ -14194,7 +13973,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:14002: \"$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 @@ -14266,7 +14045,7 @@ esac # 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:14270: checking for $ac_word" >&5 +echo "configure:14049: 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 @@ -14293,21 +14072,255 @@ 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:14301: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +# 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:14079: 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:14091: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_alloca_h=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 +if test $ac_cv_header_alloca_h = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA_H 1 +EOF + +fi + +echo $ac_n "checking for alloca""... $ac_c" 1>&6 +echo "configure:14112: 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 < +# define alloca _alloca +# else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +int main() { +char *p = (char *) alloca(1); +; return 0; } +EOF +if { (eval echo configure:14145: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_alloca_works=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 +if test $ac_cv_func_alloca_works = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA 1 +EOF + +fi + +if test $ac_cv_func_alloca_works = no; then + # The SVR3 libPW and SVR4 libucb both contain incompatible functions + # that cause trouble. Some versions do not even contain alloca or + # contain a buggy version. If you still want to use their alloca, + # use ar to extract alloca.o from them instead of compiling alloca.c. + ALLOCA=alloca.${ac_objext} + cat >> confdefs.h <<\EOF +#define C_ALLOCA 1 +EOF + + +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +echo "configure:14177: 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 <&5 | + egrep "webecray" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_os_cray=yes +else + rm -rf conftest* + ac_cv_os_cray=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_os_cray" 1>&6 +if test $ac_cv_os_cray = yes; then +for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14207: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:14235: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <&6 +fi + +done +fi + +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +echo "configure:14262: 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 + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else + cat > conftest.$ac_ext < addr) ? 1 : -1; +} +main () +{ + exit (find_stack_direction() < 0); +} +EOF +if { (eval echo configure:14289: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_c_stack_direction=-1 +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 +cat >> confdefs.h <&6 +echo "configure:14314: 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:14311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14324: \"$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* @@ -14336,12 +14349,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14340: checking for $ac_func" >&5 +echo "configure:14353: 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:14381: \"$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 @@ -14389,7 +14402,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:14393: checking for working mmap" >&5 +echo "configure:14406: 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 @@ -14397,7 +14410,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:14554: \"$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 @@ -14561,12 +14574,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:14565: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:14578: 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 < @@ -14628,17 +14641,17 @@ 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:14632: checking for $ac_hdr" >&5 +echo "configure:14645: 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:14642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14655: \"$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* @@ -14669,12 +14682,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:14673: checking for $ac_func" >&5 +echo "configure:14686: 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:14714: \"$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 @@ -14738,7 +14751,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:14742: checking for iconv" >&5 +echo "configure:14755: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14746,7 +14759,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -14756,7 +14769,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:14760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -14768,7 +14781,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -14778,7 +14791,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:14782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14795: \"$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 @@ -14799,13 +14812,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:14803: checking for iconv declaration" >&5 +echo "configure:14816: 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 < @@ -14824,7 +14837,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -14853,19 +14866,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:14857: checking for nl_langinfo and CODESET" >&5 +echo "configure:14870: 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:14869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -14888,19 +14901,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:14892: checking for LC_MESSAGES" >&5 +echo "configure:14905: 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:14904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14917: \"$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 @@ -14921,7 +14934,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:14925: checking whether NLS is requested" >&5 +echo "configure:14938: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -14945,7 +14958,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:14949: checking whether included gettext is requested" >&5 +echo "configure:14962: 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 @@ -14966,17 +14979,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:14970: checking for libintl.h" >&5 +echo "configure:14983: 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:14980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14993: \"$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* @@ -14993,12 +15006,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:14997: checking for GNU gettext in libc" >&5 +echo "configure:15010: 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; @@ -15007,7 +15020,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:15011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15024: \"$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 @@ -15023,14 +15036,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:15027: checking for GNU gettext in libintl" >&5 +echo "configure:15040: 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; @@ -15039,7 +15052,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:15043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15056: \"$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 @@ -15072,12 +15085,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15076: checking for $ac_func" >&5 +echo "configure:15089: 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:15117: \"$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 @@ -15130,7 +15143,7 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15134: checking for $ac_word" >&5 +echo "configure:15147: 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 @@ -15164,7 +15177,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:15168: checking for $ac_word" >&5 +echo "configure:15181: 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 @@ -15202,7 +15215,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15206: checking for $ac_word" >&5 +echo "configure:15219: 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 @@ -15256,7 +15269,7 @@ fi set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15260: checking for $ac_word" >&5 +echo "configure:15273: 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 @@ -15290,7 +15303,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:15294: checking for $ac_word" >&5 +echo "configure:15307: 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 @@ -15327,7 +15340,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15331: checking for $ac_word" >&5 +echo "configure:15344: 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 @@ -15400,7 +15413,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:15404: checking for $ac_word" >&5 +echo "configure:15417: 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 @@ -15433,7 +15446,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:15437: checking version of bison" >&5 +echo "configure:15450: 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;; @@ -15481,7 +15494,7 @@ echo "configure:15437: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:15485: checking for catalogs to be installed" >&5 +echo "configure:15498: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -15531,153 +15544,637 @@ MSG_DIR_MAKE= SUB_MAKEFILE= -cf_makefile=Makefile +cf_makefile=Makefile + +use_our_messages=no +if test "$USE_NLS" = yes ; then +if test -d $srcdir/po ; then +echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6 +echo "configure:15554: checking if we should use included message-library" >&5 + +# Check whether --enable-included-msgs or --disable-included-msgs was given. +if test "${enable_included_msgs+set}" = set; then + enableval="$enable_included_msgs" + use_our_messages=$enableval +else + use_our_messages=yes +fi + +fi +echo "$ac_t""$use_our_messages" 1>&6 +fi + +MSG_DIR_MAKE="#" +if test "$use_our_messages" = yes +then + SUB_MAKEFILE="$SUB_MAKEFILE $srcdir/po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn" + MSG_DIR_MAKE= +fi + + + + + +if test "$USE_INCLUDED_LIBINTL" = yes ; then + if test "$nls_cv_force_use_gnu_gettext" = yes ; then + : + elif test "$nls_cv_use_gnu_gettext" = yes ; then + : + else + INTLDIR_MAKE="#" + fi + if test -z "$INTLDIR_MAKE"; then + cat >> confdefs.h <<\EOF +#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="#" + if test "$USE_NLS" = yes ; then + for ac_hdr in libintl.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:15609: 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:15619: \"$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 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + fi +fi + +if test -z "$INTLDIR_MAKE" ; then + CPPFLAGS="-I../intl $CPPFLAGS" +fi + +if test "$BUILD_INCLUDED_LIBINTL" = yes ; then + GT_YES="#" + GT_NO= +else + GT_YES= + GT_NO="#" +fi + + + + + + + +if test "$USE_INCLUDED_LIBINTL" = yes ; then + if test "$nls_cv_force_use_gnu_gettext" = yes ; then + cat >> confdefs.h <<\EOF +#define HAVE_GETTEXT 1 +EOF + + elif test "$nls_cv_use_gnu_gettext" = yes ; then + cat >> confdefs.h <<\EOF +#define HAVE_GETTEXT 1 +EOF + + fi + if test -n "$nls_cv_header_intl" ; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBINTL_H 1 +EOF + + fi +fi + +LIBS="$LIBS $LIBICONV" + +### check for alloca (required for bison and/or intl/*) +case "$YACC" in +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:15694: 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:15706: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_alloca_h=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 +if test $ac_cv_header_alloca_h = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA_H 1 +EOF + +fi + +echo $ac_n "checking for alloca""... $ac_c" 1>&6 +echo "configure:15727: 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 < +# define alloca _alloca +# else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif +#endif + +int main() { +char *p = (char *) alloca(1); +; return 0; } +EOF +if { (eval echo configure:15760: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_alloca_works=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 +if test $ac_cv_func_alloca_works = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA 1 +EOF + +fi + +if test $ac_cv_func_alloca_works = no; then + # The SVR3 libPW and SVR4 libucb both contain incompatible functions + # that cause trouble. Some versions do not even contain alloca or + # contain a buggy version. If you still want to use their alloca, + # use ar to extract alloca.o from them instead of compiling alloca.c. + ALLOCA=alloca.${ac_objext} + cat >> confdefs.h <<\EOF +#define C_ALLOCA 1 +EOF + + +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +echo "configure:15792: 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 <&5 | + egrep "webecray" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_os_cray=yes +else + rm -rf conftest* + ac_cv_os_cray=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_os_cray" 1>&6 +if test $ac_cv_os_cray = yes; then +for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:15822: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:15850: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <&6 +fi + +done +fi + +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +echo "configure:15877: 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 + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else + cat > conftest.$ac_ext < addr) ? 1 : -1; +} +main () +{ + exit (find_stack_direction() < 0); +} +EOF +if { (eval echo configure:15904: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_c_stack_direction=-1 +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 +cat >> confdefs.h <&6 +echo "configure:15932: 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:15944: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_alloca_h=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 +if test $ac_cv_header_alloca_h = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA_H 1 +EOF + +fi -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:15541: checking if we should use included message-library" >&5 - -# Check whether --enable-included-msgs or --disable-included-msgs was given. -if test "${enable_included_msgs+set}" = set; then - enableval="$enable_included_msgs" - use_our_messages=$enableval +echo $ac_n "checking for alloca""... $ac_c" 1>&6 +echo "configure:15965: 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 - use_our_messages=yes -fi + cat > conftest.$ac_ext < +# define alloca _alloca +# else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif +#endif +int main() { +char *p = (char *) alloca(1); +; return 0; } +EOF +if { (eval echo configure:15998: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_func_alloca_works=no fi -echo "$ac_t""$use_our_messages" 1>&6 +rm -f conftest* fi -MSG_DIR_MAKE="#" -if test "$use_our_messages" = yes -then - SUB_MAKEFILE="$SUB_MAKEFILE $srcdir/po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn" - MSG_DIR_MAKE= -fi +echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 +if test $ac_cv_func_alloca_works = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA 1 +EOF +fi +if test $ac_cv_func_alloca_works = no; then + # The SVR3 libPW and SVR4 libucb both contain incompatible functions + # that cause trouble. Some versions do not even contain alloca or + # contain a buggy version. If you still want to use their alloca, + # use ar to extract alloca.o from them instead of compiling alloca.c. + ALLOCA=alloca.${ac_objext} + cat >> confdefs.h <<\EOF +#define C_ALLOCA 1 +EOF +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +echo "configure:16030: 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 <> confdefs.h <<\EOF -#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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "webecray" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_os_cray=yes else - INTLDIR_MAKE="#" - if test "$USE_NLS" = yes ; then - for ac_hdr in libintl.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15596: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + rm -rf conftest* + ac_cv_os_cray=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_os_cray" 1>&6 +if test $ac_cv_os_cray = yes; then +for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:16060: 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 < +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15606: \"$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 +if { (eval echo configure:16088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_func_$ac_func=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" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 fi -done - - fi -fi -if test -z "$INTLDIR_MAKE" ; then - CPPFLAGS="-I../intl $CPPFLAGS" +done fi -if test "$BUILD_INCLUDED_LIBINTL" = yes ; then - GT_YES="#" - GT_NO= +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +echo "configure:16115: 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 - GT_YES= - GT_NO="#" -fi - - - - - - - -if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = yes ; then - cat >> confdefs.h <<\EOF -#define HAVE_GETTEXT 1 + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else + cat > conftest.$ac_ext < addr) ? 1 : -1; +} +main () +{ + exit (find_stack_direction() < 0); +} EOF +if { (eval echo configure:16142: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_c_stack_direction=-1 +fi +rm -fr conftest* +fi - elif test "$nls_cv_use_gnu_gettext" = yes ; then - cat >> confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF +fi - fi - if test -n "$nls_cv_header_intl" ; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBINTL_H 1 +echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 +cat >> confdefs.h <&6 -echo "configure:15679: checking for $cf_hdr" >&5 +echo "configure:16176: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -15685,7 +16182,7 @@ echo "configure:15679: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16186: \"$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* @@ -15711,13 +16208,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:15715: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:16212: 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:16235: \"$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 @@ -15762,7 +16259,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:15766: checking for X" >&5 +echo "configure:16263: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -15825,12 +16322,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:15834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16331: \"$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* @@ -15899,14 +16396,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:16407: \"$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. @@ -16006,7 +16503,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:16010: checking for open in -lc_s" >&5 +echo "configure:16507: 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 @@ -16014,7 +16511,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:16526: \"$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 @@ -16042,7 +16539,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:16046: checking for gethostname in -lbsd" >&5 +echo "configure:16543: 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 @@ -16050,7 +16547,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:16562: \"$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 @@ -16078,7 +16575,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:16082: checking for gethostname in -lnsl_s" >&5 +echo "configure:16579: 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 @@ -16086,7 +16583,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:16598: \"$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 @@ -16114,7 +16611,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:16118: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:16615: 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 @@ -16122,7 +16619,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:16634: \"$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 @@ -16150,7 +16647,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:16154: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:16651: 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 @@ -16158,7 +16655,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:16670: \"$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 @@ -16210,7 +16707,7 @@ fi ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:16214: checking for socket in -lsocket" >&5 +echo "configure:16711: 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 @@ -16218,7 +16715,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:16730: \"$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 @@ -16257,7 +16754,7 @@ else fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:16261: checking for gethostname in -lnsl" >&5 +echo "configure:16758: 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 @@ -16265,7 +16762,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:16777: \"$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 @@ -16327,17 +16824,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:16331: checking whether -R must be followed by a space" >&5 +echo "configure:16828: 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:16838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -16353,14 +16850,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:16861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -16392,7 +16889,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:16396: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:16893: 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 @@ -16400,7 +16897,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:16912: \"$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 @@ -16433,7 +16930,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:16437: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:16934: 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 @@ -16441,7 +16938,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:16953: \"$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,12 +16978,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:16485: checking for gethostbyname" >&5 +echo "configure:16982: 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:17010: \"$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 @@ -16530,7 +17027,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:16534: checking for gethostbyname in -lnsl" >&5 +echo "configure:17031: 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 @@ -16538,7 +17035,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:17050: \"$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 @@ -16579,12 +17076,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:16583: checking for connect" >&5 +echo "configure:17080: 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:17108: \"$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 @@ -16628,7 +17125,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:16632: checking for connect in -lsocket" >&5 +echo "configure:17129: 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 @@ -16636,7 +17133,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:17148: \"$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 @@ -16671,12 +17168,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:16675: checking for remove" >&5 +echo "configure:17172: 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:17200: \"$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 @@ -16720,7 +17217,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:16724: checking for remove in -lposix" >&5 +echo "configure:17221: 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 @@ -16728,7 +17225,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:17240: \"$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 @@ -16763,12 +17260,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:16767: checking for shmat" >&5 +echo "configure:17264: 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:17292: \"$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 @@ -16812,7 +17309,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:16816: checking for shmat in -lipc" >&5 +echo "configure:17313: 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 @@ -16820,7 +17317,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:17332: \"$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 @@ -16864,7 +17361,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:16868: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:17365: 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 @@ -16872,7 +17369,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:17384: \"$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 @@ -16949,14 +17446,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:16960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -16974,7 +17471,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:16978: checking for XOpenDisplay in -lX11" >&5 +echo "configure:17475: 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 @@ -16982,7 +17479,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:17494: \"$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 @@ -17014,7 +17511,7 @@ else fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:17018: checking for XtAppInitialize in -lXt" >&5 +echo "configure:17515: 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 @@ -17022,7 +17519,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:17534: \"$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 @@ -17101,14 +17598,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:17112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17161,7 +17658,7 @@ fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:17165: checking for XextCreateExtension in -lXext" >&5 +echo "configure:17662: 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 @@ -17169,7 +17666,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:17681: \"$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 @@ -17219,13 +17716,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:17223: checking for $cf_test in $cf_path" >&5 +echo "configure:17720: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:17226: checking for $cf_test" >&5 +echo "configure:17723: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -17234,7 +17731,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -17281,23 +17778,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:17285: checking for $cf_lib in $cf_path" >&5 +echo "configure:17782: 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:17289: checking for $cf_test in $cf_lib" >&5 +echo "configure:17786: 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:17798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -17376,14 +17873,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:17387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17401,7 +17898,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:17405: checking for XOpenDisplay in -lX11" >&5 +echo "configure:17902: 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 @@ -17409,7 +17906,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:17921: \"$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 @@ -17441,14 +17938,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:17445: checking for XCurses library" >&5 +echo "configure:17942: 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 < @@ -17458,7 +17955,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:17462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else @@ -17762,8 +18259,8 @@ s%@EXTRAOBJS@%$EXTRAOBJS%g 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%@ALLOCA@%$ALLOCA%g s%@GLIBC21@%$GLIBC21%g s%@LIBICONV@%$LIBICONV%g s%@USE_NLS@%$USE_NLS%g diff -Nurp tin-1.7.5/configure.in tin-1.7.6/configure.in --- tin-1.7.5/configure.in 2004-08-20 10:35:09.000000000 +0200 +++ tin-1.7.6/configure.in 2004-09-06 11:07:20.000000000 +0200 @@ -2,7 +2,7 @@ dnl Project : tin - a Usenet reader dnl Module : configure.in dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2004-06-06 +dnl Updated : 2004-08-20 dnl Notes : dnl dnl Copyright (c) 1995-2004 Thomas E. Dickey @@ -41,7 +41,7 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=1.7.5 +VERSION=1.7.6 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -623,6 +623,14 @@ CF_ARG_ENABLE(broken-listgroup-fix, [AC_DEFINE(BROKEN_LISTGROUP)]) AC_MSG_RESULT($enableval) +### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work +AC_MSG_CHECKING(whether to ignore system()s return value) +CF_ARG_ENABLE(broken-system-fix, + [ --enable-broken-system-fix + ignore system()s return value], + [AC_DEFINE(IGNORE_SYSTEM_STATUS)]) +AC_MSG_RESULT($enableval) + ### checks for the location of the system-wide default setting file AC_MSG_CHECKING(for directory containing tin.defaults file) CF_WITH_PATH(defaults-dir, @@ -668,16 +676,6 @@ CF_CPP_EXPANDS CF_CPP_CONCATS CF_CHECK_NESTED_PARAMS -### check for alloca (only required for bison) -case "$YACC" in -bison*) - AC_FUNC_ALLOCA - ;; -*) - ALLOCA="" - AC_SUBST(ALLOCA) - ;; -esac ### Checks for header files. AC_HEADER_STDC @@ -1184,6 +1182,24 @@ esac CF_BUNDLED_INTL LIBS="$LIBS $LIBICONV" +### check for alloca (required for bison and/or intl/*) +case "$YACC" in +bison*) + AC_FUNC_ALLOCA + ;; +*) + case "$USE_INCLUDED_LIBINTL" in + yes) + AC_FUNC_ALLOCA + ;; + no) + ALLOCA="" + AC_SUBST(ALLOCA) + ;; + esac + ;; +esac + CF_CHECK_HEADERS(iconv.h) AC_MSG_CHECKING(for iconv_open() //TRANSLIT extension) AC_TRY_RUN([ diff -Nurp tin-1.7.5/doc/CHANGES tin-1.7.6/doc/CHANGES --- tin-1.7.5/doc/CHANGES 2004-08-20 10:35:10.000000000 +0200 +++ tin-1.7.6/doc/CHANGES 2004-09-06 10:37:55.000000000 +0200 @@ -1,3 +1,46 @@ +-- 1.7.6 release 20040906 "Baleshare" -- + +U030) Dennis Grevenstein + Urs Janssen + ADD. --enable-broken-system-fix + FIX. configure[.in], autoconf.hin, misc.c + +U029) Urs Janssen + ADD. config.guess, config.sub update + ADD. warn about attributes outside scope + ADD. move .article to dead.article if $EDITOR dies + ADD. tweak URL_REGEX, NEWS_REGEX + ADD. also check for alloca if we're going to build intl/* + BUG. memleak in wstrunc() + BUG. repost to a different group didn't restore the current group + pointer + FIX. configure[.in], extern.h, tin.h, art.c, attrib.c, charset.c, cook.c + curses.c, lang.c, post.c, string.c, xref.c, config.guess + config.sub + + 025) Michael Bienia + BUG. ensure CURR_GROUP always points to current group even for + non interactive group-processing + FIX. art.c, save.c + +U028) Michael Bienia + BUG. missing string termination + ADD. allow to hide options in the 'M'enu based on the value of other + options + ADD. crsr-up/dowm in option-list + ADD. remove CURR_GROUP dependecy from sort functions + ADD. wcspart() now mallocs the needed space on its own + ADD. kill/hot-menu "Kill/Select pattern scope" now walks up the + hierarchie level + ADD. move '-V' code into a function, use it inside mail_bug_report() + ADD. use mark_screen() also in GROUP_LEVEL and THREAD_LEVEL + ADD. move the options menu code from config.c to options_menu.c + REM. draw_line() + FIX. Makefile[.in], extern.h, proto.h, tcurses.c, tin.h, art.c + charset.c, config.c, filter.c, getline.c, group.c, init.c, lang.c + main.c, misc.c, options_menu.c, post.c, prompt.c, rfc2046.c + screen.c, select.c, string.c, thread.c + -- 1.7.5 release 20040615 "Gighay" -- 024) Herbert Xu +Tru64, AIX, SINIX, UXP/V, SUPER-UX, QNX, GNU Hurd, DG/UX, SEIUX, Openstep, +MiNT and Cygwin. For a detailed list see diff -Nurp tin-1.7.5/doc/TODO tin-1.7.6/doc/TODO --- tin-1.7.5/doc/TODO 2004-08-20 10:35:10.000000000 +0200 +++ tin-1.7.6/doc/TODO 2004-09-04 23:13:57.000000000 +0200 @@ -19,9 +19,6 @@ o Changes to int/bool tinrc variables i o 'C'atchup in pager is still not correct (we don't ever enter the next group) [20030515 Urs Janssen ] -o 'article loss' reported in - - o piping/printing articles grabbles screen [20030501 Urs Janssen ] @@ -106,12 +103,6 @@ o mailers other than sendmail (f.e. elm New features ------------ -o make kill/hot-menu "Kill/Select pattern scope" walk up the hierarchie - level instead of a 3way toggle. - (foo.bar.baz.ex.boo -> foo.bar.baz.ex.* -> foo.bar.baz.* foo.bar.* -> - foo.bar.* -> foo.* -> *) - [20040423 Urs Janssen ] - o add TLS support (see draft-ietf-nntpext-tls-nntp-01.txt; might be useful) @@ -145,9 +136,7 @@ o allow bold, underline, italic, ... as (see also <20020416202232.A4575@bloatware.reston01.va.comcast.net>) [20030218 Serge Matveev ] -o hierarchical 'M'enu, e.g. hide all color_* options as long as - use_color is turned off, put all art_marked_*into a 'submenu', ... - (currently the menu is statically build on compile time) +o hierarchical 'M'enu, e.g. put all art_marked_*into a 'submenu', ... [20020322 Urs Janssen ] o add a postponed 'browser' (store postponed arts in MH or maildir @@ -378,10 +367,11 @@ o Merge the selection code with the ran of picking articles with similar goals is wasteful. [Jason Faultless ] -o add check for libbzip2/zlib (>=1.1.4) - (, ) and - option to write/read {g,b}zipped local overviews - zlib, libbzip2 might also be used for post-processing. +o add check for libbzip2/zlib (>=1.1.4)/[mini]lzo + (, , + ) and + option to write/read {g,b,l}zipped local overviews + zlib, libbzip2 lzo might also be used for post-processing. o add check for GPGME () and if found use it for pgp actions. @@ -643,6 +633,11 @@ o tin.defaults could use more documenta Not yet classified ------------------ +o there is no command to undo a range ('#') selection + +o 'article loss' reported in + + o should 'tin -z foo.bar' only start up if there is any unread news in foo.bar? [20040325 Urs Janssen ] @@ -714,7 +709,9 @@ o remove tinrc.strip_blanks? IMHO it's [20020305 Urs Janssen ] o doesn't handle symlinks for .oldnewsrc - (see <20021003021508.GA28021@akk10.akk.uni-karlsruhe.de> for details, urs) + (see <20021003021508.GA28021@akk10.akk.uni-karlsruhe.de> for details, urs. + if we're going to 'fix' this we must be careful to avoid symlink + attacks () [20020627 Jeff Sheinberg ] o cleanup main.c/init_selfinfo() diff -Nurp tin-1.7.5/doc/WHATSNEW tin-1.7.6/doc/WHATSNEW --- tin-1.7.5/doc/WHATSNEW 2004-08-20 10:35:10.000000000 +0200 +++ tin-1.7.6/doc/WHATSNEW 2004-08-20 15:16:16.000000000 +0200 @@ -16,6 +16,8 @@ New features . x_headers can take a command which generates the header(s). See tin(5). +. mime_forward (message/rfc822) attributes option + Retired Features ---------------- . AmigaOS support diff -Nurp tin-1.7.5/doc/tin.1 tin-1.7.6/doc/tin.1 --- tin-1.7.5/doc/tin.1 2004-08-20 10:35:10.000000000 +0200 +++ tin-1.7.6/doc/tin.1 2004-09-06 10:39:47.000000000 +0200 @@ -3,13 +3,13 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2004-05-31 +.\" Updated : 2004-09-06 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature .\" .\" -.TH tin 1 "May 31st, 2004" "1.7.5" "A Usenet newsreader" +.TH tin 1 "September 6th, 2004" "1.7.6" "A Usenet newsreader" .\" .\" .SH NAME @@ -3166,9 +3166,11 @@ ftp://ftp.csx.cam.ac.uk/pub/software/pro .\" .\" .SH BUGS -\fBCNews\fP NNTPd and +\fBCNews\fP NNTPd, .BR noffle (1) -(<= V1.0-pre5) can't handle simultaneous GROUP commands. If you run into +(<= V1.0-pre5) and +.BR NewsCache +(<= V1.1.91) can't handle simultaneous GROUP commands. If you run into 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. diff -Nurp tin-1.7.5/doc/tin.5 tin-1.7.6/doc/tin.5 --- tin-1.7.5/doc/tin.5 2004-08-20 10:35:10.000000000 +0200 +++ tin-1.7.6/doc/tin.5 2004-09-06 10:39:38.000000000 +0200 @@ -2,10 +2,10 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2004-05-31 +.\" Updated : 2004-09-06 .\" Notes : needs a some work .\" -.TH tin 5 "May 31st, 2004" "1.7.5" "A Usenet newsreader" +.TH tin 5 "September 6th, 2004" "1.7.6" "A Usenet newsreader" .SH NAME tin, rtin \- related files diff -Nurp tin-1.7.5/include/autoconf.hin tin-1.7.6/include/autoconf.hin --- tin-1.7.5/include/autoconf.hin 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/include/autoconf.hin 2004-08-24 00:32:43.000000000 +0200 @@ -3,7 +3,7 @@ * Module : autoconf.hin * Author : Thomas Dickey * Created : 1995-08-24 - * Updated : 2004-06-06 + * Updated : 2004-08-20 * Notes : #include files, #defines & struct's * * Copyright (c) 1995-2004 Thomas Dickey @@ -596,6 +596,11 @@ */ # undef BROKEN_LISTGROUP +/* + * on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work + */ +# undef IGNORE_SYSTEM_STATUS + # undef HAVE_COFFEE /* diff -Nurp tin-1.7.5/include/extern.h tin-1.7.6/include/extern.h --- tin-1.7.5/include/extern.h 2004-08-20 10:35:10.000000000 +0200 +++ tin-1.7.6/include/extern.h 2004-09-03 17:31:01.000000000 +0200 @@ -3,7 +3,7 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-06-06 + * Updated : 2004-09-03 * Notes : * * Copyright (c) 1997-2004 Iain Lea @@ -972,6 +972,9 @@ extern constext txt_reading_newsrc[]; #ifdef NNTP_ABLE extern constext txt_reconnect_to_news_server[]; #endif /* NNTP_ABLE */ +#ifdef HAVE_GETTIMEOFDAY + extern constext txt_remaining[]; +#endif /* HAVE_GETTIMEOFDAY */ extern constext txt_remove_bogus[]; extern constext txt_rename_error[]; extern constext txt_reply_to_author[]; diff -Nurp tin-1.7.5/include/policy.h tin-1.7.6/include/policy.h --- tin-1.7.5/include/policy.h 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/include/policy.h 2004-08-20 10:30:48.000000000 +0200 @@ -220,11 +220,11 @@ * .cs Serbia and Montenegro * .eu European Union (planned for 2004-11) * - * 'expireing' TLDs: + * xccTLDs: * .gb United Kingdom, use .uk - *(.hk Hong Kong, now .cn) + * .hk Hong Kong, now .cn * .su former USSR, now .ru - *(.yu former Yugoslavia) + * .yu former Yugoslavia */ static char gnksa_country_codes[26*26] = { @@ -278,7 +278,11 @@ static const char *gnksa_domain_list[] = "info", /* Unrestricted use */ "name", /* For registration by individuals */ "museum", /* Museums */ - /* 3 more gTLDs to come in 2004 (.travel is likely to be one of them) */ + /* + * more gTLDs to come in 2004, proposed are: + * .asia .cat .jobs .mail .mobi + * .post .tel .travel .xxx + */ # if 0 /* $DEAD */ "uucp", "bitnet", diff -Nurp tin-1.7.5/include/proto.h tin-1.7.6/include/proto.h --- tin-1.7.5/include/proto.h 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/include/proto.h 2004-09-05 16:06:12.000000000 +0200 @@ -3,7 +3,7 @@ * Module : proto.h * Author : Urs Janssen * Created : - * Updated : 2004-06-12 + * Updated : 2004-09-05 * Notes : * * Copyright (c) 1997-2004 Urs Janssen @@ -78,8 +78,8 @@ extern void write_attributes_file(const /* charset.c */ extern char *convert_to_printable(char *buf); +extern char *convert_body2printable(char* buf); extern t_bool is_art_tex_encoded(FILE *fp); -extern void convert_body2printable(char* buf); extern void convert_iso2asc(char *iso, char **asc_buffer, int *max_line_len, int t); extern void convert_tex2iso(char *from, char *to); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) @@ -95,11 +95,8 @@ extern void draw_pager_line(const char * /* config.c */ extern char **ulBuildArgv(char *cmd, int *new_argc); -extern char *fmt_option_prompt(char *dst, size_t len, t_bool editing, int option); extern char *quote_space_to_dash(char *str); extern const char *print_boolean(t_bool value); -extern int change_config_file(struct t_group *group); -extern int option_row(int option); extern t_bool match_boolean(char *line, const char *pat, t_bool *dst); extern t_bool match_integer(char *line, const char *pat, int *dst, int maxval); extern t_bool match_list(char *line, constext *pat, constext *const *table, size_t tablelen, int *dst); @@ -108,8 +105,6 @@ extern t_bool match_string(char *line, c extern t_bool read_config_file(char *file, t_bool global_file); extern void quote_dash_to_space(char *str); extern void read_server_config(void); -extern void refresh_config_page(int act_option); -extern void show_menu_help(const char *help_message); extern void write_config_file(char *file); /* cook.c */ @@ -208,7 +203,7 @@ extern void set_first_screen_item(void); extern int find_new_pos(int old_top, long old_artnum, int cur_pos); extern int group_page(struct t_group *group); extern void clear_note_area(void); -extern void mark_screen(int level, int screen_row, int screen_col, const char *value); +extern void mark_screen(int screen_row, int screen_col, const char *value); extern void pos_first_unread_thread(void); extern void show_group_page(void); @@ -287,10 +282,6 @@ extern void grp_del_mail_art(struct t_ar extern void write_mail_active_file(void); #endif /* HAVE_MH_MAIL_HANDLING */ -/* mimetypes.c */ -extern void lookup_mimetype(const char *ext, t_part *part); -extern t_bool lookup_extension(char *extension, size_t ext_len, const char *major, const char *minor); - /* main.c */ extern int main(int argc, char *argv[]); extern int read_cmd_line_groups(void); @@ -314,6 +305,10 @@ extern void *my_realloc1(const char *fil extern void init_screen_array(t_bool allocate); #endif /* !USE_CURSES */ +/* mimetypes.c */ +extern void lookup_mimetype(const char *ext, t_part *part); +extern t_bool lookup_extension(char *extension, size_t ext_len, const char *major, const char *minor); + /* misc.c */ extern char *buffer_to_ascii(char *c); extern char *escape_shell_meta(const char *source, int quote_area); @@ -336,6 +331,7 @@ extern int parse_from(const char *from, extern int strfmailer(const char *mail_prog, char *subject, char *to, const char *filename, char *dest, size_t maxsize, const char *format); extern int strfpath(const char *format, char *str, size_t maxsize, struct t_group *group); extern int strfquote(const char *group, int respnum, char *s, size_t maxsize, char *format); +extern int tin_version_info(FILE *fp); extern long file_mtime(const char *file); extern long file_size(const char *file); extern t_bool backup_file(const char *filename, const char *backupname); @@ -350,6 +346,7 @@ extern void cleanup_tmp_files(void); extern void copy_body(FILE *fp_ip, FILE *fp_op, char *prefix, char *initl, t_bool raw_data); extern void create_index_lock_file(char *the_lock_file); extern void dir_name(const char *fullpath, char *dir); +extern void draw_mark_selected(int i); extern void draw_percent_mark(long cur_num, long max_num); extern void get_author(t_bool thread, struct t_article *art, char *str, size_t len); extern void get_cwd(char *buf); @@ -362,9 +359,9 @@ extern void show_inverse_video_status(vo extern void strip_name(const char *from, char *address); extern void tin_done(int ret); extern void toggle_inverse_video(void); -#if defined(CHARSET_CONVERSION) || defined(HAVE_UNICODE_NORMALIZATION) +#if defined(CHARSET_CONVERSION) || (defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)) extern char *utf8_valid(char *line); -#endif /* CHARSET_CONVERSION || HAVE_UNICODE_NORMALIZATION */ +#endif /* CHARSET_CONVERSION || (MULTIBYTE_ABLE && !NO_LOCALE) */ #ifdef CHARSET_CONVERSION extern t_bool buffer_to_network(char *line, int mmnwcharset); #endif /* CHARSET_CONVERSION */ @@ -424,6 +421,15 @@ extern void u_put_server(const char *str extern int get_newsrcname(char *newsrc_name, const char *nntpserver_name); extern void get_nntpserver(char *nntpserver_name, char *nick_name); +/* options_menu.c */ +extern char *fmt_option_prompt(char *dst, size_t len, t_bool editing, int option); +extern int change_config_file(struct t_group *group); +extern int option_row(int option); +extern t_bool option_is_visible(int option); +extern void check_score_defaults(void); +extern void refresh_config_page(int act_option); +extern void show_menu_help(const char *help_message); + /* page.c */ extern int show_page(struct t_group *group, int respnum, int *threadnum); extern void display_info_page(int part); @@ -574,7 +580,6 @@ extern int search_body(struct t_group *g extern int add_my_group(const char *group, t_bool add); extern int choose_new_group(void); extern int skip_newgroups(void); -extern void draw_group_arrow(void); extern void selection_page(int start_groupnum, int num_cmd_line_groups); extern void show_selection_page(void); extern void toggle_my_groups(const char *group); @@ -639,8 +644,8 @@ extern void str_lwr(char *str); #endif /* !HAVE_STRRSTR */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) extern char *wchar_t2char(const wchar_t *wstr); - extern void wcspart(wchar_t *to, const wchar_t *from, int columns, int size_to, t_bool pad); extern wchar_t *char2wchar_t(const char *str); + extern wchar_t *wcspart(const wchar_t *wstr, int columns, t_bool pad); extern wchar_t *wstrunc(const wchar_t *wmessage, wchar_t *wbuf, size_t wbuf_len, int len); extern wchar_t *my_wcsdup(const wchar_t *wstr); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -688,7 +693,6 @@ extern int stat_thread(int n, struct t_a extern int which_response(int n); extern int which_thread(int n); extern int thread_page(struct t_group *group, int respnum, int thread_depth, t_pagerinfo *page); -extern void draw_line(int i, int magic); extern void fixup_thread(int respnum, t_bool redraw); /* version.c */ diff -Nurp tin-1.7.5/include/tcurses.h tin-1.7.6/include/tcurses.h --- tin-1.7.5/include/tcurses.h 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/include/tcurses.h 2004-08-20 10:30:48.000000000 +0200 @@ -3,7 +3,7 @@ * Module : tcurses.h * Author : Thomas Dickey * Created : 1997-03-02 - * Updated : 2004-01-20 + * Updated : 2004-07-19 * Notes : curses #include files, #defines & struct's * * Copyright (c) 1997-2004 Thomas Dickey @@ -164,7 +164,7 @@ extern void write_line(int row, char *bu # define my_flush() fflush(stdout) # define my_fflush(stream) fflush(stream) # define my_retouch() ClearScreen() -# define WriteLine(row,buffer) /*nothing*/ +# define WriteLine(row,buffer) MoveCursor(row, 0); my_fputs(buffer, stdout); # define HpGlitch(func) if (_hp_glitch) func diff -Nurp tin-1.7.5/include/tin.h tin-1.7.6/include/tin.h --- tin-1.7.5/include/tin.h 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/include/tin.h 2004-08-20 19:08:26.000000000 +0200 @@ -3,7 +3,7 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-06-06 + * Updated : 2004-08-20 * Notes : #include files, #defines & struct's * * Copyright (c) 1997-2004 Iain Lea , Rich Skrenta @@ -730,15 +730,15 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ */ #if 0 # if 0 /* this one is ok for IPv4 */ -# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/\\s]*(?::[^:@/\\s]*)?@)?(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))(?::\\d+)?(?:/[^)\\>\"\\s]*|$|(?=[)\\>\"\\s]))" +# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/\\s]*(?::[^:@/\\s]*)?@)?(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))(?::\\d+)?(?:/[^)\\]\\>\"\\s]*|$|(?=[)\\]\\>\"\\s]))" # else /* this one should be IPv6 safe - test me! */ -# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/\\s]*(?::[^:@/\\s]*)?@)?(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)|\\[(?:(?:[0-9A-F]{0,4}:){1,7}[0-9A-F]{1,4}|(?:[0-9A-F]{0,4}:){1,3}(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))\\])(?::\\d+)?(?:/[^)\\>\"\\s]*|$|(?=[)\\>\"\\s]))" +# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/\\s]*(?::[^:@/\\s]*)?@)?(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)|\\[(?:(?:[0-9A-F]{0,4}:){1,7}[0-9A-F]{1,4}|(?:[0-9A-F]{0,4}:){1,3}(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))\\])(?::\\d+)?(?:/[^)\\]\\>\"\\s]*|$|(?=[)\\]\\>\"\\s]))" # endif /* 0 */ #else /* the following should be IDN safe */ # if 0 /* this one is ok for IPv4 */ -# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/\\s]*(?::[^:@/\\s]*)?@)?(?:(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?|xn--[^\\W_](?:-(?!-)|[^\\W_]){1,57}[^\\W_])\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))(?::\\d+)?(?:/[^)\\>\"\\s]*|$|(?=[)\\>\"\\s]))" +# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/\\s]*(?::[^:@/\\s]*)?@)?(?:(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?|xn--[^\\W_](?:-(?!-)|[^\\W_]){1,57}[^\\W_])\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))(?::\\d+)?(?:/[^)\\]\\>\"\\s]*|$|(?=[)\\]\\>\"\\s]))" # else /* this one should be IPv6 safe - test me! */ -# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/\\s]*(?::[^:@/\\s]*)?@)?(?:(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?|xn--[^\\W_](?:-(?!-)|[^\\W_]){1,57}[^\\W_])\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)|\\[(?:(?:[0-9A-F]{0,4}:){1,7}[0-9A-F]{1,4}|(?:[0-9A-F]{0,4}:){1,3}(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))\\])(?::\\d+)?(?:/[^)\\>\"\\s]*|$|(?=[)\\>\"\\s]))" +# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/\\s]*(?::[^:@/\\s]*)?@)?(?:(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?|xn--[^\\W_](?:-(?!-)|[^\\W_]){1,57}[^\\W_])\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)|\\[(?:(?:[0-9A-F]{0,4}:){1,7}[0-9A-F]{1,4}|(?:[0-9A-F]{0,4}:){1,3}(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))\\])(?::\\d+)?(?:/[^)\\]\\>\"\\s]*|$|(?=[)\\]\\>\"\\s]))" # endif /* 0 */ #endif /* 0 */ /* @@ -750,7 +750,15 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ /* * case insensitive */ -#define NEWS_REGEX "\\b(?:s?news|nntp):[^\\s@]+[@.][^\\s@]+(?:$|(?=[\\s.><,\"/():]))\\b" +#if 1 /* complex */ +# define NEWS_REGEX "\\b(?:s?news|nntp):(?:(?:(?://(?:(?:[^\\W_](?:(?:-(?!-)|[^\\W_]){0,61}[^\\W_])?|xn--[^\\W_](?:-(?!-)|[^\\W_]){1,57}[^\\W_])\\.)+[a-z]{2,6}\\.?|localhost|(?:(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))(?::\\d+)?(?(?=[/])[^()\\^\\[\\]{}\\|\\x00-\\x1f\\x7f\\s\"<>'\\\\:,;]+|$))|[^\\^\\[\\]{}\\|\\x00-\\x1f\\x7f\\s<>\"():,;\\\\'/]+)\\b" +#else +# if 1 /* less complex */ +# define NEWS_REGEX "\\b(?:s?news|nntp):[^\\s\\*@>]+(?(?=[@])[^\\s\\*@<>()\",/]+|[^\\s\\*<>()\":,/]+)\\b" +# else +# define NEWS_REGEX "\\b(?:s?news|nntp):[^\\s@]+[@.][^\\s@]+(?:$|(?=[\\s.><,\"/():]))\\b" +# endif /* 1 */ +#endif /* 1 */ #if 0 /* not implemented */ /* * case insensitive @@ -1015,6 +1023,10 @@ enum { /* Line number (starting at 0) of 1st non-header data on the screen */ /* ie, size of header */ #define INDEX_TOP 2 +#define INDEX2LNUM(i) (INDEX_TOP + (i) % NOTESLINES) +#ifndef USE_CURSES +# define INDEX2SNUM(i) ((i) % NOTESLINES) +#endif /* !USE_CURSES */ #define GROUP_MATCH(s1, pat, case) (wildmat(s1, pat, case)) @@ -2197,11 +2209,11 @@ extern struct tm *localtime(time_t *); * __GNUC__ __GNUC_MINOR__ */ /* gcc-specific attributes */ -#if defined(__GNUC__) && !defined(__cplusplus) && !defined(__APPLE_CC__) +#if defined(__GNUC__) && !defined(__cplusplus) && !defined(__APPLE_CC__) && !defined(__NeXT__) # define UNUSED(x) x __attribute__((unused)) #else # define UNUSED(x) x -#endif /* __GNUC__ && !__cplusplus && !__APPLE_CC__ */ +#endif /* __GNUC__ && !__cplusplus && !__APPLE_CC__ && !__NeXT__ */ /* init_selfinfo() needs MM_CHARSET */ #ifndef MM_CHARSET diff -Nurp tin-1.7.5/include/version.h tin-1.7.6/include/version.h --- tin-1.7.5/include/version.h 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/include/version.h 2004-09-06 11:07:20.000000000 +0200 @@ -40,10 +40,10 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "1.7.5" +# define VERSION "1.7.6" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20040615" -# define RELEASENAME "Gighay" +# define RELEASEDATE "20040906" +# define RELEASENAME "Baleshare" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.7" # define ATTRIBUTES_VERSION "1.0.3" diff -Nurp tin-1.7.5/po/POTFILES.in tin-1.7.6/po/POTFILES.in --- tin-1.7.5/po/POTFILES.in 2004-08-20 10:35:17.000000000 +0200 +++ tin-1.7.6/po/POTFILES.in 2004-09-05 16:42:16.000000000 +0200 @@ -34,6 +34,7 @@ src/my_tmpfile.c src/newsrc.c src/nntplib.c src/nrctbl.c +src/options_menu.c src/page.c src/pgp.c src/plp_snprintf.c Binary files tin-1.7.5/po/de.gmo and tin-1.7.6/po/de.gmo differ diff -Nurp tin-1.7.5/po/de.po tin-1.7.6/po/de.po --- tin-1.7.5/po/de.po 2004-08-20 10:35:17.000000000 +0200 +++ tin-1.7.6/po/de.po 2004-09-06 10:42:12.000000000 +0200 @@ -5,8 +5,8 @@ # Christian Garbs , 2003 # msgid "" -msgstr "Project-Id-Version: tin 1.7.4\n" - "POT-Creation-Date: 2004-06-04 13:31+0200\n" +msgstr "Project-Id-Version: tin 1.7.6\n" + "POT-Creation-Date: 2004-09-06 10:40+0200\n" "PO-Revision-Date: 2003-03-13 04:15+0200\n" "Last-Translator: Sven Hartge , Kai Bojens " "\n" @@ -16,269 +16,269 @@ msgstr "Project-Id-Version: tin 1.7.4\n" "Content-Transfer-Encoding: 8bit\n" "Report-Msgid-Bugs-To: \n" -#: src/art.c:1430 +#: src/art.c:1447 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Fehlerhafter Overview-Datensatz (%d Felder) '%s'" -#: src/attrib.c:590 +#: src/attrib.c:594 msgid "# Do not edit this comment block\n" "#\n" msgstr "# Diesen Kommentarabschnitt nicht verändern\n" "#\n" -#: src/attrib.c:591 +#: src/attrib.c:595 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=STRING [notwendig]\n" "# Gültigkeitsbereich, zB. alt.*,!alt.bin*\n" -#: src/attrib.c:592 +#: src/attrib.c:596 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=STRING\n" "# Verzeichnis der Mailfolder, z.B. ~/Mail\n" -#: src/attrib.c:593 +#: src/attrib.c:597 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=STRING\n" "# Verzeichnis zum Speichern, z.B. ~user/News\n" -#: src/attrib.c:594 +#: src/attrib.c:598 msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=STRING\n" "# Datei zum Speichern, z.B. =linux\n" -#: src/attrib.c:595 +#: src/attrib.c:599 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=STRING\n" "# Signatur, z.B. $var/sig\n" -#: src/attrib.c:596 +#: src/attrib.c:600 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=STRING\n" "# Organization-Header; ist das erste Zeichen ein '/', wird der\n" "# Wert aus dieser Datei gelesen.\n" -#: src/attrib.c:597 +#: src/attrib.c:601 msgid "# followup_to=STRING\n" msgstr "# followup_to=STRING\n" "# Voreinstellung für den Followup-To-Header\n" -#: src/attrib.c:598 +#: src/attrib.c:602 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=STRING\n" "# Gruppe ist eine gegatete Mailingliste, z.B. majordomo@example.org\n" -#: src/attrib.c:599 +#: src/attrib.c:603 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=STRING\n" "# Zusätzliche Header, z.B. ~/.tin/extra-headers\n" -#: src/attrib.c:600 +#: src/attrib.c:604 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=STRING\n" "# Text wird automatisch zu Beginn des Artikels eingefügt,\n" "# z.B. ~/.tin/extra-body-text\n" -#: src/attrib.c:601 +#: src/attrib.c:605 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=STRING\n" "# Absender, einfach den gewünschten Wert eintragen,\n" "# keine Anführungszeichen verwenden\n" -#: src/attrib.c:602 +#: src/attrib.c:606 msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=STRING\n" "# Einleitungszeile, z.B. news_quote_format=In %%M, %%F wrote:\n" -#: src/attrib.c:603 +#: src/attrib.c:607 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=STRING\n" "# Zeichen für Zitate in Antworten, %%s oder %%S ergibt Autoreninitialien\n" -#: src/attrib.c:604 +#: src/attrib.c:608 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=STRING\n" "# z.B. image/*,!image/bmp\n" -#: src/attrib.c:606 +#: src/attrib.c:610 msgid "# ispell=STRING\n" msgstr "# ispell=STRING\n" "# Aufruf der Rechtschreibprüfung,\n" "# z.B. ispell -C -ddeutsch -w äöüÄÖÜß@ -Tlatin1\n" -#: src/attrib.c:608 +#: src/attrib.c:612 msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" "# Führe GroupMarkUnselArtRead Kommando automatisch beim Betreten\n" "# der Gruppe aus\n" -#: src/attrib.c:609 +#: src/attrib.c:613 msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" "# Artikel mit 'Archive-name:'-Header automatisch in die darin\n" "# angegebene Datei speichern\n" -#: src/attrib.c:610 +#: src/attrib.c:614 msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" "# Im Batch-Modus werden die Article beachtet\n" -#: src/attrib.c:611 +#: src/attrib.c:615 msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" "# Gespeicherte, zur Nachbearbeitung weitergegebene Artikel ohne\n" "# Nachfrage löschen\n" -#: src/attrib.c:612 +#: src/attrib.c:616 msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" "# nur ungelesene Artikel anzeigen\n" -#: src/attrib.c:613 +#: src/attrib.c:617 msgid "# thread_arts=NUM" msgstr "# thread_arts=ZAHL\n" "# Threading nach:" -#: src/attrib.c:620 +#: src/attrib.c:624 msgid "# show_author=NUM\n" msgstr "# show_author=ZAHL\n" "# Anzeige des From-Felds\n" -#: src/attrib.c:626 +#: src/attrib.c:630 msgid "# show_info=NUM\n" msgstr "# show_info=ZAHL\n" -#: src/attrib.c:632 +#: src/attrib.c:636 msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=ZAHL\n" "# Artikel sortieren nach:\n" -#: src/attrib.c:650 +#: src/attrib.c:654 msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=ZAHL\n" "# Threads sortieren nach:\n" -#: src/attrib.c:655 +#: src/attrib.c:659 msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=ZAHL\n" "# Nachbearbeitung\n" -#: src/attrib.c:660 +#: src/attrib.c:664 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=STRING\n" "# Voreinstellung für Gültigkeitsbereich neuer Kill-Einträge,\n" "# z.B. talk.*\n" -#: src/attrib.c:661 +#: src/attrib.c:665 msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" "# Kill verfällt automatisch\n" -#: src/attrib.c:662 +#: src/attrib.c:666 msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" "# Kill beachtet Gross/Kleinschreibung\n" -#: src/attrib.c:663 +#: src/attrib.c:667 msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=ZAHL\n" "# Killen nach:\n" -#: src/attrib.c:664 src/attrib.c:671 +#: src/attrib.c:668 src/attrib.c:675 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0=Subject (Gross/Kleinschreibung beachten), 1=Subject (G/K ignorieren)\n" -#: src/attrib.c:665 src/attrib.c:672 +#: src/attrib.c:669 src/attrib.c:676 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2=From (G/K beachten), 3=From (G/K ignorieren)\n" -#: src/attrib.c:666 src/attrib.c:673 +#: src/attrib.c:670 src/attrib.c:677 msgid "# 4=msgid 5=lines\n" msgstr "# 4=Message-ID, 5=Zeilen\n" -#: src/attrib.c:667 +#: src/attrib.c:671 msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=STRING\n" "# Voreinstellung für Gültigkeitsbereich neuer Auswahlregeln (Hochscoren)\n" -#: src/attrib.c:668 +#: src/attrib.c:672 msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" "# Regel verfällt automatisch\n" -#: src/attrib.c:669 +#: src/attrib.c:673 msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" "# Regel beachtet Gross/Kleinschreibung\n" -#: src/attrib.c:670 +#: src/attrib.c:674 msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" "# Auswählen (Hochscoren) nach:\n" -#: src/attrib.c:674 +#: src/attrib.c:678 msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" "# X-Comment-To:-Header einfügen.\n" "# (Nur sinnvoll in nach Fido Technology Network gegateten Gruppen.)\n" -#: src/attrib.c:675 +#: src/attrib.c:679 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=STRING\n" "# Datei in der eine Kopie der Mail abgelegt werden soll,# z.B: " "=mailbox\n" -#: src/attrib.c:676 +#: src/attrib.c:680 msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" "# Automatische Umwandlung von TeX-Umlauten\n" -#: src/attrib.c:677 +#: src/attrib.c:681 msgid "# mime_forward=ON/OFF\n" msgstr "# mime_forward=ON/OFF\n" "# Weitergeleitete Artikel als MIME-Anhang senden\n" -#: src/attrib.c:679 +#: src/attrib.c:683 msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=Zeichensatz\n" "# Erlaubt sind folgende:" -#: src/attrib.c:686 +#: src/attrib.c:690 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=STRING\n" "# Voreinstellung ist US-ASCII\n" -#: src/attrib.c:688 +#: src/attrib.c:692 msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Es empfiehlt sich, zuerst allgemein gültige und danach spezielle,\n" -#: src/attrib.c:689 +#: src/attrib.c:693 msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# nur für bestimmte Newsgruppen gültige Einträge aufzuführen.\n" "#\n" -#: src/attrib.c:690 +#: src/attrib.c:694 msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:696 +#: src/attrib.c:700 msgid "# include extra headers\n" msgstr "# Zusätzliche Header einfügen\n" -#: src/attrib.c:704 +#: src/attrib.c:708 msgid "# in *sources* set post process type to shar only\n" msgstr "# in *sources* nur Nachbearbeitung mit shar\n" -#: src/attrib.c:708 +#: src/attrib.c:712 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "# in *binaries* Nachbearbeitung, temporäre Dateien löschen\n" -#: src/attrib.c:709 +#: src/attrib.c:713 msgid "# and set Followup-To: poster\n" msgstr "# und Antwort per EMail (Followup-To: poster) anfordern\n" @@ -641,7 +641,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:1118 +#: src/lang.c:127 src/lang.c:1121 msgid "Default" msgstr "Voreinstellung" @@ -954,12 +954,11 @@ msgstr "Ungültige Antwort auf GROUP-Befe #: src/lang.c:201 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" -msgstr "Fehlerhafter %s/%s-Artikel: Unerwartetes Ende" +msgstr "MIME-Fehler: Unerwartetes Ende des %s/%s-Artikels" -# TRANSLATION MISSING #: src/lang.c:202 msgid "MIME parse error: Start boundary whilst reading headers" -msgstr "" +msgstr "MIME-Fehler: Anfangsgrenze in Hadern" #: src/lang.c:203 msgid "Can't get a (fully-qualified) domain-name!" @@ -1688,7 +1687,7 @@ msgstr "bewegt die gewählte Gruppe inner msgid "choose next group with unread news" msgstr "wählt die nächste Gruppe mit ungelesenen Artikeln" -#: src/lang.c:384 src/lang.c:1165 +#: src/lang.c:384 src/lang.c:1168 msgid "quit" msgstr "Beenden" @@ -2591,91 +2590,96 @@ msgstr "Lese Newsgroups-Datei... " msgid "Reading newsrc file..." msgstr "Lese newsrc-Datei..." -#: src/lang.c:609 +#: src/lang.c:610 +#, c-format +msgid "(%d:%02d remaining)" +msgstr "(noch %d:%02d benötigt)" + +#: src/lang.c:612 #, c-format msgid "Bogus group %s removed." msgstr "Nicht vorhandene Gruppe %s entfernt." -#: src/lang.c:610 +#: src/lang.c:613 #, c-format msgid "Error: rename %s to %s" msgstr "Fehler: Benenne %s in %s" -#: src/lang.c:611 +#: src/lang.c:614 msgid "Reply to author..." msgstr "Mailantwort an Autor..." -#: src/lang.c:612 +#: src/lang.c:615 msgid "Repost" msgstr "Reposte" -#: src/lang.c:613 +#: src/lang.c:616 msgid "Reposting article..." msgstr "Wiederholtes posten des Artikels..." -#: src/lang.c:614 +#: src/lang.c:617 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Wiederholtes posten de(s|r) Artikel(s) in [%s]> " -#: src/lang.c:615 +#: src/lang.c:618 msgid "Reset newsrc?" msgstr "newsrc zurücksetzen?" -#: src/lang.c:616 +#: src/lang.c:619 msgid "Responses have been directed to the following newsgroups" msgstr "Antworten werden in folgende Gruppen gepostet" -#: src/lang.c:617 +#: src/lang.c:620 #, 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:618 +#: src/lang.c:621 #, c-format msgid "RespNo %4d of %4d" msgstr "Antw. %4d von %4d" -#: src/lang.c:619 +#: src/lang.c:622 msgid "Press to continue..." msgstr "Drücken sie um fortzufahren..." -#: src/lang.c:621 +#: src/lang.c:624 #, c-format msgid "Select From [%s] (y/n): " msgstr "Wähle From [%s] (j/n): " -#: src/lang.c:622 +#: src/lang.c:625 msgid "Select Lines: (num): " msgstr "Wähle Zeilen: (num): " -#: src/lang.c:623 +#: src/lang.c:626 msgid "Auto-select Article Menu" msgstr "Filter Menü (Bewertung/Score erhöhen)" -#: src/lang.c:624 +#: src/lang.c:627 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "Wähle Msg-Id [%s] (v/l/n/n): " -#: src/lang.c:625 +#: src/lang.c:628 msgid "Select pattern scope: " msgstr "Wähle Muster : " -#: src/lang.c:626 +#: src/lang.c:629 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Wähle Subject [%s] (j/n): " -#: src/lang.c:627 +#: src/lang.c:630 msgid "Select text pattern : " msgstr "Wähle Textmuster : " -#: src/lang.c:628 +#: src/lang.c:631 msgid "Select time in days : " msgstr "Wähle Zeit in Tagen : " -#: src/lang.c:629 +#: src/lang.c:632 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2695,218 +2699,218 @@ msgstr "# %s Server Konfigurationsdatei\ "############################################################################\n" "\n" -#: src/lang.c:635 +#: src/lang.c:638 msgid "Showing unread groups only" msgstr "Zeige nur Gruppen mit ungelesenen Artikeln" -#: src/lang.c:636 +#: src/lang.c:639 msgid "Subject: line (ignore case) " msgstr "Subject: Z. (Groß-Kl. ign.) " -#: src/lang.c:637 +#: src/lang.c:640 msgid "Subject: line (case sensitive)" msgstr "Subject: Z. (Groß-Kl. beachten) " -#: src/lang.c:638 +#: src/lang.c:641 msgid "Save" msgstr "Speichern" -#: src/lang.c:639 +#: src/lang.c:642 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "'%s' (%s/%s) speichern?" -#: src/lang.c:640 +#: src/lang.c:643 msgid "Save configuration before continuing?" msgstr "Zuerst Konfiguration speichern und danach fortfahren?" -#: src/lang.c:641 +#: src/lang.c:644 msgid "Save filename> " msgstr "Name der zu speichernden Datei> " -#: src/lang.c:642 +#: src/lang.c:645 msgid "Saved" msgstr "Gespeichert" -#: src/lang.c:643 +#: src/lang.c:646 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d ungelesene (%4d 'hot') %s in %s\n" -#: src/lang.c:644 +#: src/lang.c:647 #, c-format msgid "Saved %s...\n" msgstr "%s gespeichert...\n" -#: src/lang.c:645 +#: src/lang.c:648 msgid "Nothing was saved" msgstr "Nichts gespeichert" -#: src/lang.c:646 +#: src/lang.c:649 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s aus %d %s\n" -#: src/lang.c:647 +#: src/lang.c:650 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s nach %s%s gespeichert --" -#: src/lang.c:648 +#: src/lang.c:651 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s gespeichert als %s - %s --" -#: src/lang.c:649 +#: src/lang.c:652 msgid "Saving..." msgstr "Speichere..." -#: src/lang.c:650 +#: src/lang.c:653 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Initialisierung des Bildschirms fehlgeschlagen" -#: src/lang.c:651 +#: src/lang.c:654 #, c-format msgid "%s: screen is too small\n" msgstr "%s: Anzeige ist zu klein\n" -#: src/lang.c:652 +#: src/lang.c:655 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "Anzeige zu klein, %s beendet sich\n" -#: src/lang.c:653 +#: src/lang.c:656 #, c-format msgid "Search backwards [%s]> " msgstr "Suche rückwärts [%s]> " -#: src/lang.c:654 +#: src/lang.c:657 #, c-format msgid "Search body [%s]> " msgstr "Durchsuche Artikelinhalt [%s]> " -#: src/lang.c:655 +#: src/lang.c:658 #, c-format msgid "Search forwards [%s]> " msgstr "Suche vorwärts [%s]> " -#: src/lang.c:656 +#: src/lang.c:659 msgid "Searching..." msgstr "Suche..." -#: src/lang.c:657 +#: src/lang.c:660 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Suche Artikel %d von %d ('q' zum abbrechen)..." -#: src/lang.c:658 +#: src/lang.c:661 msgid "Select article> " msgstr "Wähle Artikel> " -#: src/lang.c:659 +#: src/lang.c:662 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:660 +#: src/lang.c:663 msgid "Select group> " msgstr "Wähle Gruppe> " -#: src/lang.c:661 +#: src/lang.c:664 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Nenne das Auswahlmuster [%s]> " -#: src/lang.c:662 +#: src/lang.c:665 msgid "Select thread > " msgstr "Wähle thread > " -#: src/lang.c:663 +#: src/lang.c:666 #, 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:664 +#: src/lang.c:667 msgid "servers active-file" msgstr "Die 'active' Datei des Servers" -#: src/lang.c:665 +#: src/lang.c:668 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Kann die Newsgruppe nicht öffnen. Sie muss erst abonniert werden..." -#: src/lang.c:666 +#: src/lang.c:669 msgid "" msgstr "" -#: src/lang.c:667 +#: src/lang.c:670 #, c-format msgid "Starting: (%s)" msgstr "Starte: (%s)" -#: src/lang.c:668 +#: src/lang.c:671 #, c-format msgid "List Thread (%d of %d)" msgstr "Zeige Thread (%d von %d)" -#: src/lang.c:669 +#: src/lang.c:672 #, c-format msgid "Thread (%.*s)" msgstr "Thread (%.*s)" -#: src/lang.c:670 +#: src/lang.c:673 msgid "Enter wildcard subscribe pattern> " msgstr "Wildcardmuster für zu abonnierende Gruppen> " -#: src/lang.c:671 +#: src/lang.c:674 #, c-format msgid "subscribed to %d groups" msgstr "%d Gruppen sind abonniert" -#: src/lang.c:672 +#: src/lang.c:675 #, c-format msgid "Subscribed to %s" msgstr "%s wurde abonniert" -#: src/lang.c:673 +#: src/lang.c:676 msgid "Subscribing... " msgstr "Abonniere... " -#: src/lang.c:674 +#: src/lang.c:677 msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "Artikel erneut posten oder überschreiben [%%s]? (%s/%s/%s): " -#: src/lang.c:675 +#: src/lang.c:678 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Supersede (überschreibe) Artikel in den Gruppen [%s]> " -#: src/lang.c:676 +#: src/lang.c:679 msgid "Superseding article ..." msgstr "Überschreibe Artikel ..." -#: src/lang.c:677 +#: src/lang.c:680 #, 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:679 +#: src/lang.c:682 #, c-format msgid "%d days" msgstr "%d Tage" -#: src/lang.c:680 +#: src/lang.c:683 msgid "" msgstr "" -#: src/lang.c:681 +#: src/lang.c:684 msgid "# Default action/prompt strings\n" msgstr "# Voreingestellte Aktion/zeige Zeichenkette\n" -#: src/lang.c:682 +#: src/lang.c:685 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" @@ -2922,261 +2926,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:695 +#: src/lang.c:698 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:696 +#: src/lang.c:699 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:697 +#: src/lang.c:700 msgid "There is no news\n" msgstr "Es gibt keine neuen Artikel\n" -#: src/lang.c:698 +#: src/lang.c:701 msgid "Thread" msgstr "Thread" -#: src/lang.c:699 +#: src/lang.c:702 msgid "Thread Level Commands" msgstr "Thread Level Kommandos" -#: src/lang.c:700 +#: src/lang.c:703 msgid "Thread deselected" msgstr "Thread nicht mehr ausgewählt" -#: src/lang.c:701 +#: src/lang.c:704 msgid "Thread selected" msgstr "Thread ausgewählt" -#: src/lang.c:702 +#: src/lang.c:705 msgid "threads" msgstr "Threads" -#: src/lang.c:703 +#: src/lang.c:706 msgid "Thread range" msgstr "Thread-Bereich" -#: src/lang.c:704 +#: src/lang.c:707 msgid "thread" msgstr "Thread" -#: src/lang.c:705 +#: src/lang.c:708 #, c-format msgid "Thread %4s of %4s" msgstr "Thread %4s v. %4s" -#: src/lang.c:706 +#: src/lang.c:709 msgid "Threading articles..." msgstr "Sortiere Artikel..." -#: src/lang.c:707 +#: src/lang.c:710 #, c-format msgid "Toggled word highlighting %s" msgstr "Wort-Hervorhebung: %s" -#: src/lang.c:708 +#: src/lang.c:711 msgid "Toggled rot13 encoding" msgstr "ROT13-Kodierung (de)aktiviert" -#: src/lang.c:709 +#: src/lang.c:712 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Deutsche TeX-Dekodierung: %s" -#: src/lang.c:710 +#: src/lang.c:713 #, c-format msgid "Toggled tab-width to %d" msgstr "Tabulatorweite zu %d gewechselt" -#: src/lang.c:711 +#: src/lang.c:714 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Versuche %s zu dotlocken" -#: src/lang.c:712 +#: src/lang.c:715 #, c-format msgid "%d Trying to lock %s" msgstr "%d Versuche %s zu locken" -#: src/lang.c:713 +#: src/lang.c:716 msgid " h=help\n" msgstr " h=Hilfe\n" -#: src/lang.c:715 +#: src/lang.c:718 msgid "Unlimited" msgstr "Unbegrenzt" -#: src/lang.c:716 +#: src/lang.c:719 msgid "Enter wildcard unsubscribe pattern> " msgstr "Wildcardmuster für abzubestellende Gruppen> " -#: src/lang.c:717 +#: src/lang.c:720 #, c-format msgid "Error decoding %s : %s" msgstr "Fehler beim Dekodieren von %s : %s" -#: src/lang.c:718 +#: src/lang.c:721 msgid "No end." msgstr "Kein Ende." -#: src/lang.c:719 +#: src/lang.c:722 #, c-format msgid "%s successfully decoded." msgstr "%s erfolgreich dekodiert" -#: src/lang.c:720 +#: src/lang.c:723 #, 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:721 +#: src/lang.c:724 msgid "unread " msgstr "ungelesen " -#: src/lang.c:722 +#: src/lang.c:725 #, c-format msgid "unsubscribed from %d groups" msgstr "%d Gruppen abbestellt" -#: src/lang.c:723 +#: src/lang.c:726 #, c-format msgid "Unsubscribed from %s" msgstr "%s wurde abbestellt" -#: src/lang.c:724 +#: src/lang.c:727 msgid "Unsubscribing... " msgstr "Abbestellen... " -#: src/lang.c:725 +#: src/lang.c:728 msgid "Unthreading articles..." msgstr "Aktuelle Sortierung der Artikel aufheben..." -#: src/lang.c:726 +#: src/lang.c:729 msgid "Updated" msgstr "Aktualisiert" -#: src/lang.c:727 +#: src/lang.c:730 msgid "Updating" msgstr "Aktualisiere" -#: src/lang.c:728 +#: src/lang.c:731 #, c-format msgid "Opening %s\n" msgstr "Öffne %s\n" -#: src/lang.c:729 +#: src/lang.c:732 msgid "No more URL's in this article" msgstr "Keine weiteren URLs im Artikel" -#: src/lang.c:730 +#: src/lang.c:733 msgid "Use MIME display program for this message?" msgstr "MIME-Anzeigeprogramm für diese Nachricht benutzen?" -#: src/lang.c:731 +#: src/lang.c:734 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:732 +#: src/lang.c:735 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:733 +#: src/lang.c:736 msgid " -q don't check for new newsgroups" msgstr " -q Überprüfe nicht auf neue Newsgruppen" -#: src/lang.c:734 +#: src/lang.c:737 msgid " -X don't save any files on quit" msgstr " -X Speicher keine Dateien beim Beenden" -#: src/lang.c:735 +#: src/lang.c:738 msgid " -d don't show newsgroup descriptions" msgstr " -d Zeige keine Newsgruppenbeschreibungen" -#: src/lang.c:736 +#: src/lang.c:739 msgid " -G limit get only limit articles/group" msgstr " -G limit Hole nur 'limit' Artikel pro Newsgruppe" -#: src/lang.c:737 +#: src/lang.c:740 #, c-format msgid " -H help information about %s" msgstr " -H Hilfe und Informationen über %s" -#: src/lang.c:738 +#: src/lang.c:741 msgid " -h this help message" msgstr " -h Diese Hilfeseite" -#: src/lang.c:739 +#: src/lang.c:742 #, 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:740 +#: src/lang.c:743 msgid " -u update index files (batch mode)" msgstr " -u Erneuere Index-Dateien (Batch-Modus)" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr " -m Verz. Mailbox-Verzeichnis [Standard=%s]" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Schicken Sie Fehlerberichte/Kommentare an %s" -#: src/lang.c:743 +#: src/lang.c:746 msgid " -N mail new news to your posts (batch mode)" msgstr " -N Maile neue Artikel an sich selbst (Batch-Modus)" -#: src/lang.c:744 +#: src/lang.c:747 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:745 +#: src/lang.c:748 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f Datei 'Datei' als .newsrc-Datei nutzen [Standard=%s]" -#: src/lang.c:746 +#: src/lang.c:749 msgid " -x no posting mode" msgstr " -x Posten nicht erlaubt Modus" -#: src/lang.c:747 +#: src/lang.c:750 msgid " -w post an article and exit" msgstr " -w Postet einen Artikel und beendet tin" -#: src/lang.c:748 +#: src/lang.c:751 msgid " -o post all postponed articles and exit" msgstr " -o Postet alle zurückgelegten Artikel und beendet tin" -#: src/lang.c:749 +#: src/lang.c:752 msgid " -r read news remotely from default NNTP server" msgstr " -r Lese Artikel vom Standard-NNTP-Server" -#: src/lang.c:750 +#: src/lang.c:753 msgid " -R read news saved by -S option" msgstr " -R Lese Artikel, die durch -S gespeichert wurden" -#: src/lang.c:751 +#: src/lang.c:754 #, c-format msgid " -s dir save news directory [default=%s]" msgstr " -s Verz. Verzeichnis zum News-Speichern [Standard=%s]" -#: src/lang.c:752 +#: src/lang.c:755 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:753 +#: src/lang.c:756 msgid " -z start if any unread news" msgstr " -z Starte, wenn ungelesene Artikel vorliegen" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3185,37 +3189,37 @@ msgstr "Ein Usenet-Client.\n" "\n" "Syntax: %s [Optionen] [Newsgruppe[,...]]" -#: src/lang.c:755 +#: src/lang.c:758 msgid " -v verbose output for batch mode options" msgstr " -v Ausführliche Ausgabe für Batch-Modus-Optionen" -#: src/lang.c:756 +#: src/lang.c:759 msgid " -V print version & date information" msgstr " -V Gebe Versions- und Datumsinformationen aus" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "%s ist nur sinnvoll ohne Batchmodeoperationen\n" -#: src/lang.c:758 +#: src/lang.c:761 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "%s ist nur sinnvoll für Batchmodeoperationen\n" -#: src/lang.c:760 +#: src/lang.c:763 #, 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:761 +#: src/lang.c:764 #, c-format msgid "View '%s' (%s/%s)?" msgstr "'%s' (%s/%s) anzeigen?" -#: src/lang.c:763 +#: src/lang.c:766 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3224,26 +3228,26 @@ msgstr "\n" "Warnung: Artikel überschreitet %d Spalten. Zeile %d ist die erste lange:\n" "%-100s\n" -#: src/lang.c:764 +#: src/lang.c:767 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Warnung: Artikel wurde im Editor nicht verändert\n" -#: src/lang.c:765 +#: src/lang.c:768 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Warnung: \"Subject:\" enthält nur Leerzeichen.\n" -#: src/lang.c:766 +#: src/lang.c:769 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:768 +#: src/lang.c:771 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3251,7 +3255,7 @@ msgstr "\n" "Warnung: Artikel hat \"References:\" aber \"Subject:\" beginnt nicht\n" " mit \"Re: \" and enthält auch kein \"(was:\".\n" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3271,7 +3275,7 @@ msgstr "Sorgfältig lesen!\n" "Das ist der Artikel, den sie canceln (löschen) wollen:\n" "\n" -#: src/lang.c:775 +#: src/lang.c:778 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" @@ -3283,7 +3287,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:780 +#: src/lang.c:783 #, c-format msgid "\n" "\n" @@ -3296,7 +3300,7 @@ msgstr "\n" "Einige Einstellungen in Ihrem %s-File haben sich geändert!\n" "Lesen sie \"WHATSNEW\", usw....\n" -#: src/lang.c:782 +#: src/lang.c:785 #, c-format msgid "\n" "\n" @@ -3308,7 +3312,7 @@ msgstr "\n" "Evtl. werden Einstellungen in Ihrem %s-File nicht erkannt\n" "oder ändern sich!\n" -#: src/lang.c:785 +#: src/lang.c:788 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3321,19 +3325,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:789 +#: src/lang.c:792 #, 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:790 +#: src/lang.c:793 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Warnung: Nur %d von %d Artikeln gespeichert" -#: src/lang.c:791 +#: src/lang.c:794 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3347,48 +3351,48 @@ msgstr "\n" " nützlichen Informationen enthalten, sollten sie so kurz wie möglich\n" " gehalten werden.\n" -#: src/lang.c:795 +#: src/lang.c:798 #, 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:796 +#: src/lang.c:799 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:797 +#: src/lang.c:800 msgid "Writing attributes file..." msgstr "Schreibe Datei mit den Eigenschaften der Newsgruppen..." -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "%d Responses" msgstr "%d Antworten" -#: src/lang.c:801 +#: src/lang.c:804 #, c-format msgid "Added %d %s" msgstr "%d %s hinzugefügt" -#: src/lang.c:802 +#: src/lang.c:805 msgid "No unsubscribed groups to show" msgstr "Keine nicht abonnierte Gruppen gefunden" -#: src/lang.c:803 +#: src/lang.c:806 msgid "Showing subscribed to groups only" msgstr "Zeige nur abonnierte Gruppen" -#: src/lang.c:804 +#: src/lang.c:807 msgid "Yes " msgstr "Ja " -#: src/lang.c:805 +#: src/lang.c:808 msgid " You have mail\n" msgstr " Sie haben Mail\n" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3407,16 +3411,16 @@ msgstr "\n" " entfernen oder MM_NETWORK_CHARSET im M)neu auf einen\n" " passenderen Wert setzen.\n" -#: src/lang.c:821 +#: src/lang.c:824 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Neubelegung %s '%s' -> '%s'\n" -#: src/lang.c:822 +#: src/lang.c:825 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D Debug-Modus 1=NNTP 2=ALLES" -#: src/lang.c:826 +#: src/lang.c:829 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3442,11 +3446,11 @@ msgstr "Sorgfältig lesen!\n" "Dies ist der Artikel, den Sie canceln (löschen) wollen:\n" "\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "toggle color" msgstr "Farben ein/aus" -#: src/lang.c:836 +#: src/lang.c:839 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" @@ -3465,352 +3469,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:844 +#: src/lang.c:847 msgid " -a toggle color flag" msgstr " -a Farbe ein- oder ausschalten" -#: src/lang.c:848 +#: src/lang.c:851 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:849 +#: src/lang.c:852 #, 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:850 +#: src/lang.c:853 #, 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:852 +#: src/lang.c:855 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:853 +#: src/lang.c:856 #, 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:854 +#: src/lang.c:857 #, 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:855 +#: src/lang.c:858 #, 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:859 +#: src/lang.c:862 #, 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:860 +#: src/lang.c:863 msgid "Missing parts." msgstr "Teile fehlen." -#: src/lang.c:861 +#: src/lang.c:864 msgid "No beginning." msgstr "Kein Anfang." -#: src/lang.c:862 +#: src/lang.c:865 msgid "No data." msgstr "Keine Daten." -#: src/lang.c:863 +#: src/lang.c:866 msgid "Unknown error." msgstr "Unbekannter Fehler." -#: src/lang.c:865 +#: src/lang.c:868 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tPrüfsumme für %s (%ld %s)" -#: src/lang.c:869 +#: src/lang.c:872 msgid "Reading mail active file... " msgstr "Lese EMail-Active-Datei... " -#: src/lang.c:870 +#: src/lang.c:873 msgid "Reading mailgroups file... " msgstr "Lese Mailgruppen-Datei... " -#: src/lang.c:874 +#: src/lang.c:877 msgid "perform PGP operations on article" msgstr "wendet PGP auf den Artikel an" -#: src/lang.c:875 +#: src/lang.c:878 msgid "Add key(s) to public keyring?" msgstr "Schlüssel dem Öffentlichen Schlüsselring hinzufügen?" -#: src/lang.c:876 +#: src/lang.c:879 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=verschlüsseln, %s=signieren, %s=beides, %s=Ende: " -#: src/lang.c:877 +#: src/lang.c:880 #, 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:878 +#: src/lang.c:881 #, 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:879 +#: src/lang.c:882 msgid "Article not signed and no public keys found" msgstr "Artikel ist nicht signiert; keine öffentlichen Schlüssel gefunden" -#: src/lang.c:881 +#: src/lang.c:884 #, 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:882 +#: src/lang.c:885 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:883 +#: src/lang.c:886 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=pgp, %s=Menu, %s=posten, %s=zurücklegen " "[%%s]: " -#: src/lang.c:885 +#: src/lang.c:888 #, 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:886 +#: src/lang.c:889 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=pgp, %s=verschicken [%%s]: " -#: src/lang.c:887 +#: src/lang.c:890 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:891 +#: src/lang.c:894 #, 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:892 +#: src/lang.c:895 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=ispell, %s=verschicken [%%s]: " -#: src/lang.c:893 +#: src/lang.c:896 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:895 +#: src/lang.c:898 #, 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:896 +#: src/lang.c:899 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=Ende, %s=bearbeiten, %s=verschicken [%%s]: " -#: src/lang.c:897 +#: src/lang.c:900 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:906 +#: src/lang.c:909 msgid "Try cache_overview_files to speed up things.\n" msgstr "Setze cache_overview_files um das lesen zu beschleubigen.\n" -#: src/lang.c:907 +#: src/lang.c:910 msgid "Tin will use local index files instead.\n" msgstr "Tin wird lokale index files benutzen.\n" -#: src/lang.c:908 +#: src/lang.c:911 msgid "Cannot find NNTP server name" msgstr "Kann den Namen des NNTP Servers nicht finden" -#: src/lang.c:909 +#: src/lang.c:912 #, c-format msgid "Connecting to %s:%d..." msgstr "Verbinde mit %s:%d..." -#: src/lang.c:910 +#: src/lang.c:913 msgid "Disconnecting from server...\n" msgstr "Trenne Verbindung zum Server...\n" -#: src/lang.c:911 +#: src/lang.c:914 #, 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:912 +#: src/lang.c:915 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "Konnte nicht zum NNTP Server %s verbinden. Beende..." -#: src/lang.c:913 +#: src/lang.c:916 msgid "205 Closing connection" msgstr "205 Schließe Verbindung" -#: src/lang.c:914 +#: src/lang.c:917 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:915 +#: src/lang.c:918 msgid "Connection to news server has timed out. Reconnect?" msgstr "Die Verbindung zum Newsserver wurde unterbrochen. Wieder verbinden?" -#: src/lang.c:916 +#: src/lang.c:919 #, 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:917 +#: src/lang.c:920 msgid " -A force authentication on connect" msgstr " -A Erzwinge Anmeldung bei Verbindung" -#: src/lang.c:918 +#: src/lang.c:921 #, 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:919 +#: src/lang.c:922 #, 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:920 +#: src/lang.c:923 msgid " -Q quick start. Same as -nqd" msgstr " -Q Schnellstart. Das Selbe wie -nqd" -#: src/lang.c:921 +#: src/lang.c:924 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l Benutze nur das LIST anstelle vom GROUP-Kommando (-n)" -#: src/lang.c:922 +#: src/lang.c:925 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:924 +#: src/lang.c:927 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp: Unbekannter Service.\n" -#: src/lang.c:927 +#: src/lang.c:930 msgid "\n" "socket or connect problem\n" msgstr "\n" "Socket oder Verbindungsproblem\n" -#: src/lang.c:929 +#: src/lang.c:932 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Verbindung mit %s: " -#: src/lang.c:930 +#: src/lang.c:933 msgid "Giving up...\n" msgstr "Gebe auf...\n" -#: src/lang.c:933 +#: src/lang.c:936 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:936 +#: src/lang.c:939 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:939 +#: src/lang.c:942 #, 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:942 +#: src/lang.c:945 msgid " -Q quick start. Same as -qd" msgstr " -Q Schnellstart. Das Selbe wie -qd" -#: src/lang.c:943 +#: src/lang.c:946 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:944 +#: src/lang.c:947 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:945 +#: src/lang.c:948 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:949 +#: src/lang.c:952 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "Fehler beim Posten mit externem inews, verwende eingebautes?" -#: src/lang.c:950 +#: src/lang.c:953 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:958 +#: src/lang.c:961 #, c-format msgid "%d %s printed" msgstr "%d %s gedruckt" -#: src/lang.c:959 +#: src/lang.c:962 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "druckt Artikel/Thread/hervorgehobene/Muster/markierten" -#: src/lang.c:960 +#: src/lang.c:963 msgid "Print" msgstr "drucken" -#: src/lang.c:961 +#: src/lang.c:964 msgid "Printing..." msgstr "Drucke..." -#: src/lang.c:965 +#: src/lang.c:968 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "pipet Artikel/thread hervorgehoben/muster/markierten Artikel" -#: src/lang.c:966 +#: src/lang.c:969 msgid "No command" msgstr "Kein Kommando" -#: src/lang.c:967 +#: src/lang.c:970 msgid "Pipe" msgstr "Pipe" -#: src/lang.c:968 +#: src/lang.c:971 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Pipen in Kommando [%.*s]> " -#: src/lang.c:969 +#: src/lang.c:972 msgid "Piping..." msgstr "Pipen..." -#: src/lang.c:971 +#: src/lang.c:974 msgid "Piping not enabled." msgstr "Pipen nicht aktiviert." -#: src/lang.c:975 +#: src/lang.c:978 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3823,7 +3827,7 @@ msgstr "\n" " vom Inhalt trennt. Benutzen sie ein ',' um mehrere Newsgruppen\n" " anzugeben\n" -#: src/lang.c:980 +#: src/lang.c:983 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3834,7 +3838,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:985 +#: src/lang.c:988 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3845,7 +3849,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:989 +#: src/lang.c:992 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" @@ -3853,7 +3857,7 @@ msgstr "\n" "Warnung: Die \"%s:\" Zeile enthält Leerzeichen die entfernt\n" " werden sollten.\n" -#: src/lang.c:994 +#: src/lang.c:997 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3884,554 +3888,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:1007 +#: src/lang.c:1010 msgid "shell escape" msgstr "Ausgang zur Shell" -#: src/lang.c:1008 +#: src/lang.c:1011 #, c-format msgid "Shell Command (%s)" msgstr "Shellkommando (%s)" -#: src/lang.c:1009 +#: src/lang.c:1012 #, c-format msgid "Enter shell command [%s]> " msgstr "Geben Sie ein Shellkommando ein [%s]> " -#: src/lang.c:1013 +#: src/lang.c:1016 #, 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:1017 +#: src/lang.c:1020 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Gruppe %.*s ('q' zum beenden...)" -#: src/lang.c:1019 +#: src/lang.c:1022 #, c-format msgid "Group %.*s..." msgstr "Gruppe %.*s..." -#: src/lang.c:1023 +#: src/lang.c:1026 msgid "Server unavailable\n" msgstr "Server nicht erreichbar\n" -#: src/lang.c:1029 +#: src/lang.c:1032 #, 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:1030 +#: src/lang.c:1033 #, 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:1032 +#: src/lang.c:1035 #, 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:1033 +#: src/lang.c:1036 #, 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:1037 +#: src/lang.c:1040 #, 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:1038 +#: src/lang.c:1041 #, 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:1040 +#: src/lang.c:1043 #, 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:1041 +#: src/lang.c:1044 #, 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:1047 +#: src/lang.c:1050 msgid "Terminal does not support color" msgstr "Terminal unterstützt keine Farben" -#: src/lang.c:1052 +#: src/lang.c:1055 #, c-format msgid "Trying %s" msgstr "Versuche %s" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:296 +#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 src/refs.c:296 msgid "None" msgstr "Nichts" -#: src/lang.c:1067 +#: src/lang.c:1070 msgid "Subject" msgstr "Subject" -#: src/lang.c:1068 +#: src/lang.c:1071 msgid "References" msgstr "References" -#: src/lang.c:1069 +#: src/lang.c:1072 msgid "Both Subject and References" msgstr "Beides: Subject und References" -#: src/lang.c:1070 +#: src/lang.c:1073 msgid "Multipart Subject" msgstr "Mehrteilige Artikel (Subject)" -#: src/lang.c:1082 src/lang.c:1193 +#: src/lang.c:1085 src/lang.c:1196 msgid "No" msgstr "Nein" -#: src/lang.c:1083 src/lang.c:1195 +#: src/lang.c:1086 src/lang.c:1198 msgid "Yes" msgstr "Ja" -#: src/lang.c:1084 +#: src/lang.c:1087 msgid "Hide All" msgstr "Alle ausblenden" -#: src/lang.c:1092 +#: src/lang.c:1095 msgid "Address" msgstr "Adresse" -#: src/lang.c:1093 +#: src/lang.c:1096 msgid "Full Name" msgstr "Voller Name" -#: src/lang.c:1094 +#: src/lang.c:1097 msgid "Address and Name" msgstr "Adresse und Name" -#: src/lang.c:1101 +#: src/lang.c:1104 msgid "Max" msgstr "Höchster" -#: src/lang.c:1102 +#: src/lang.c:1105 msgid "Sum" msgstr "Summe" -#: src/lang.c:1103 +#: src/lang.c:1106 msgid "Average" msgstr "Durchschnitt" -#: src/lang.c:1108 +#: src/lang.c:1111 msgid "Lines" msgstr "Zeilen" -#: src/lang.c:1109 +#: src/lang.c:1112 msgid "Score" msgstr "Bewertung" -#: src/lang.c:1110 +#: src/lang.c:1113 msgid "Lines & Score" msgstr "Zeilen und Bewertung" -#: src/lang.c:1119 +#: src/lang.c:1122 msgid "Black" msgstr "Schwarz" -#: src/lang.c:1120 +#: src/lang.c:1123 msgid "Red" msgstr "Rot" -#: src/lang.c:1121 +#: src/lang.c:1124 msgid "Green" msgstr "Grün" -#: src/lang.c:1122 +#: src/lang.c:1125 msgid "Brown" msgstr "Braun" -#: src/lang.c:1123 +#: src/lang.c:1126 msgid "Blue" msgstr "Blau" -#: src/lang.c:1124 +#: src/lang.c:1127 msgid "Pink" msgstr "Rosa" -#: src/lang.c:1125 +#: src/lang.c:1128 msgid "Cyan" msgstr "Cyan" -#: src/lang.c:1126 +#: src/lang.c:1129 msgid "White" msgstr "Weiß" -#: src/lang.c:1127 +#: src/lang.c:1130 msgid "Gray" msgstr "Grau" -#: src/lang.c:1128 +#: src/lang.c:1131 msgid "Light Red" msgstr "Helles Rot" -#: src/lang.c:1129 +#: src/lang.c:1132 msgid "Light Green" msgstr "Helles Grün" -#: src/lang.c:1130 +#: src/lang.c:1133 msgid "Yellow" msgstr "Gelb" -#: src/lang.c:1131 +#: src/lang.c:1134 msgid "Light Blue" msgstr "Helles Blau" -#: src/lang.c:1132 +#: src/lang.c:1135 msgid "Light Pink" msgstr "Helles Rosa" -#: src/lang.c:1133 +#: src/lang.c:1136 msgid "Light Cyan" msgstr "Helles Cyan" -#: src/lang.c:1134 +#: src/lang.c:1137 msgid "Light White" msgstr "Helles Weiß" -#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 +#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 msgid "Nothing" msgstr "Nichts" -#: src/lang.c:1143 +#: src/lang.c:1146 msgid "Mark" msgstr "Markierung" -#: src/lang.c:1144 +#: src/lang.c:1147 msgid "Space" msgstr "Leerzeichen" -#: src/lang.c:1151 +#: src/lang.c:1154 msgid "Normal" msgstr "Normal" -#: src/lang.c:1152 +#: src/lang.c:1155 msgid "Best highlighting" msgstr "Beste Hervorhebung" -#: src/lang.c:1153 +#: src/lang.c:1156 msgid "Underline" msgstr "Unterstreichen" -#: src/lang.c:1154 +#: src/lang.c:1157 msgid "Reverse video" msgstr "Invers" -#: src/lang.c:1155 +#: src/lang.c:1158 msgid "Blinking" msgstr "Blinkend" -#: src/lang.c:1156 +#: src/lang.c:1159 msgid "Half bright" msgstr "Halbe Helligkeit" -#: src/lang.c:1157 +#: src/lang.c:1160 msgid "Bold" msgstr "Fett" -#: src/lang.c:1162 +#: src/lang.c:1165 msgid "none" msgstr "Nichts" -#: src/lang.c:1163 +#: src/lang.c:1166 msgid "commands" msgstr "Kommandos" -#: src/lang.c:1164 +#: src/lang.c:1167 msgid "select" msgstr "X-Befehl" -#: src/lang.c:1166 +#: src/lang.c:1169 msgid "commands & quit" msgstr "Kommandos & Ende" -#: src/lang.c:1167 +#: src/lang.c:1170 msgid "commands & select" msgstr "Kommandos & X-Befehl" -#: src/lang.c:1168 +#: src/lang.c:1171 msgid "quit & select" msgstr "Ende & X-Befehl" -#: src/lang.c:1169 +#: src/lang.c:1172 msgid "commands & quit & select" msgstr "Kmndos & Ende & X-Befehl" -#: src/lang.c:1194 +#: src/lang.c:1197 msgid "Shell archive" msgstr "Shellarchiv" -#: src/lang.c:1200 +#: src/lang.c:1203 msgid "Subject: (descending)" msgstr "Subject: (Absteigend)" -#: src/lang.c:1201 +#: src/lang.c:1204 msgid "Subject: (ascending)" msgstr "Subject: (Aufsteigend)" -#: src/lang.c:1202 +#: src/lang.c:1205 msgid "From: (descending)" msgstr "From: (Absteigend)" -#: src/lang.c:1203 +#: src/lang.c:1206 msgid "From: (ascending)" msgstr "From: (Aufsteigend)" -#: src/lang.c:1204 +#: src/lang.c:1207 msgid "Date: (descending)" msgstr "Date: (Absteigend)" -#: src/lang.c:1205 +#: src/lang.c:1208 msgid "Date: (ascending)" msgstr "Date: (Aufsteigend)" -#: src/lang.c:1206 src/lang.c:1214 +#: src/lang.c:1209 src/lang.c:1217 msgid "Score (descending)" msgstr "Bewertung (Absteigend)" -#: src/lang.c:1207 src/lang.c:1215 +#: src/lang.c:1210 src/lang.c:1218 msgid "Score (ascending)" msgstr "Bewertung (Aufsteigend)" -#: src/lang.c:1208 +#: src/lang.c:1211 msgid "Lines: (descending)" msgstr "Lines: (Absteigend)" -#: src/lang.c:1209 +#: src/lang.c:1212 msgid "Lines: (ascending)" msgstr "Lines: (Aufsteigend)" -#: src/lang.c:1220 +#: src/lang.c:1223 msgid "Always Keep" msgstr "Immer behalten" -#: src/lang.c:1221 +#: src/lang.c:1224 msgid "Always Remove" msgstr "Immer entfernen" -#: src/lang.c:1222 +#: src/lang.c:1225 msgid "Mark with D on selection screen" msgstr "Mit D in der Anzeige markiert" -#: src/lang.c:1227 +#: src/lang.c:1230 msgid "Kill only unread arts" msgstr "Killt nur ungelesene Artikel" -#: src/lang.c:1228 +#: src/lang.c:1231 msgid "Kill all arts & show with K" msgstr "Killt alle Artikel, markiert mit K" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1229 +#: src/lang.c:1232 msgid "Kill all arts and never show" msgstr "Killt alle Artikel, zeigt sie nie" -#: src/lang.c:1234 +#: src/lang.c:1237 msgid "Nothing special" msgstr "Nichts besonderes" -#: src/lang.c:1235 +#: src/lang.c:1238 msgid "Compress quotes" msgstr "Zitatzeichen zusammenfassen" -#: src/lang.c:1236 +#: src/lang.c:1239 msgid "Quote signatures" msgstr "Signaturen zitieren" -#: src/lang.c:1237 +#: src/lang.c:1240 msgid "Compress quotes, quote sigs" msgstr "Zitatz. kürzen, Signat. zitieren" -#: src/lang.c:1238 +#: src/lang.c:1241 msgid "Quote empty lines" msgstr "Leerzeilen zitieren" -#: src/lang.c:1239 +#: src/lang.c:1242 msgid "Compress quotes, quote empty lines" msgstr "Zitatz. kürzen, Leerzeilen zit." -#: src/lang.c:1240 +#: src/lang.c:1243 msgid "Quote sigs & empty lines" msgstr "Signat. und Leerzeilen zitieren" -#: src/lang.c:1241 +#: src/lang.c:1244 msgid "Comp. q., quote sigs & empty lines" msgstr "Zitatz. kürzen, Sign & Leerz. zit." -#: src/lang.c:1279 +#: src/lang.c:1282 msgid "no" msgstr "nein" -#: src/lang.c:1280 +#: src/lang.c:1283 msgid "with headers" msgstr "mit Header" -#: src/lang.c:1281 +#: src/lang.c:1284 msgid "without headers" msgstr "ohne Header" # TRANSLATION MISSING -#: src/lang.c:1288 src/lang.c:1294 +#: src/lang.c:1291 src/lang.c:1297 msgid "NFKC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1289 +#: src/lang.c:1292 msgid "NFKD" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1290 +#: src/lang.c:1293 msgid "NFC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1291 +#: src/lang.c:1294 msgid "NFD" msgstr "" -#: src/lang.c:1302 +#: src/lang.c:1305 msgid "Display Options" msgstr "Darstellungseinstellungen" -#: src/lang.c:1308 +#: src/lang.c:1311 msgid "Color Options" msgstr "Farbeinstellungen" -#: src/lang.c:1314 +#: src/lang.c:1317 msgid "Article-Limiting Options" msgstr "Artikel-Begrenzungseinstellungen" -#: src/lang.c:1320 +#: src/lang.c:1323 msgid "Posting/Mailing Options" msgstr "Versandeinstellungen für Mail und News" -#: src/lang.c:1326 +#: src/lang.c:1329 msgid "Saving/Printing Options" msgstr "Speicher- und Druckereinstellungen" -#: src/lang.c:1332 +#: src/lang.c:1335 msgid "Expert Options" msgstr "Experteneinstellungen" -#: src/lang.c:1338 +#: src/lang.c:1341 msgid "Filtering Options" msgstr "Filtereinstellungen" -#: 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 src/lang.c:2350 +#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 src/lang.c:1417 +#: src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 src/lang.c:1526 src/lang.c:1688 +#: src/lang.c:1694 src/lang.c:1700 src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 +#: src/lang.c:1776 src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 +#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 src/lang.c:1833 +#: src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 src/lang.c:1857 src/lang.c:1863 +#: src/lang.c:1869 src/lang.c:1875 src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 +#: src/lang.c:1899 src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 +#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 src/lang.c:1960 +#: src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 src/lang.c:1998 src/lang.c:2032 +#: src/lang.c:2084 src/lang.c:2091 src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 +#: src/lang.c:2192 src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 +#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 msgid " toggles, sets, cancels." msgstr " schaltet um, setzt, bricht ab." -#: src/lang.c:1344 +#: src/lang.c:1347 msgid "Show mini menu & posting etiquette" msgstr "Zeigt Minimenü & Posting etiquette" -#: src/lang.c:1345 +#: src/lang.c:1348 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:1350 +#: src/lang.c:1353 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Zeige Kurzbeschreibung für Gruppe. wechselt & setzt." -#: src/lang.c:1351 +#: src/lang.c:1354 msgid "Show description of each newsgroup" msgstr "Zeige Beschreibung der Newsgruppen" -#: src/lang.c:1352 +#: src/lang.c:1355 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:1357 +#: src/lang.c:1360 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Zeigt Subject & From (Autor) Felder im Gruppenmenü. wechselt & " "setzt." -#: src/lang.c:1358 +#: src/lang.c:1361 msgid "In group menu, show author by" msgstr "Im Gruppenmenü, zeige Autor an nach" -#: src/lang.c:1359 +#: src/lang.c:1362 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:1363 +#: src/lang.c:1366 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Zeige -> oder Hervorhebung für Auswahl. wechselt & setzt." -#: src/lang.c:1364 +#: src/lang.c:1367 msgid "Draw -> instead of highlighted bar" msgstr "Zeige -> anstatt einer Markierung" -#: src/lang.c:1365 +#: src/lang.c:1368 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Falls ON benutze -> andernfalls benutze eine Markierung zur Auswahl\n" -#: src/lang.c:1370 +#: src/lang.c:1373 msgid "Use inverse video for page headers" msgstr "Inverse Darstellung für die Header" -#: src/lang.c:1371 +#: src/lang.c:1374 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:1376 +#: src/lang.c:1379 msgid "Thread articles by" msgstr "Threade Artikel anhand" -#: src/lang.c:1377 +#: src/lang.c:1380 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:1383 +#: src/lang.c:1386 msgid "Score of a thread" msgstr "Bewertung eines Threads" -#: src/lang.c:1384 +#: src/lang.c:1387 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:1388 +#: src/lang.c:1391 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Sortiere Artikel nach Subject, From, Datum oder Bewertung." -#: src/lang.c:1389 +#: src/lang.c:1392 msgid "Sort articles by" msgstr "Sortiere Artikel nach" -#: src/lang.c:1390 +#: src/lang.c:1393 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" @@ -4440,56 +4444,56 @@ msgstr "# Sort. Art. nach 0=(nichts) 1=( "# 7=(Bewertung abst.) 8=(Bewertung aufst.) 9=(Lines abst.) 10=(Lines " "aufst.).\n" -#: src/lang.c:1396 +#: src/lang.c:1399 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Threads nach Bewertung (Score) oder nichts ordnen. wechselt & " "setzt" -#: src/lang.c:1397 +#: src/lang.c:1400 msgid "Sort threads by" msgstr "Sortiere Threads nach" -#: src/lang.c:1398 +#: src/lang.c:1401 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:1402 +#: src/lang.c:1405 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:1403 +#: src/lang.c:1406 msgid "Goto first unread article in group" msgstr "Setze Cursor auf ersten ungel. Art." -#: src/lang.c:1404 +#: src/lang.c:1407 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:1408 +#: src/lang.c:1411 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Zeige alle oder nur ungelesene Artikel. wechselt & setzt." -#: src/lang.c:1409 +#: src/lang.c:1412 msgid "Show only unread articles" msgstr "Zeige nur ungelesene Artikel" -#: src/lang.c:1410 +#: src/lang.c:1413 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:1415 +#: src/lang.c:1418 msgid "Show only groups with unread arts" msgstr "Zeige nur Gruppen mit ungel. Art." -#: src/lang.c:1416 +#: src/lang.c:1419 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:1421 +#: src/lang.c:1424 msgid "Filter which articles" msgstr "Filter (kill) anwenden auf" -#: src/lang.c:1422 +#: src/lang.c:1425 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" @@ -4497,215 +4501,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:1429 +#: src/lang.c:1432 msgid "Tab goes to next unread article" msgstr "Tab zeigt nächsten ungelesenen Art." -#: src/lang.c:1430 +#: src/lang.c:1433 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:1434 +#: src/lang.c:1437 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:1435 +#: src/lang.c:1438 msgid "Space goes to next unread article" msgstr "Leertaste zeigt nächsten unge. Art." -#: src/lang.c:1436 +#: src/lang.c:1439 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:1441 +#: src/lang.c:1444 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:1442 +#: src/lang.c:1445 msgid "PgDn goes to next unread article" msgstr "PgDn zeigt nächst. ungelesenen Art." -#: src/lang.c:1443 +#: src/lang.c:1446 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:1449 +#: src/lang.c:1452 msgid "List thread using right arrow key" msgstr "Zeige Thread mit rechter Pfeilt. an" -#: src/lang.c:1450 +#: src/lang.c:1453 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:1454 +#: src/lang.c:1457 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Definiere Zeichen für gelöschte Artikel. setzt, bricht ab." -#: src/lang.c:1455 +#: src/lang.c:1458 msgid "Character to show deleted articles" msgstr "Zeichen für gelöschte Artikel" -#: src/lang.c:1456 +#: src/lang.c:1459 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:1461 +#: src/lang.c:1464 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:1462 +#: src/lang.c:1465 msgid "Character to show inrange articles" msgstr "Zeichen für Artikel im Bereich" -#: src/lang.c:1463 +#: src/lang.c:1466 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:1468 +#: src/lang.c:1471 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Definiere Zeichen für wiederkehrende Art. setzt. bricht ab." -#: src/lang.c:1469 +#: src/lang.c:1472 msgid "Character to show returning arts" msgstr "Zeichen für wiederkehrende Artikel" -#: src/lang.c:1470 +#: src/lang.c:1473 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:1475 +#: src/lang.c:1478 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Zeichen für Artikel mit Markierung wichtig/'hot' setzt, bricht ab." -#: src/lang.c:1476 +#: src/lang.c:1479 msgid "Character to show selected articles" msgstr "Zeichen für wichtige Artikel" -#: src/lang.c:1477 +#: src/lang.c:1480 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:1482 +#: src/lang.c:1485 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Definiere Zeichen für aktuelle Artikel. setzt, bricht ab." -#: src/lang.c:1483 +#: src/lang.c:1486 msgid "Character to show recent articles" msgstr "Zeichen für aktuelle Artikel" -#: src/lang.c:1484 +#: src/lang.c:1487 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:1489 +#: src/lang.c:1492 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Zeichen für ungelesene Artikel. setzt, bricht ab." -#: src/lang.c:1490 +#: src/lang.c:1493 msgid "Character to show unread articles" msgstr "Zeichen für ungelesene Artikel" -#: src/lang.c:1491 +#: src/lang.c:1494 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:1496 +#: src/lang.c:1499 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Zeichen für gelesene Artikel. setzt, bricht ab." -#: src/lang.c:1497 +#: src/lang.c:1500 msgid "Character to show read articles" msgstr "Zeichen für gelesene Artikel" -#: src/lang.c:1498 +#: src/lang.c:1501 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:1503 +#: src/lang.c:1506 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Zeichen für gekillte Artikel. setzt, bricht ab." -#: src/lang.c:1504 +#: src/lang.c:1507 msgid "Character to show killed articles" msgstr "Zeichen für gekillte Artikel" -#: src/lang.c:1505 +#: src/lang.c:1508 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:1510 +#: src/lang.c:1513 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Zeichen für gelesene wichtige/'hot' Artikel. setzt, bricht ab." -#: src/lang.c:1511 +#: src/lang.c:1514 msgid "Character to show readselected arts" msgstr "Zeichen für gelesene wichtige Art." -#: src/lang.c:1512 +#: src/lang.c:1515 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:1517 +#: src/lang.c:1520 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Maximale Länge des angezeigten Newsgruppennamens. setzt." -#: src/lang.c:1518 +#: src/lang.c:1521 msgid "Max. length of group names shown" msgstr "Max. Länge angezeigter Gruppennamen" -#: src/lang.c:1519 +#: src/lang.c:1522 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maximale Länge der angezeigten Newsgruppennamen\n" -#: src/lang.c:1524 +#: src/lang.c:1527 msgid "Show lines/score in listings" msgstr "Zeige Zeilenz./Bewert. in Übersicht" -#: src/lang.c:1525 +#: src/lang.c:1528 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:1530 +#: src/lang.c:1533 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:1531 +#: src/lang.c:1534 msgid "Number of lines to scroll in pager" msgstr "Blättere Artikel um ... Zeilen" -#: src/lang.c:1532 +#: src/lang.c:1535 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" @@ -4715,27 +4719,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:1539 +#: src/lang.c:1542 msgid "Display signatures. toggles & sets." msgstr "Zeige Signaturen an. wechselt & setzt." -#: src/lang.c:1540 +#: src/lang.c:1543 msgid "Display signatures" msgstr "Zeige Signaturen an" -#: src/lang.c:1541 +#: src/lang.c:1544 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Falls OFF zeige keine Signaturen an\n" -#: src/lang.c:1545 +#: src/lang.c:1548 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Uu-kodierte Teile als Attachment anzeigen. wechselt & setzt." -#: src/lang.c:1546 +#: src/lang.c:1549 msgid "Display uue data as an attachment" msgstr "Zeige uue-Teile als Attachment" -#: src/lang.c:1547 +#: src/lang.c:1550 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" @@ -4748,29 +4752,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:1556 +#: src/lang.c:1559 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "TeX german.sty Umlautkodierung auswerten. wechselt & setzt." -#: src/lang.c:1557 +#: src/lang.c:1560 msgid "Display \"a as Umlaut-a" msgstr "Wandle TeX-Umlaute automatisch um" -#: src/lang.c:1558 +#: src/lang.c:1561 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:1563 src/lang.c:1573 +#: src/lang.c:1566 src/lang.c:1576 msgid "Space separated list of header fields" msgstr "Durch Leerzeichen getrennte Liste der Header-Felder" -#: src/lang.c:1564 +#: src/lang.c:1567 msgid "Display these header fields (or *)" msgstr "Zeige diese Header-Felder (oder *)" -#: src/lang.c:1565 +#: src/lang.c:1568 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" @@ -4784,11 +4788,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:1574 +#: src/lang.c:1577 msgid "Do not display these header fields" msgstr "Zeige folgende Header nicht an" -#: src/lang.c:1575 +#: src/lang.c:1578 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 " @@ -4805,27 +4809,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:1585 +#: src/lang.c:1588 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:1586 +#: src/lang.c:1589 msgid "Skip multipart/alternative parts" msgstr "Übersp. multipart/alternative-Teile" -#: src/lang.c:1587 +#: src/lang.c:1590 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Falls ON entsorge multipart/alternative Teile des Artikels automatisch\n" -#: src/lang.c:1592 +#: src/lang.c:1595 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:1593 +#: src/lang.c:1596 msgid "Regex used to show quoted lines" msgstr "Regulärer Ausd. für zit. Zeilen" -#: src/lang.c:1594 +#: src/lang.c:1597 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" @@ -4834,15 +4838,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:1600 +#: src/lang.c:1603 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:1601 +#: src/lang.c:1604 msgid "Regex used to show twice quoted l." msgstr "Reg. Ausd. für zweifach zitierte Z." -#: src/lang.c:1602 +#: src/lang.c:1605 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" @@ -4851,15 +4855,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:1608 +#: src/lang.c:1611 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:1609 +#: src/lang.c:1612 msgid "Regex used to show >= 3 times q.l." msgstr "Reg. Ausd. für >=3-fach zitierte Z." -#: src/lang.c:1610 +#: src/lang.c:1613 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" @@ -4868,15 +4872,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:1617 +#: src/lang.c:1620 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:1618 +#: src/lang.c:1621 msgid "Regex used to highlight /slashes/" msgstr "Reg. für /Schrägst./ Hervorhebungen" -#: src/lang.c:1619 +#: src/lang.c:1622 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" @@ -4884,15 +4888,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:1625 +#: src/lang.c:1628 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:1626 +#: src/lang.c:1629 msgid "Regex used to highlight *stars*" msgstr "Regu. A. für *Stern* Hervorhebungen" -#: src/lang.c:1627 +#: src/lang.c:1630 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" @@ -4900,15 +4904,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:1633 +#: src/lang.c:1636 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:1634 +#: src/lang.c:1637 msgid "Regex used to highlight -strokes-" msgstr "Reg. für -Durchstr.- Hervorhebungen" -#: src/lang.c:1635 +#: src/lang.c:1638 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" @@ -4916,15 +4920,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:1641 +#: src/lang.c:1644 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:1642 +#: src/lang.c:1645 msgid "Regex used to highlight _underline_" msgstr "Reg. für _Unterstr._ Hervorhebungen" -#: src/lang.c:1643 +#: src/lang.c:1646 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" @@ -4932,44 +4936,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:1649 +#: src/lang.c:1652 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:1650 +#: src/lang.c:1653 msgid "Regex with Subject prefixes" msgstr "Reg. Ausd. für den Subjectanfang" -#: src/lang.c:1651 +#: src/lang.c:1654 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:1656 +#: src/lang.c:1659 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:1657 +#: src/lang.c:1660 msgid "Regex with Subject suffixes" msgstr "Reg. Ausd. für das Subjectende" -#: src/lang.c:1658 +#: src/lang.c:1661 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:1663 +#: src/lang.c:1666 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:1664 +#: src/lang.c:1667 msgid "MIME binary content viewer" msgstr "MIME-Viewer" -#: src/lang.c:1665 +#: src/lang.c:1668 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" @@ -4978,51 +4982,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:1672 +#: src/lang.c:1675 msgid "Confirm before starting non-text viewing program" msgstr "Start des MIME-Viewers bestätigen" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Ask before using MIME viewer" msgstr "Start des MIME-Viewers bestätigen" -#: src/lang.c:1674 +#: src/lang.c:1677 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:1679 +#: src/lang.c:1682 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "Beim Beenden anbieten, alle betretenen Gruppen als gelesen zu markieren?" -#: src/lang.c:1680 +#: src/lang.c:1683 msgid "Catchup read groups when quitting" msgstr "Aufholen der Gruppen beim Beenden" -#: src/lang.c:1681 +#: src/lang.c:1684 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:1686 +#: src/lang.c:1689 msgid "Catchup group using left key" msgstr "Catchup der Gruppe mit l. Cursor" -#: src/lang.c:1687 +#: src/lang.c:1690 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:1692 +#: src/lang.c:1695 msgid "Catchup thread by using left key" msgstr "Catchup mit der linken Cursort." -#: src/lang.c:1698 +#: src/lang.c:1701 msgid "Which actions require confirmation" msgstr "Bestätigung erforderlich für" -#: src/lang.c:1699 +#: src/lang.c:1702 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" @@ -5030,330 +5034,330 @@ msgstr "# Welche Operationen müssen expl "# gelesen (siehe 'X' Befehl im Manual).\n" # TRANSLATION MISSING -#: src/lang.c:1704 +#: src/lang.c:1707 msgid "'Mark article read' ignores tags" msgstr "" -#: src/lang.c:1705 +#: src/lang.c:1708 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:1709 +#: src/lang.c:1712 msgid "Program to run to open URL's, sets, cancels." msgstr "Öffne URLs mit ... setzt, bricht ab." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Program that opens URL's" msgstr "Öffne URLs mit ..." -#: src/lang.c:1711 +#: src/lang.c:1714 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:1716 +#: src/lang.c:1719 msgid "Use mouse in xterm" msgstr "Maus in xterm nutzen" -#: src/lang.c:1717 +#: src/lang.c:1720 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:1723 +#: src/lang.c:1726 msgid "Use scroll keys on keypad" msgstr "Scrollt. vom Nummernblock nutzen" -#: src/lang.c:1724 +#: src/lang.c:1727 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:1729 +#: src/lang.c:1732 msgid "Enter maximum number of article to get. sets." msgstr "Maximale Anzahl der zu holenden Artikel eingeben. setzt." -#: src/lang.c:1730 +#: src/lang.c:1733 msgid "Number of articles to get" msgstr "Anzahl der zu holenden Artikel" -#: src/lang.c:1731 +#: src/lang.c:1734 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:1736 +#: src/lang.c:1739 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:1737 +#: src/lang.c:1740 msgid "Article recentness time limit" msgstr "Artikel Neuheitszeit-Limit" -#: src/lang.c:1738 +#: src/lang.c:1741 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:1742 +#: src/lang.c:1745 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:1743 +#: src/lang.c:1746 msgid "Wildcard matching" msgstr "Wildcardprüfung" -#: src/lang.c:1744 +#: src/lang.c:1747 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "# Wildcardprüfung 0=(wildmat) 1=(Regulärer Ausdruck)\n" -#: src/lang.c:1748 +#: src/lang.c:1751 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:1749 +#: src/lang.c:1752 msgid "Score limit (kill)" msgstr "Bewertungsgrenze (kill)" -#: src/lang.c:1750 +#: src/lang.c:1753 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:1754 +#: src/lang.c:1757 msgid "Enter default score to kill articles. sets." msgstr "Bewertung für gekillte Artikel. setzt." -#: src/lang.c:1755 +#: src/lang.c:1758 msgid "Default score to kill articles" msgstr "Bewertung für gekillte Artikel" -#: src/lang.c:1756 +#: src/lang.c:1759 msgid "# Default score to kill articles\n" msgstr "# Bewertung für gekillte Artikel\n" -#: src/lang.c:1760 +#: src/lang.c:1763 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:1761 +#: src/lang.c:1764 msgid "Score limit (select)" msgstr "Bewertungsgrenze (select)" -#: src/lang.c:1762 +#: src/lang.c:1765 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:1766 +#: src/lang.c:1769 msgid "Enter default score to select articles. sets." msgstr "Bewertung für wichtige Artikel (hot). setzt." -#: src/lang.c:1767 +#: src/lang.c:1770 msgid "Default score to select articles" msgstr "Bewertung für wichtige Artikel" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "# Default score to select articles\n" msgstr "# Bewertung für wichtige Artikel (hot)\n" -#: src/lang.c:1774 +#: src/lang.c:1777 msgid "Use slrnface to show ''X-Face:''s" msgstr "''X-Face:''s mit slrnface Anzeigen" -#: src/lang.c:1775 +#: src/lang.c:1778 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:1783 +#: src/lang.c:1786 msgid "Use ANSI color" msgstr "Benutze ANSI-Farben" -#: src/lang.c:1784 +#: src/lang.c:1787 msgid "# If ON using ANSI-color\n" msgstr "# Falls ON benutze ANSI-Farben\n" -#: src/lang.c:1789 +#: src/lang.c:1792 msgid "Standard foreground color" msgstr "Standard Vordergrundfarbe" -#: src/lang.c:1790 +#: src/lang.c:1793 msgid "# Standard foreground color\n" msgstr "# Standard Vordergrundfarbe\n" -#: src/lang.c:1795 +#: src/lang.c:1798 msgid "Standard background color" msgstr "Standard Hintergrundfarbe" -#: src/lang.c:1796 +#: src/lang.c:1799 msgid "# Standard-Background-Color\n" msgstr "# Standard Hintergrundfarbe\n" -#: src/lang.c:1801 +#: src/lang.c:1804 msgid "Color for inverse text (background)" msgstr "Farbe des inversen Text (Hinterg.)" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "# Color of background for inverse text\n" msgstr "# Farbe des Hintergrunds für inversen Text\n" -#: src/lang.c:1807 +#: src/lang.c:1810 msgid "Color for inverse text (foreground)" msgstr "Farbe des inversen Text (Vordergr.)" -#: src/lang.c:1808 +#: src/lang.c:1811 msgid "# Color of foreground for inverse text\n" msgstr "# Farbe des Vordergrunds für inversen Text\n" -#: src/lang.c:1813 +#: src/lang.c:1816 msgid "Color of text lines" msgstr "Farbe der Textzeilen" -#: src/lang.c:1814 +#: src/lang.c:1817 msgid "# Color of text-lines\n" msgstr "# Farbe der Textzeilen\n" -#: src/lang.c:1819 +#: src/lang.c:1822 msgid "Color of mini help menu" msgstr "Farbe des Minihilfemenü" -#: src/lang.c:1820 +#: src/lang.c:1823 msgid "# Color of mini help menu\n" msgstr "# Farbe des Minihilfemenü\n" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "Color of help text" msgstr "Farbe des Hilfstext" -#: src/lang.c:1826 +#: src/lang.c:1829 msgid "# Color of help pages\n" msgstr "# Farbe der Hilfsseiten\n" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Color of status messages" msgstr "Farbe der Statusmeldungen" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "# Color of messages in last line\n" msgstr "# Farbe der letzten Zeile im Artikel\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Color of quoted lines" msgstr "Farbe der zitierten Zeilen" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "# Color of quote-lines\n" msgstr "# Farbe der zitierten Zeilen\n" -#: src/lang.c:1843 +#: src/lang.c:1846 msgid "Color of twice quoted line" msgstr "Farbe von zweifach zitierten Zeilen" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "# Color of twice quoted lines\n" msgstr "# Farbe von zweifach zitierten Zeilen\n" -#: src/lang.c:1849 +#: src/lang.c:1852 msgid "Color of =>3 times quoted line" msgstr "Farbe von =>3-fach zitierten Zeilen" -#: src/lang.c:1850 +#: src/lang.c:1853 msgid "# Color of >=3 times quoted lines\n" msgstr "# Farbe von =>3-fach zitierten Zeilen\n" -#: src/lang.c:1855 +#: src/lang.c:1858 msgid "Color of article header lines" msgstr "Farbe der Artikelheaderzeilen" -#: src/lang.c:1856 +#: src/lang.c:1859 msgid "# Color of header-lines\n" msgstr "# Farbe der Artikelheaderzeilen\n" -#: src/lang.c:1861 +#: src/lang.c:1864 msgid "Color of actual news header fields" msgstr "Farbe des angezeigten Headers" -#: src/lang.c:1862 +#: src/lang.c:1865 msgid "# Color of actual news header fields\n" msgstr "# Farbe des angezeigten Headers\n" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "Color of article subject lines" msgstr "Farbe der Subjectzeile" -#: src/lang.c:1868 +#: src/lang.c:1871 msgid "# Color of article subject\n" msgstr "# Farbe der Subjectzeile\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "Color of response counter" msgstr "Farbe des Antwortzählers" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "# Color of response counter\n" msgstr "# Farbe des Antwortzählers\n" -#: src/lang.c:1879 +#: src/lang.c:1882 msgid "Color of sender (From:)" msgstr "Farbe des Autors (From:)" -#: src/lang.c:1880 +#: src/lang.c:1883 msgid "# Color of sender (From:)\n" msgstr "# Farbe des Autors (From:)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Color of help/mail sign" msgstr "Farbe des Hilfe/Mail-Zeichen" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "# Color of Help/Mail-Sign\n" msgstr "# Farbe des Hilfe/Mail-Zeichen\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "Color of signatures" msgstr "Farbe von Signaturen" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "# Color of signature\n" msgstr "# Farbe von Signaturen\n" -#: src/lang.c:1897 +#: src/lang.c:1900 msgid "Color of highlighted URLs" msgstr "Farbe der hervorgehobenen URLs" -#: src/lang.c:1898 +#: src/lang.c:1901 msgid "# Color of highlighted URLs\n" msgstr "# Farbe der hervorgehobenen URLs\n" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "Color of highlighting with *stars*" msgstr "Farbe der Hervorhebung *Sterne*" -#: src/lang.c:1904 +#: src/lang.c:1907 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:1910 +#: src/lang.c:1913 msgid "Color of highlighting with _dash_" msgstr "Farbe der Hervorhebung _Striche_" -#: src/lang.c:1916 +#: src/lang.c:1919 msgid "Color of highlighting with /slash/" msgstr "Farbe der Hervorhebung /Schrägstr./" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "Color of highlighting with -stroke-" msgstr "Farbe der Hervorhebung -Durchstr.-" -#: src/lang.c:1929 +#: src/lang.c:1932 msgid "Attr. of highlighting with *stars*" msgstr "Hervorhebungsattribute *Sterne*" -#: src/lang.c:1930 +#: src/lang.c:1933 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5367,39 +5371,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:1940 +#: src/lang.c:1943 msgid "Attr. of highlighting with _dash_" msgstr "Hervorhebungsattr. _Unterstriche_" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Attr. of highlighting with /slash/" msgstr "Hervorhebungsattr. /Schrägstriche/" -#: src/lang.c:1952 +#: src/lang.c:1955 msgid "Attr. of highlighting with -stroke-" msgstr "Hervorhebungsattr. -Durchstreich.-" -#: src/lang.c:1958 +#: src/lang.c:1961 msgid "URL highlighting in message body" msgstr "URL-Hervorhebung im Artikel" -#: src/lang.c:1959 +#: src/lang.c:1962 msgid "# Enable URL highlighting?\n" msgstr "# URL-Hervorhebung aktivieren?\n" -#: src/lang.c:1964 +#: src/lang.c:1967 msgid "Word highlighting in message body" msgstr "Wort-Hervorhebung im Artikel" -#: src/lang.c:1965 +#: src/lang.c:1968 msgid "# Enable word highlighting?\n" msgstr "# Wort-Hervorhebung aktivieren?\n" -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "What to display instead of mark" msgstr "Anstelle der Markierung anzeigen" -#: src/lang.c:1971 +#: src/lang.c:1974 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" @@ -5407,59 +5411,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:1977 +#: src/lang.c:1980 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:1978 +#: src/lang.c:1981 msgid "Page line wrap column" msgstr "Zeilen umbrechen nach" -#: src/lang.c:1979 +#: src/lang.c:1982 msgid "# Wrap article lines at column\n" msgstr "# In der Artikelanzeige Zeilen umbrechen bei Spalte\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "Wrap around threads on next unread" msgstr "Nä.ungel.-kein Abbr. am Listenende?" -#: src/lang.c:1985 +#: src/lang.c:1988 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:1989 +#: src/lang.c:1992 msgid "Enter default mail address (and fullname). sets." msgstr "Standard Mail-Adresse (und Name) eingeben. setzt." -#: src/lang.c:1990 +#: src/lang.c:1993 msgid "Mail address (and fullname)" msgstr "Mailadresse (und Name)" -#: src/lang.c:1991 +#: src/lang.c:1994 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:1996 +#: src/lang.c:1999 msgid "Show empty Followup-To in editor" msgstr "Leeres Fup'2 im Editor anzeigen" -#: src/lang.c:1997 +#: src/lang.c:2000 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:2001 +#: src/lang.c:2004 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "Setze Pfad/! Kommando/--none um ihre Signatur festzulegen. setzt." -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "Create signature from path/command" msgstr "Erzeuge Signatur aus Pfad/Kommando" -#: src/lang.c:2003 +#: src/lang.c:2006 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 " @@ -5470,49 +5474,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:2010 +#: src/lang.c:2013 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Trenne Sig mit \"-- \" in eigener Zeile ab. wechselt & setzt." -#: src/lang.c:2011 +#: src/lang.c:2014 msgid "Prepend signature with \"-- \"" msgstr "Trenne Sig mit \"-- \" ab" -#: src/lang.c:2012 +#: src/lang.c:2015 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# Falls ON trenne Signatur mit '\\n-- \\n' ab\n" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "Add signature when reposting articles. toggles & sets." msgstr "Sig. beim Reposten eines Artikels hinzufügen? wechselt & setzt." -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Add signature when reposting" msgstr "Signatur beim Reposten anhängen" -#: src/lang.c:2018 +#: src/lang.c:2021 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:2022 +#: src/lang.c:2025 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:2023 +#: src/lang.c:2026 msgid "Characters used as quote-marks" msgstr "Zitatzeichen" -#: src/lang.c:2024 +#: src/lang.c:2027 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:2030 +#: src/lang.c:2033 msgid "Quoting behavior" msgstr "Zitierverhalten" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5533,15 +5537,15 @@ msgstr "# Spezielle Optionen beim Zitier "# 7 = Zitatzeichen zusammenziehen & Signaturen zitieren & Leerzeilen " "zitieren\n" -#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 +#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 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:2044 +#: src/lang.c:2047 msgid "Quote line when following up" msgstr "Einleitungszeile beim Antworten" -#: src/lang.c:2045 +#: src/lang.c:2048 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" @@ -5549,35 +5553,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:2052 +#: src/lang.c:2055 msgid "Quote line when cross-posting" msgstr "Einleitungszeile beim Crossposten" -#: src/lang.c:2058 +#: src/lang.c:2061 msgid "Quote line when mailing" msgstr "Einleitungszeile bei Mailantwort" -#: src/lang.c:2063 +#: src/lang.c:2066 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Falls ON, füge User-Agent:-Header ein. wechselt & setzt." -#: src/lang.c:2064 +#: src/lang.c:2067 msgid "Insert 'User-Agent:'-header" msgstr "Füge 'User-Agent:'-header ein" -#: src/lang.c:2065 +#: src/lang.c:2068 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Falls ON füge 'User-Agent: header' ein\n" -#: src/lang.c:2069 +#: src/lang.c:2073 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:2070 +#: src/lang.c:2074 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2071 +#: src/lang.c:2075 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" @@ -5594,27 +5598,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:2082 +#: src/lang.c:2085 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2083 +#: src/lang.c:2086 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:2089 +#: src/lang.c:2092 msgid "Mailbox format" msgstr "Mailbox-Format" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "# Format of the mailbox.\n" msgstr "# Format der Mailbox.\n" -#: src/lang.c:2095 +#: src/lang.c:2098 msgid "MIME encoding in news messages" msgstr "MIME-Kodierung in Newsartikeln" -#: src/lang.c:2096 +#: src/lang.c:2099 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" @@ -5628,15 +5632,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:2104 src/lang.c:2125 +#: src/lang.c:2107 src/lang.c:2128 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:2105 +#: src/lang.c:2108 msgid "Use 8bit characters in news headers" msgstr "Benutze 8bit-Zeichen im Newsheader" -#: src/lang.c:2106 +#: src/lang.c:2109 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" @@ -5648,27 +5652,27 @@ msgstr "# Wenn ON werden 8-Bit-Zeichen ( "# kodiert, wenn post_mime_encoding nicht auch auf 8bit eingestellt\n" "# ist.\n" -#: src/lang.c:2113 +#: src/lang.c:2116 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Nachbearbeitete Artikel autom. anz. wechselt, setzt, Ende" -#: src/lang.c:2114 +#: src/lang.c:2117 msgid "View post-processed files" msgstr "Nachbearbeitete Artikel anzeigen" -#: src/lang.c:2115 +#: src/lang.c:2118 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:2120 +#: src/lang.c:2123 msgid "MIME encoding in mail messages" msgstr "MIME-Kodierung für E-Mails" -#: src/lang.c:2126 +#: src/lang.c:2129 msgid "Use 8bit characters in mail headers" msgstr "Benutze 8bit Zeichen im Mail Header" -#: src/lang.c:2127 +#: src/lang.c:2130 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 " @@ -5685,24 +5689,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:2137 +#: src/lang.c:2140 msgid "Strip blanks from ends of lines" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/lang.c:2138 +#: src/lang.c:2141 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:2143 +#: src/lang.c:2146 msgid "If ON, use transliteration. toggles & sets." msgstr "Wenn ON verwende Umschreibungen. wechselt & setzt." -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Transliteration" msgstr "Verwende Umschreibungen" -#: src/lang.c:2145 +#: src/lang.c:2148 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" @@ -5712,242 +5716,242 @@ msgstr "# Wenn ON verwende //TRANSLIT Er "# Terminal als EUR umschrieben, ohne //TRANSLIT würde tin ein\n" "# Fragezeichen verwenden.\n" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Sendet ihnen automatisch eine Kopie. wechselt & setzt." -#: src/lang.c:2153 +#: src/lang.c:2156 msgid "Send you a cc automatically" msgstr "Sendet Ihnen ein Cc automatisch" -#: src/lang.c:2154 +#: src/lang.c:2157 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:2158 +#: src/lang.c:2161 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Sendet ihnen automatisch eine blinde Kopie. wechselt & setzt." -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "Send you a blind cc automatically" msgstr "Sendet Ihnen eine blinde cc autom." -#: src/lang.c:2160 +#: src/lang.c:2163 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:2164 +#: src/lang.c:2167 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:2165 +#: src/lang.c:2168 msgid "Spamtrap warning address parts" msgstr "Spamfallenwarnung in Adresse" -#: src/lang.c:2166 +#: src/lang.c:2169 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:2171 +#: src/lang.c:2174 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Gültigkeit eines Filtereintrags in Tagen. setzt." -#: src/lang.c:2172 +#: src/lang.c:2175 msgid "No. of days a filter entry is valid" msgstr "Tage, die ein Filter gültig ist" -#: src/lang.c:2173 +#: src/lang.c:2176 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:2177 +#: src/lang.c:2180 msgid "Add posted articles to filter. toggles & sets." msgstr "Gepostete Artikel zum Filter hinzufügen. wechselt & setzt." -#: src/lang.c:2178 +#: src/lang.c:2181 msgid "Add posted articles to filter" msgstr "Füge gepostete Artikel zum Filter" -#: src/lang.c:2179 +#: src/lang.c:2182 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:2183 +#: src/lang.c:2186 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:2184 +#: src/lang.c:2187 msgid "Mail directory" msgstr "Mail Verzeichnis" -#: src/lang.c:2185 +#: src/lang.c:2188 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:2190 +#: src/lang.c:2193 msgid "Save articles in batch mode (-S)" msgstr "Speicher Artikel im Batchmode (-S)" -#: src/lang.c:2191 +#: src/lang.c:2194 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:2196 +#: src/lang.c:2199 msgid "The directory where you want articles/threads saved." msgstr "Das Verzeichnis, in dem Artikel/Threads gespeichert werden sollen." -#: src/lang.c:2197 +#: src/lang.c:2200 msgid "Directory to save arts/threads in" msgstr "Verz. um Art/Threads zu speichern" -#: src/lang.c:2198 +#: src/lang.c:2201 msgid "# Directory where articles/threads are saved\n" msgstr "# Verzeichnis in dem Artikel/Threads gespeichert werden\n" -#: src/lang.c:2202 +#: src/lang.c:2205 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:2203 +#: src/lang.c:2206 msgid "Use Archive-name: header for save" msgstr "Nutze Archive-name: zum Speichern" -#: src/lang.c:2204 +#: src/lang.c:2207 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:2209 +#: src/lang.c:2212 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "Gesp. Art. gelesen markieren. wechselt, setzt, bricht ab." -#: src/lang.c:2210 +#: src/lang.c:2213 msgid "Mark saved articles/threads as read" msgstr "Mark. gesp. Artikel/Threads gelesen" -#: src/lang.c:2211 +#: src/lang.c:2214 msgid "# If ON mark articles that are saved as read\n" msgstr "# Falls ON werden gespeicherte Artikel als gelesen markiert\n" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Bearbeite (z.B. unshar) gesp. Art/Threads. wechselt & setzt." -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "Post process saved articles" msgstr "Nachbearbeiten gespeichert. Artikel" -#: src/lang.c:2217 +#: src/lang.c:2220 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:2223 +#: src/lang.c:2226 msgid "Process only unread articles" msgstr "Bearbeite nur ungelesene Artikel" -#: src/lang.c:2224 +#: src/lang.c:2227 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:2229 +#: src/lang.c:2232 msgid "Print all or just part of header. toggles & sets." msgstr "Drucke alles oder nur Teile des Headers wechselt & setzt." -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "Print all headers when printing" msgstr "Alle Header beim Drucken ausgeben" -#: src/lang.c:2231 +#: src/lang.c:2234 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:2235 +#: src/lang.c:2238 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:2236 +#: src/lang.c:2239 msgid "Printer program with options" msgstr "Druckprogramm mit Optionen" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# Druckprogramm mit Optionen zum drucken der Artikel/Threads\n" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Force redraw after certain commands" msgstr "Anzeigeauffrischung nach Kommandos" -#: src/lang.c:2244 +#: src/lang.c:2247 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:2248 +#: src/lang.c:2251 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "Starte Editor mit Einrückung. wechselt, setzt, bricht ab." -#: src/lang.c:2249 +#: src/lang.c:2252 msgid "Start editor with line offset" msgstr "Starte Editor mit Einrückung" -#: src/lang.c:2250 +#: src/lang.c:2253 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:2255 +#: src/lang.c:2258 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:2256 +#: src/lang.c:2259 msgid "Invocation of your editor" msgstr "Aufruf ihres Editors" -#: src/lang.c:2257 +#: src/lang.c:2260 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:2262 +#: src/lang.c:2265 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:2263 +#: src/lang.c:2266 msgid "External inews" msgstr "Externes inews-Programm" -#: src/lang.c:2264 +#: src/lang.c:2267 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:2268 +#: src/lang.c:2271 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:2269 +#: src/lang.c:2272 msgid "Invocation of your mail command" msgstr "Aufruf ihres Mailkommandos" -#: src/lang.c:2270 +#: src/lang.c:2273 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" @@ -5957,11 +5961,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:2278 +#: src/lang.c:2281 msgid "Use interactive mail reader" msgstr "Benutze interaktives Mailprogramm" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "# Interactive mailreader:\n" "# 0 = no interactive mailreader\n" "# 1 = use interactive mailreader with headers in file\n" @@ -5972,137 +5976,137 @@ msgstr "# Interaktives Mailprogramm:\n" "übergeben\n" "# 2 = interaktives Mailprogramm, Mailheader werden als Argumente übergeben\n" -#: src/lang.c:2287 +#: src/lang.c:2290 msgid "Remove ~/.article after posting" msgstr "Entferne ~/.article nach dem posten" -#: src/lang.c:2288 +#: src/lang.c:2291 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Falls ON entferne ~/.article nach dem posten.\n" -#: src/lang.c:2292 +#: src/lang.c:2295 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:2293 +#: src/lang.c:2296 msgid "Filename for posted articles" msgstr "Gepostete Artikel speichern in" -#: src/lang.c:2294 +#: src/lang.c:2297 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:2299 +#: src/lang.c:2302 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "Behalte alle Fehlschläge in ~/dead.articles. wechselt & setzt." -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "Keep failed arts in ~/dead.articles" msgstr "Halte Fehlschl. in ~/dead.articles" -#: src/lang.c:2301 +#: src/lang.c:2304 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:2305 +#: src/lang.c:2308 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Wollen Sie nicht-abonnierte Gruppen aus der .newsrc entfernen?" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "No unsubscribed groups in newsrc" msgstr "Nur abonnierte Gruppen in newsrc" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Falls ON entferne nicht-abonnierte Gruppen aus der newsrc\n" -#: src/lang.c:2312 +#: src/lang.c:2315 msgid "Remove bogus groups from newsrc" msgstr "Lösche nicht vorhande G. aus newsrc" -#: src/lang.c:2313 +#: src/lang.c:2316 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:2317 +#: src/lang.c:2320 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:2318 +#: src/lang.c:2321 msgid "Interval in secs to reread active" msgstr "Active alle ... Sekunden neu lesen" -#: src/lang.c:2319 +#: src/lang.c:2322 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:2324 +#: src/lang.c:2327 msgid "Reconnect to server automatically" msgstr "Autom. Wiederverbindung zum Server" -#: src/lang.c:2325 +#: src/lang.c:2328 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:2329 +#: src/lang.c:2332 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Erzeuge lokale Kopien der NNTP Overview Dateien. wechselt & " "setzt." -#: src/lang.c:2330 +#: src/lang.c:2333 msgid "Cache NNTP overview files locally" msgstr "Speichere NNTP Overview Daten lokal" -#: src/lang.c:2331 +#: src/lang.c:2334 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:2335 +#: src/lang.c:2338 msgid "Enter format string. sets, cancels." msgstr "Format-Zeichenkette eingeben. setzt, bricht ab." -#: src/lang.c:2336 +#: src/lang.c:2339 msgid "Format string for display of dates" msgstr "Datums Format-Zeichenkette" -#: src/lang.c:2337 +#: src/lang.c:2340 msgid "# Format string for date representation\n" msgstr "# Zeichenkette die die Datumsanzeige beschreibt.\n" -# TRANSLATION MISSING -#: src/lang.c:2343 +#: src/lang.c:2346 msgid "Unicode normalization form" -msgstr "" +msgstr "Unicode Normalisierungsart" -# TRANSLATION MISSING -#: src/lang.c:2344 +#: src/lang.c:2347 msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" -msgstr "" +msgstr "# Unicode Normalisierungsart\n" + "# 0 = keine, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" -#: src/lang.c:2351 +# TRANSLATION MISSING +#: src/lang.c:2354 msgid "Render BiDi" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2352 +#: src/lang.c:2355 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/main.c:590 +#: src/misc.c:3711 #, c-format -msgid "Version: %s release %s (\"%s\") %s %s" -msgstr "Version: %s Ausgabe %s (\"%s\") %s %s" +msgid "Version: %s %s release %s (\"%s\") %s %s\n" +msgstr "Version: %s %s Ausgabe %s (\"%s\") %s %s\n" -#: src/main.c:593 +#: src/misc.c:3714 #, c-format -msgid "Version: %s release %s (\"%s\")" -msgstr "Version: %s Ausgabe %s (\"%s\")" +msgid "Version: %s %s release %s (\"%s\")\n" +msgstr "Version: %s %s Ausgabe %s (\"%s\")\n" #: src/newsrc.c:432 msgid "Unreachable?\n" @@ -6134,7 +6138,7 @@ msgstr "Sende letztes Kommando (%s) neu\ msgid "couldn't expand %s\n" msgstr "Kann %s nicht expandieren\n" -#: src/post.c:1951 +#: src/post.c:1962 #, c-format msgid "Posting: %.*s ..." msgstr "Poste: %.*s ..." @@ -6162,7 +6166,6 @@ msgstr "unverändert" msgid "[- Unavailable -]" msgstr "[- Nicht Verfügbar -]" -# TRANSLATION MISSING #. #. * preamble #. * TODO: -> lang.c @@ -6172,21 +6175,24 @@ msgid "This message has been composed in "are reading this prefix, your mail reader probably has not yet been modified\n" "to understand the new format, and some of what follows may look strange.\n" "\n" -msgstr "" +msgstr "Dieser Artikel wurde im 'multipart/mixed' MIME-Format verfasst. Wenn Sie\n" + "dieses Präfix lesen ist ihr Mailprogramm vermutlich nicht in der Lage dieses\n" + "Format zu verstehen und einiges von was folgt, kann merkwürdig aussehen.\n" + "\n" -#: src/save.c:967 +#: src/save.c:974 msgid "bytes" msgstr "Bytes" -#: src/select.c:351 +#: src/select.c:352 msgid "unread" msgstr "ungelesen" -#: src/select.c:351 +#: src/select.c:352 msgid "all" msgstr "Alle" -#: src/select.c:529 src/select.c:531 +#: src/select.c:530 src/select.c:532 msgid " R" msgstr " R" Binary files tin-1.7.5/po/en_GB.gmo and tin-1.7.6/po/en_GB.gmo differ diff -Nurp tin-1.7.5/po/en_GB.po tin-1.7.6/po/en_GB.po --- tin-1.7.5/po/en_GB.po 2004-08-20 10:35:17.000000000 +0200 +++ tin-1.7.6/po/en_GB.po 2004-09-06 10:40:44.000000000 +0200 @@ -2,8 +2,8 @@ # Robert Brady , 2000-2002 # msgid "" -msgstr "Project-Id-Version: tin 1.7.4\n" - "POT-Creation-Date: 2004-06-04 13:31+0200\n" +msgstr "Project-Id-Version: tin 1.7.5\n" + "POT-Creation-Date: 2004-09-06 10:40+0200\n" "PO-Revision-Date: 2002-11-15 20:10+0000\n" "Last-Translator: Robert Brady \n" "Language-Team: \n" @@ -12,216 +12,216 @@ msgstr "Project-Id-Version: tin 1.7.4\n" "Content-Transfer-Encoding: 8bit\n" "Report-Msgid-Bugs-To: \n" -#: src/art.c:1430 +#: src/art.c:1447 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" -#: src/attrib.c:590 +#: src/attrib.c:594 msgid "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:591 +#: src/attrib.c:595 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:592 +#: src/attrib.c:596 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "" -#: src/attrib.c:593 +#: src/attrib.c:597 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "" -#: src/attrib.c:594 +#: src/attrib.c:598 msgid "# savefile=STRING (ie. =linux)\n" msgstr "" -#: src/attrib.c:595 +#: src/attrib.c:599 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "" -#: src/attrib.c:596 +#: src/attrib.c:600 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:597 +#: src/attrib.c:601 msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:598 +#: src/attrib.c:602 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:599 +#: src/attrib.c:603 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:600 +#: src/attrib.c:604 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:601 +#: src/attrib.c:605 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:602 +#: src/attrib.c:606 msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:603 +#: src/attrib.c:607 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:604 +#: src/attrib.c:608 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:606 +#: src/attrib.c:610 msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:608 +#: src/attrib.c:612 msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:609 +#: src/attrib.c:613 msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:610 +#: src/attrib.c:614 msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:611 +#: src/attrib.c:615 msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:612 +#: src/attrib.c:616 msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:613 +#: src/attrib.c:617 msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:620 +#: src/attrib.c:624 msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:626 +#: src/attrib.c:630 msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:632 +#: src/attrib.c:636 msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:650 +#: src/attrib.c:654 msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:655 +#: src/attrib.c:659 msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:660 +#: src/attrib.c:664 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:661 +#: src/attrib.c:665 msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:666 msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:663 +#: src/attrib.c:667 msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:664 src/attrib.c:671 +#: src/attrib.c:668 src/attrib.c:675 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "" -#: src/attrib.c:665 src/attrib.c:672 +#: src/attrib.c:669 src/attrib.c:676 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "" -#: src/attrib.c:666 src/attrib.c:673 +#: src/attrib.c:670 src/attrib.c:677 msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:667 +#: src/attrib.c:671 msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:668 +#: src/attrib.c:672 msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:669 +#: src/attrib.c:673 msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:670 +#: src/attrib.c:674 msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:674 +#: src/attrib.c:678 msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:675 +#: src/attrib.c:679 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:676 +#: src/attrib.c:680 msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:677 +#: src/attrib.c:681 msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:683 msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:686 +#: src/attrib.c:690 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:688 +#: src/attrib.c:692 msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:689 +#: src/attrib.c:693 msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:690 +#: src/attrib.c:694 msgid "############################################################################\n" "\n" msgstr "" -#: src/attrib.c:696 +#: src/attrib.c:700 msgid "# include extra headers\n" msgstr "" -#: src/attrib.c:704 +#: src/attrib.c:708 msgid "# in *sources* set post process type to shar only\n" msgstr "" -#: src/attrib.c:708 +#: src/attrib.c:712 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "" -#: src/attrib.c:709 +#: src/attrib.c:713 msgid "# and set Followup-To: poster\n" msgstr "" @@ -579,7 +579,7 @@ msgstr "" msgid "Creating newsrc file...\n" msgstr "" -#: src/lang.c:127 src/lang.c:1118 +#: src/lang.c:127 src/lang.c:1121 msgid "Default" msgstr "" @@ -1550,7 +1550,7 @@ msgstr "" msgid "choose next group with unread news" msgstr "" -#: src/lang.c:384 src/lang.c:1165 +#: src/lang.c:384 src/lang.c:1168 msgid "quit" msgstr "" @@ -2408,91 +2408,96 @@ msgstr "" msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:609 +#: src/lang.c:610 +#, c-format +msgid "(%d:%02d remaining)" +msgstr "" + +#: src/lang.c:612 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:610 +#: src/lang.c:613 #, c-format msgid "Error: rename %s to %s" msgstr "" -#: src/lang.c:611 +#: src/lang.c:614 msgid "Reply to author..." msgstr "" -#: src/lang.c:612 +#: src/lang.c:615 msgid "Repost" msgstr "" -#: src/lang.c:613 +#: src/lang.c:616 msgid "Reposting article..." msgstr "" -#: src/lang.c:614 +#: src/lang.c:617 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:615 +#: src/lang.c:618 msgid "Reset newsrc?" msgstr "" -#: src/lang.c:616 +#: src/lang.c:619 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:617 +#: src/lang.c:620 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:618 +#: src/lang.c:621 #, c-format msgid "RespNo %4d of %4d" msgstr "" -#: src/lang.c:619 +#: src/lang.c:622 msgid "Press to continue..." msgstr "" -#: src/lang.c:621 +#: src/lang.c:624 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:622 +#: src/lang.c:625 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:623 +#: src/lang.c:626 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:624 +#: src/lang.c:627 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:625 +#: src/lang.c:628 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:626 +#: src/lang.c:629 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:627 +#: src/lang.c:630 msgid "Select text pattern : " msgstr "" -#: src/lang.c:628 +#: src/lang.c:631 msgid "Select time in days : " msgstr "" -#: src/lang.c:629 +#: src/lang.c:632 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2504,216 +2509,216 @@ msgid "# %s server configuration file\n" "\n" msgstr "" -#: src/lang.c:635 +#: src/lang.c:638 msgid "Showing unread groups only" msgstr "" -#: src/lang.c:636 +#: src/lang.c:639 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:637 +#: src/lang.c:640 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:638 +#: src/lang.c:641 msgid "Save" msgstr "" -#: src/lang.c:639 +#: src/lang.c:642 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "" -#: src/lang.c:640 +#: src/lang.c:643 msgid "Save configuration before continuing?" msgstr "" -#: src/lang.c:641 +#: src/lang.c:644 msgid "Save filename> " msgstr "" -#: src/lang.c:642 +#: src/lang.c:645 msgid "Saved" msgstr "" -#: src/lang.c:643 +#: src/lang.c:646 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:644 +#: src/lang.c:647 #, c-format msgid "Saved %s...\n" msgstr "" -#: src/lang.c:645 +#: src/lang.c:648 msgid "Nothing was saved" msgstr "" -#: src/lang.c:646 +#: src/lang.c:649 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "" -#: src/lang.c:647 +#: src/lang.c:650 #, c-format msgid "-- %s saved to %s%s --" msgstr "" -#: src/lang.c:648 +#: src/lang.c:651 #, c-format msgid "-- %s saved to %s - %s --" msgstr "" -#: src/lang.c:649 +#: src/lang.c:652 msgid "Saving..." msgstr "" -#: src/lang.c:650 +#: src/lang.c:653 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Screen initialisation failed" -#: src/lang.c:651 +#: src/lang.c:654 #, c-format msgid "%s: screen is too small\n" msgstr "" -#: src/lang.c:652 +#: src/lang.c:655 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "" -#: src/lang.c:653 +#: src/lang.c:656 #, c-format msgid "Search backwards [%s]> " msgstr "" -#: src/lang.c:654 +#: src/lang.c:657 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:655 +#: src/lang.c:658 #, c-format msgid "Search forwards [%s]> " msgstr "" -#: src/lang.c:656 +#: src/lang.c:659 msgid "Searching..." msgstr "" -#: src/lang.c:657 +#: src/lang.c:660 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:658 +#: src/lang.c:661 msgid "Select article> " msgstr "" -#: src/lang.c:659 +#: src/lang.c:662 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" -#: src/lang.c:660 +#: src/lang.c:663 msgid "Select group> " msgstr "" -#: src/lang.c:661 +#: src/lang.c:664 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:662 +#: src/lang.c:665 msgid "Select thread > " msgstr "" -#: src/lang.c:663 +#: src/lang.c:666 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:664 +#: src/lang.c:667 msgid "servers active-file" msgstr "" -#: src/lang.c:665 +#: src/lang.c:668 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:666 +#: src/lang.c:669 msgid "" msgstr "" -#: src/lang.c:667 +#: src/lang.c:670 #, c-format msgid "Starting: (%s)" msgstr "" -#: src/lang.c:668 +#: src/lang.c:671 #, c-format msgid "List Thread (%d of %d)" msgstr "" -#: src/lang.c:669 +#: src/lang.c:672 #, c-format msgid "Thread (%.*s)" msgstr "" -#: src/lang.c:670 +#: src/lang.c:673 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:671 +#: src/lang.c:674 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:672 +#: src/lang.c:675 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:673 +#: src/lang.c:676 msgid "Subscribing... " msgstr "" -#: src/lang.c:674 +#: src/lang.c:677 msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:675 +#: src/lang.c:678 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:676 +#: src/lang.c:679 msgid "Superseding article ..." msgstr "" -#: src/lang.c:677 +#: src/lang.c:680 #, c-format msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:679 +#: src/lang.c:682 #, c-format msgid "%d days" msgstr "" -#: src/lang.c:680 +#: src/lang.c:683 msgid "" msgstr "" -#: src/lang.c:681 +#: src/lang.c:684 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:682 +#: src/lang.c:685 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" @@ -2723,323 +2728,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:695 +#: src/lang.c:698 msgid "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:696 +#: src/lang.c:699 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:697 +#: src/lang.c:700 msgid "There is no news\n" msgstr "" -#: src/lang.c:698 +#: src/lang.c:701 msgid "Thread" msgstr "" -#: src/lang.c:699 +#: src/lang.c:702 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:700 +#: src/lang.c:703 msgid "Thread deselected" msgstr "" -#: src/lang.c:701 +#: src/lang.c:704 msgid "Thread selected" msgstr "" -#: src/lang.c:702 +#: src/lang.c:705 msgid "threads" msgstr "" -#: src/lang.c:703 +#: src/lang.c:706 msgid "Thread range" msgstr "" -#: src/lang.c:704 +#: src/lang.c:707 msgid "thread" msgstr "" -#: src/lang.c:705 +#: src/lang.c:708 #, c-format msgid "Thread %4s of %4s" msgstr "" -#: src/lang.c:706 +#: src/lang.c:709 msgid "Threading articles..." msgstr "" -#: src/lang.c:707 +#: src/lang.c:710 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:708 +#: src/lang.c:711 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:709 +#: src/lang.c:712 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:710 +#: src/lang.c:713 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:711 +#: src/lang.c:714 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:712 +#: src/lang.c:715 #, c-format msgid "%d Trying to lock %s" msgstr "" -#: src/lang.c:713 +#: src/lang.c:716 msgid " h=help\n" msgstr "" -#: src/lang.c:715 +#: src/lang.c:718 msgid "Unlimited" msgstr "" -#: src/lang.c:716 +#: src/lang.c:719 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:717 +#: src/lang.c:720 #, c-format msgid "Error decoding %s : %s" msgstr "" -#: src/lang.c:718 +#: src/lang.c:721 msgid "No end." msgstr "" -#: src/lang.c:719 +#: src/lang.c:722 #, c-format msgid "%s successfully decoded." msgstr "" -#: src/lang.c:720 +#: src/lang.c:723 #, c-format msgid "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:721 +#: src/lang.c:724 msgid "unread " msgstr "" -#: src/lang.c:722 +#: src/lang.c:725 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:723 +#: src/lang.c:726 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:724 +#: src/lang.c:727 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:725 +#: src/lang.c:728 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:726 +#: src/lang.c:729 msgid "Updated" msgstr "" -#: src/lang.c:727 +#: src/lang.c:730 msgid "Updating" msgstr "" -#: src/lang.c:728 +#: src/lang.c:731 #, c-format msgid "Opening %s\n" msgstr "" -#: src/lang.c:729 +#: src/lang.c:732 msgid "No more URL's in this article" msgstr "" -#: src/lang.c:730 +#: src/lang.c:733 msgid "Use MIME display program for this message?" msgstr "" -#: src/lang.c:731 +#: src/lang.c:734 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr "" -#: src/lang.c:732 +#: src/lang.c:735 msgid " -Z return status indicating if any unread news (batch mode)" msgstr "" -#: src/lang.c:733 +#: src/lang.c:736 msgid " -q don't check for new newsgroups" msgstr "" -#: src/lang.c:734 +#: src/lang.c:737 msgid " -X don't save any files on quit" msgstr "" -#: src/lang.c:735 +#: src/lang.c:738 msgid " -d don't show newsgroup descriptions" msgstr "" -#: src/lang.c:736 +#: src/lang.c:739 msgid " -G limit get only limit articles/group" msgstr "" -#: src/lang.c:737 +#: src/lang.c:740 #, c-format msgid " -H help information about %s" msgstr "" -#: src/lang.c:738 +#: src/lang.c:741 msgid " -h this help message" msgstr "" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr "" -#: src/lang.c:740 +#: src/lang.c:743 msgid " -u update index files (batch mode)" msgstr "" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr "" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "" -#: src/lang.c:743 +#: src/lang.c:746 msgid " -N mail new news to your posts (batch mode)" msgstr "" -#: src/lang.c:744 +#: src/lang.c:747 msgid " -M user mail new news to specified user (batch mode)" msgstr "" -#: src/lang.c:745 +#: src/lang.c:748 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr "" -#: src/lang.c:746 +#: src/lang.c:749 msgid " -x no posting mode" msgstr "" -#: src/lang.c:747 +#: src/lang.c:750 msgid " -w post an article and exit" msgstr "" -#: src/lang.c:748 +#: src/lang.c:751 msgid " -o post all postponed articles and exit" msgstr "" -#: src/lang.c:749 +#: src/lang.c:752 msgid " -r read news remotely from default NNTP server" msgstr "" -#: src/lang.c:750 +#: src/lang.c:753 msgid " -R read news saved by -S option" msgstr "" -#: src/lang.c:751 +#: src/lang.c:754 #, c-format msgid " -s dir save news directory [default=%s]" msgstr "" -#: src/lang.c:752 +#: src/lang.c:755 msgid " -S save new news for later reading (batch mode)" msgstr "" -#: src/lang.c:753 +#: src/lang.c:756 msgid " -z start if any unread news" msgstr "" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "A Usenet reader.\n" "\n" "Usage: %s [options] [newsgroup[,...]]" msgstr "" -#: src/lang.c:755 +#: src/lang.c:758 msgid " -v verbose output for batch mode options" msgstr "" -#: src/lang.c:756 +#: src/lang.c:759 msgid " -V print version & date information" msgstr "" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "" -#: src/lang.c:758 +#: src/lang.c:761 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "" -#: src/lang.c:760 +#: src/lang.c:763 #, c-format msgid "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:761 +#: src/lang.c:764 #, c-format msgid "View '%s' (%s/%s)?" msgstr "" -#: src/lang.c:763 +#: src/lang.c:766 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" "%-100s\n" msgstr "" -#: src/lang.c:764 +#: src/lang.c:767 msgid "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:765 +#: src/lang.c:768 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:766 +#: src/lang.c:769 msgid "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:\".\n" msgstr "" -#: src/lang.c:768 +#: src/lang.c:771 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3052,7 +3057,7 @@ msgid "Read carefully!\n" "\n" msgstr "" -#: src/lang.c:775 +#: src/lang.c:778 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" @@ -3060,7 +3065,7 @@ msgid "\n" " not be encoded properly.\n" msgstr "" -#: src/lang.c:780 +#: src/lang.c:783 #, c-format msgid "\n" "\n" @@ -3069,7 +3074,7 @@ msgid "\n" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:782 +#: src/lang.c:785 #, c-format msgid "\n" "\n" @@ -3077,7 +3082,7 @@ msgid "\n" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:785 +#: src/lang.c:788 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3086,18 +3091,18 @@ msgid "Warning: tin wrote fewer groups t "before you start tin once again!\n" msgstr "" -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:790 +#: src/lang.c:793 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:791 +#: src/lang.c:794 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3107,47 +3112,47 @@ msgid "\n" " possible.\n" msgstr "" -#: src/lang.c:795 +#: src/lang.c:798 #, c-format msgid "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:796 +#: src/lang.c:799 msgid "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:797 +#: src/lang.c:800 msgid "Writing attributes file..." msgstr "" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "%d Responses" msgstr "" -#: src/lang.c:801 +#: src/lang.c:804 #, c-format msgid "Added %d %s" msgstr "" -#: src/lang.c:802 +#: src/lang.c:805 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:803 +#: src/lang.c:806 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:804 +#: src/lang.c:807 msgid "Yes " msgstr "" -#: src/lang.c:805 +#: src/lang.c:808 msgid " You have mail\n" msgstr "" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3159,16 +3164,16 @@ msgid "\n" " M)enu option.\n" msgstr "" -#: src/lang.c:821 +#: src/lang.c:824 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "" -#: src/lang.c:822 +#: src/lang.c:825 msgid " -D debug mode 1=NNTP 2=ALL" msgstr "" -#: src/lang.c:826 +#: src/lang.c:829 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3184,11 +3189,11 @@ msgid "Read carefully!\n" "\n" msgstr "" -#: src/lang.c:835 +#: src/lang.c:838 msgid "toggle color" msgstr "toggle colour" -#: src/lang.c:836 +#: src/lang.c:839 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" @@ -3208,339 +3213,339 @@ msgstr "# For colour-adjust use the foll "# background black)\n" "\n" -#: src/lang.c:844 +#: src/lang.c:847 msgid " -a toggle color flag" msgstr " -a toggle colour flag" -#: src/lang.c:848 +#: src/lang.c:851 msgid "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:849 +#: src/lang.c:852 #, c-format msgid "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:853 +#: src/lang.c:856 #, c-format msgid "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:854 +#: src/lang.c:857 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:855 +#: src/lang.c:858 #, c-format msgid "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:859 +#: src/lang.c:862 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:860 +#: src/lang.c:863 msgid "Missing parts." msgstr "" -#: src/lang.c:861 +#: src/lang.c:864 msgid "No beginning." msgstr "" -#: src/lang.c:862 +#: src/lang.c:865 msgid "No data." msgstr "" -#: src/lang.c:863 +#: src/lang.c:866 msgid "Unknown error." msgstr "" -#: src/lang.c:865 +#: src/lang.c:868 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "" -#: src/lang.c:869 +#: src/lang.c:872 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:874 +#: src/lang.c:877 msgid "perform PGP operations on article" msgstr "" -#: src/lang.c:875 +#: src/lang.c:878 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:876 +#: src/lang.c:879 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "" -#: src/lang.c:877 +#: src/lang.c:880 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:881 +#: src/lang.c:884 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:882 +#: src/lang.c:885 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:883 +#: src/lang.c:886 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:886 +#: src/lang.c:889 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:887 +#: src/lang.c:890 msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:891 +#: src/lang.c:894 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:892 +#: src/lang.c:895 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:893 +#: src/lang.c:896 msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:896 +#: src/lang.c:899 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:897 +#: src/lang.c:900 msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:906 +#: src/lang.c:909 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:907 +#: src/lang.c:910 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:908 +#: src/lang.c:911 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:909 +#: src/lang.c:912 #, c-format msgid "Connecting to %s:%d..." msgstr "" -#: src/lang.c:910 +#: src/lang.c:913 msgid "Disconnecting from server...\n" msgstr "" -#: src/lang.c:911 +#: src/lang.c:914 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "" -#: src/lang.c:912 +#: src/lang.c:915 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "" -#: src/lang.c:913 +#: src/lang.c:916 msgid "205 Closing connection" msgstr "" -#: src/lang.c:914 +#: src/lang.c:917 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "" -#: src/lang.c:915 +#: src/lang.c:918 msgid "Connection to news server has timed out. Reconnect?" msgstr "" -#: src/lang.c:916 +#: src/lang.c:919 #, c-format msgid "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "" -#: src/lang.c:917 +#: src/lang.c:920 msgid " -A force authentication on connect" msgstr "" -#: src/lang.c:918 +#: src/lang.c:921 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr "" -#: src/lang.c:919 +#: src/lang.c:922 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr "" -#: src/lang.c:920 +#: src/lang.c:923 msgid " -Q quick start. Same as -nqd" msgstr "" -#: src/lang.c:921 +#: src/lang.c:924 msgid " -l use only LIST instead of GROUP (-n) command" msgstr "" -#: src/lang.c:922 +#: src/lang.c:925 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr "" -#: src/lang.c:924 +#: src/lang.c:927 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "" -#: src/lang.c:927 +#: src/lang.c:930 msgid "\n" "socket or connect problem\n" msgstr "" -#: src/lang.c:929 +#: src/lang.c:932 #, c-format msgid "\n" "Connection to %s: " msgstr "" -#: src/lang.c:930 +#: src/lang.c:933 msgid "Giving up...\n" msgstr "" -#: src/lang.c:933 +#: src/lang.c:936 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:936 +#: src/lang.c:939 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "" -#: src/lang.c:939 +#: src/lang.c:942 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "" -#: src/lang.c:942 +#: src/lang.c:945 msgid " -Q quick start. Same as -qd" msgstr "" -#: src/lang.c:943 +#: src/lang.c:946 msgid " -l read only active file instead of scanning spool (-n) command" msgstr "" -#: src/lang.c:944 +#: src/lang.c:947 msgid " -n only read subscribed .newsrc groups from spool" msgstr "" -#: src/lang.c:945 +#: src/lang.c:948 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "" -#: src/lang.c:949 +#: src/lang.c:952 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "" -#: src/lang.c:950 +#: src/lang.c:953 msgid "It worked! Should I always use my built in inews from now on?" msgstr "" -#: src/lang.c:958 +#: src/lang.c:961 #, c-format msgid "%d %s printed" msgstr "" -#: src/lang.c:959 +#: src/lang.c:962 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "" -#: src/lang.c:960 +#: src/lang.c:963 msgid "Print" msgstr "" -#: src/lang.c:961 +#: src/lang.c:964 msgid "Printing..." msgstr "" -#: src/lang.c:965 +#: src/lang.c:968 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "" -#: src/lang.c:966 +#: src/lang.c:969 msgid "No command" msgstr "" -#: src/lang.c:967 +#: src/lang.c:970 msgid "Pipe" msgstr "" -#: src/lang.c:968 +#: src/lang.c:971 #, c-format msgid "Pipe to command [%.*s]> " msgstr "" -#: src/lang.c:969 +#: src/lang.c:972 msgid "Piping..." msgstr "" -#: src/lang.c:971 +#: src/lang.c:974 msgid "Piping not enabled." msgstr "" -#: src/lang.c:975 +#: src/lang.c:978 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3549,7 +3554,7 @@ msgid "\n" " newsgroup names.\n" msgstr "" -#: src/lang.c:980 +#: src/lang.c:983 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3557,7 +3562,7 @@ msgid "\n" " Please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:985 +#: src/lang.c:988 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3565,13 +3570,13 @@ msgid "\n" " To avoid trouble please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:989 +#: src/lang.c:992 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" msgstr "" -#: src/lang.c:994 +#: src/lang.c:997 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3592,794 +3597,794 @@ msgid "\n" " likely to ignore it completely. It's a crowded net out there.\n" msgstr "" -#: src/lang.c:1007 +#: src/lang.c:1010 msgid "shell escape" msgstr "" -#: src/lang.c:1008 +#: src/lang.c:1011 #, c-format msgid "Shell Command (%s)" msgstr "" -#: src/lang.c:1009 +#: src/lang.c:1012 #, c-format msgid "Enter shell command [%s]> " msgstr "" -#: src/lang.c:1013 +#: src/lang.c:1016 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "" -#: src/lang.c:1017 +#: src/lang.c:1020 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "" -#: src/lang.c:1019 +#: src/lang.c:1022 #, c-format msgid "Group %.*s..." msgstr "" -#: src/lang.c:1023 +#: src/lang.c:1026 msgid "Server unavailable\n" msgstr "" -#: src/lang.c:1029 +#: src/lang.c:1032 #, 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:1030 +#: src/lang.c:1033 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1032 +#: src/lang.c:1035 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1033 +#: src/lang.c:1036 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1037 +#: src/lang.c:1040 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1038 +#: src/lang.c:1041 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1040 +#: src/lang.c:1043 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1041 +#: src/lang.c:1044 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1047 +#: src/lang.c:1050 msgid "Terminal does not support color" msgstr "Terminal does not support colour" -#: src/lang.c:1052 +#: src/lang.c:1055 #, c-format msgid "Trying %s" msgstr "" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:296 +#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 src/refs.c:296 msgid "None" msgstr "" -#: src/lang.c:1067 +#: src/lang.c:1070 msgid "Subject" msgstr "" -#: src/lang.c:1068 +#: src/lang.c:1071 msgid "References" msgstr "" -#: src/lang.c:1069 +#: src/lang.c:1072 msgid "Both Subject and References" msgstr "" -#: src/lang.c:1070 +#: src/lang.c:1073 msgid "Multipart Subject" msgstr "" -#: src/lang.c:1082 src/lang.c:1193 +#: src/lang.c:1085 src/lang.c:1196 msgid "No" msgstr "" -#: src/lang.c:1083 src/lang.c:1195 +#: src/lang.c:1086 src/lang.c:1198 msgid "Yes" msgstr "" -#: src/lang.c:1084 +#: src/lang.c:1087 msgid "Hide All" msgstr "" -#: src/lang.c:1092 +#: src/lang.c:1095 msgid "Address" msgstr "" -#: src/lang.c:1093 +#: src/lang.c:1096 msgid "Full Name" msgstr "" -#: src/lang.c:1094 +#: src/lang.c:1097 msgid "Address and Name" msgstr "" -#: src/lang.c:1101 +#: src/lang.c:1104 msgid "Max" msgstr "" -#: src/lang.c:1102 +#: src/lang.c:1105 msgid "Sum" msgstr "" -#: src/lang.c:1103 +#: src/lang.c:1106 msgid "Average" msgstr "" -#: src/lang.c:1108 +#: src/lang.c:1111 msgid "Lines" msgstr "" -#: src/lang.c:1109 +#: src/lang.c:1112 msgid "Score" msgstr "" -#: src/lang.c:1110 +#: src/lang.c:1113 msgid "Lines & Score" msgstr "" -#: src/lang.c:1119 +#: src/lang.c:1122 msgid "Black" msgstr "" -#: src/lang.c:1120 +#: src/lang.c:1123 msgid "Red" msgstr "" -#: src/lang.c:1121 +#: src/lang.c:1124 msgid "Green" msgstr "" -#: src/lang.c:1122 +#: src/lang.c:1125 msgid "Brown" msgstr "" -#: src/lang.c:1123 +#: src/lang.c:1126 msgid "Blue" msgstr "" -#: src/lang.c:1124 +#: src/lang.c:1127 msgid "Pink" msgstr "" -#: src/lang.c:1125 +#: src/lang.c:1128 msgid "Cyan" msgstr "" -#: src/lang.c:1126 +#: src/lang.c:1129 msgid "White" msgstr "" -#: src/lang.c:1127 +#: src/lang.c:1130 msgid "Gray" msgstr "Grey" -#: src/lang.c:1128 +#: src/lang.c:1131 msgid "Light Red" msgstr "" -#: src/lang.c:1129 +#: src/lang.c:1132 msgid "Light Green" msgstr "" -#: src/lang.c:1130 +#: src/lang.c:1133 msgid "Yellow" msgstr "" -#: src/lang.c:1131 +#: src/lang.c:1134 msgid "Light Blue" msgstr "" -#: src/lang.c:1132 +#: src/lang.c:1135 msgid "Light Pink" msgstr "" -#: src/lang.c:1133 +#: src/lang.c:1136 msgid "Light Cyan" msgstr "" -#: src/lang.c:1134 +#: src/lang.c:1137 msgid "Light White" msgstr "" -#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 +#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 msgid "Nothing" msgstr "" -#: src/lang.c:1143 +#: src/lang.c:1146 msgid "Mark" msgstr "" -#: src/lang.c:1144 +#: src/lang.c:1147 msgid "Space" msgstr "" -#: src/lang.c:1151 +#: src/lang.c:1154 msgid "Normal" msgstr "" -#: src/lang.c:1152 +#: src/lang.c:1155 msgid "Best highlighting" msgstr "" -#: src/lang.c:1153 +#: src/lang.c:1156 msgid "Underline" msgstr "" -#: src/lang.c:1154 +#: src/lang.c:1157 msgid "Reverse video" msgstr "" -#: src/lang.c:1155 +#: src/lang.c:1158 msgid "Blinking" msgstr "" -#: src/lang.c:1156 +#: src/lang.c:1159 msgid "Half bright" msgstr "" -#: src/lang.c:1157 +#: src/lang.c:1160 msgid "Bold" msgstr "" -#: src/lang.c:1162 +#: src/lang.c:1165 msgid "none" msgstr "" -#: src/lang.c:1163 +#: src/lang.c:1166 msgid "commands" msgstr "" -#: src/lang.c:1164 +#: src/lang.c:1167 msgid "select" msgstr "" -#: src/lang.c:1166 +#: src/lang.c:1169 msgid "commands & quit" msgstr "" -#: src/lang.c:1167 +#: src/lang.c:1170 msgid "commands & select" msgstr "" -#: src/lang.c:1168 +#: src/lang.c:1171 msgid "quit & select" msgstr "" -#: src/lang.c:1169 +#: src/lang.c:1172 msgid "commands & quit & select" msgstr "" -#: src/lang.c:1194 +#: src/lang.c:1197 msgid "Shell archive" msgstr "" -#: src/lang.c:1200 +#: src/lang.c:1203 msgid "Subject: (descending)" msgstr "" -#: src/lang.c:1201 +#: src/lang.c:1204 msgid "Subject: (ascending)" msgstr "" -#: src/lang.c:1202 +#: src/lang.c:1205 msgid "From: (descending)" msgstr "" -#: src/lang.c:1203 +#: src/lang.c:1206 msgid "From: (ascending)" msgstr "" -#: src/lang.c:1204 +#: src/lang.c:1207 msgid "Date: (descending)" msgstr "" -#: src/lang.c:1205 +#: src/lang.c:1208 msgid "Date: (ascending)" msgstr "" -#: src/lang.c:1206 src/lang.c:1214 +#: src/lang.c:1209 src/lang.c:1217 msgid "Score (descending)" msgstr "" -#: src/lang.c:1207 src/lang.c:1215 +#: src/lang.c:1210 src/lang.c:1218 msgid "Score (ascending)" msgstr "" -#: src/lang.c:1208 +#: src/lang.c:1211 msgid "Lines: (descending)" msgstr "" -#: src/lang.c:1209 +#: src/lang.c:1212 msgid "Lines: (ascending)" msgstr "" -#: src/lang.c:1220 +#: src/lang.c:1223 msgid "Always Keep" msgstr "" -#: src/lang.c:1221 +#: src/lang.c:1224 msgid "Always Remove" msgstr "" -#: src/lang.c:1222 +#: src/lang.c:1225 msgid "Mark with D on selection screen" msgstr "" -#: src/lang.c:1227 +#: src/lang.c:1230 msgid "Kill only unread arts" msgstr "" -#: src/lang.c:1228 +#: src/lang.c:1231 msgid "Kill all arts & show with K" msgstr "" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1229 +#: src/lang.c:1232 msgid "Kill all arts and never show" msgstr "" -#: src/lang.c:1234 +#: src/lang.c:1237 msgid "Nothing special" msgstr "" -#: src/lang.c:1235 +#: src/lang.c:1238 msgid "Compress quotes" msgstr "" -#: src/lang.c:1236 +#: src/lang.c:1239 msgid "Quote signatures" msgstr "" -#: src/lang.c:1237 +#: src/lang.c:1240 msgid "Compress quotes, quote sigs" msgstr "" -#: src/lang.c:1238 +#: src/lang.c:1241 msgid "Quote empty lines" msgstr "" -#: src/lang.c:1239 +#: src/lang.c:1242 msgid "Compress quotes, quote empty lines" msgstr "" -#: src/lang.c:1240 +#: src/lang.c:1243 msgid "Quote sigs & empty lines" msgstr "" -#: src/lang.c:1241 +#: src/lang.c:1244 msgid "Comp. q., quote sigs & empty lines" msgstr "" -#: src/lang.c:1279 +#: src/lang.c:1282 msgid "no" msgstr "" -#: src/lang.c:1280 +#: src/lang.c:1283 msgid "with headers" msgstr "" -#: src/lang.c:1281 +#: src/lang.c:1284 msgid "without headers" msgstr "" -#: src/lang.c:1288 src/lang.c:1294 +#: src/lang.c:1291 src/lang.c:1297 msgid "NFKC" msgstr "" -#: src/lang.c:1289 +#: src/lang.c:1292 msgid "NFKD" msgstr "" -#: src/lang.c:1290 +#: src/lang.c:1293 msgid "NFC" msgstr "" -#: src/lang.c:1291 +#: src/lang.c:1294 msgid "NFD" msgstr "" -#: src/lang.c:1302 +#: src/lang.c:1305 msgid "Display Options" msgstr "" -#: src/lang.c:1308 +#: src/lang.c:1311 msgid "Color Options" msgstr "Colour Options" -#: src/lang.c:1314 +#: src/lang.c:1317 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1320 +#: src/lang.c:1323 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1326 +#: src/lang.c:1329 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1332 +#: src/lang.c:1335 msgid "Expert Options" msgstr "" -#: src/lang.c:1338 +#: src/lang.c:1341 msgid "Filtering Options" msgstr "" -#: 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 src/lang.c:2350 +#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 src/lang.c:1417 +#: src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 src/lang.c:1526 src/lang.c:1688 +#: src/lang.c:1694 src/lang.c:1700 src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 +#: src/lang.c:1776 src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 +#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 src/lang.c:1833 +#: src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 src/lang.c:1857 src/lang.c:1863 +#: src/lang.c:1869 src/lang.c:1875 src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 +#: src/lang.c:1899 src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 +#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 src/lang.c:1960 +#: src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 src/lang.c:1998 src/lang.c:2032 +#: src/lang.c:2084 src/lang.c:2091 src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 +#: src/lang.c:2192 src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 +#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1344 +#: src/lang.c:1347 msgid "Show mini menu & posting etiquette" msgstr "" -#: src/lang.c:1345 +#: src/lang.c:1348 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:1350 +#: src/lang.c:1353 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1351 +#: src/lang.c:1354 msgid "Show description of each newsgroup" msgstr "" -#: src/lang.c:1352 +#: src/lang.c:1355 msgid "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1357 +#: src/lang.c:1360 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "" -#: src/lang.c:1358 +#: src/lang.c:1361 msgid "In group menu, show author by" msgstr "" -#: src/lang.c:1359 +#: src/lang.c:1362 msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" msgstr "" -#: src/lang.c:1363 +#: src/lang.c:1366 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1364 +#: src/lang.c:1367 msgid "Draw -> instead of highlighted bar" msgstr "" -#: src/lang.c:1365 +#: src/lang.c:1368 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1370 +#: src/lang.c:1373 msgid "Use inverse video for page headers" msgstr "" -#: src/lang.c:1371 +#: src/lang.c:1374 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1376 +#: src/lang.c:1379 msgid "Thread articles by" msgstr "" -#: src/lang.c:1377 +#: src/lang.c:1380 msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" msgstr "" -#: src/lang.c:1383 +#: src/lang.c:1386 msgid "Score of a thread" msgstr "" -#: src/lang.c:1384 +#: src/lang.c:1387 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "" -#: src/lang.c:1388 +#: src/lang.c:1391 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1389 +#: src/lang.c:1392 msgid "Sort articles by" msgstr "" -#: src/lang.c:1390 +#: src/lang.c:1393 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:1396 +#: src/lang.c:1399 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1397 +#: src/lang.c:1400 msgid "Sort threads by" msgstr "" -#: src/lang.c:1398 +#: src/lang.c:1401 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" msgstr "" -#: src/lang.c:1402 +#: src/lang.c:1405 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1403 +#: src/lang.c:1406 msgid "Goto first unread article in group" msgstr "" -#: src/lang.c:1404 +#: src/lang.c:1407 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1408 +#: src/lang.c:1411 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1409 +#: src/lang.c:1412 msgid "Show only unread articles" msgstr "" -#: src/lang.c:1410 +#: src/lang.c:1413 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1415 +#: src/lang.c:1418 msgid "Show only groups with unread arts" msgstr "" -#: src/lang.c:1416 +#: src/lang.c:1419 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1421 +#: src/lang.c:1424 msgid "Filter which articles" msgstr "" -#: src/lang.c:1422 +#: src/lang.c:1425 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:1429 +#: src/lang.c:1432 msgid "Tab goes to next unread article" msgstr "" -#: src/lang.c:1430 +#: src/lang.c:1433 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "" -#: src/lang.c:1434 +#: src/lang.c:1437 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "" -#: src/lang.c:1435 +#: src/lang.c:1438 msgid "Space goes to next unread article" msgstr "" -#: src/lang.c:1436 +#: src/lang.c:1439 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:1441 +#: src/lang.c:1444 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "" -#: src/lang.c:1442 +#: src/lang.c:1445 msgid "PgDn goes to next unread article" msgstr "" -#: src/lang.c:1443 +#: src/lang.c:1446 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:1449 +#: src/lang.c:1452 msgid "List thread using right arrow key" msgstr "" -#: src/lang.c:1450 +#: src/lang.c:1453 msgid "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1454 +#: src/lang.c:1457 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1455 +#: src/lang.c:1458 msgid "Character to show deleted articles" msgstr "" -#: src/lang.c:1456 +#: src/lang.c:1459 msgid "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1461 +#: src/lang.c:1464 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1462 +#: src/lang.c:1465 msgid "Character to show inrange articles" msgstr "" -#: src/lang.c:1463 +#: src/lang.c:1466 msgid "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1468 +#: src/lang.c:1471 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1469 +#: src/lang.c:1472 msgid "Character to show returning arts" msgstr "" -#: src/lang.c:1470 +#: src/lang.c:1473 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1475 +#: src/lang.c:1478 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1476 +#: src/lang.c:1479 msgid "Character to show selected articles" msgstr "" -#: src/lang.c:1477 +#: src/lang.c:1480 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1482 +#: src/lang.c:1485 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1483 +#: src/lang.c:1486 msgid "Character to show recent articles" msgstr "" -#: src/lang.c:1484 +#: src/lang.c:1487 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1489 +#: src/lang.c:1492 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1490 +#: src/lang.c:1493 msgid "Character to show unread articles" msgstr "" -#: src/lang.c:1491 +#: src/lang.c:1494 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1496 +#: src/lang.c:1499 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1497 +#: src/lang.c:1500 msgid "Character to show read articles" msgstr "" -#: src/lang.c:1498 +#: src/lang.c:1501 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1503 +#: src/lang.c:1506 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1504 +#: src/lang.c:1507 msgid "Character to show killed articles" msgstr "" -#: src/lang.c:1505 +#: src/lang.c:1508 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:1510 +#: src/lang.c:1513 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1511 +#: src/lang.c:1514 msgid "Character to show readselected arts" msgstr "" -#: src/lang.c:1512 +#: src/lang.c:1515 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:1517 +#: src/lang.c:1520 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1518 +#: src/lang.c:1521 msgid "Max. length of group names shown" msgstr "" -#: src/lang.c:1519 +#: src/lang.c:1522 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1524 +#: src/lang.c:1527 msgid "Show lines/score in listings" msgstr "" -#: src/lang.c:1525 +#: src/lang.c:1528 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:1530 +#: src/lang.c:1533 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1531 +#: src/lang.c:1534 msgid "Number of lines to scroll in pager" msgstr "" -#: src/lang.c:1532 +#: src/lang.c:1535 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" @@ -4389,27 +4394,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:1539 +#: src/lang.c:1542 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1540 +#: src/lang.c:1543 msgid "Display signatures" msgstr "" -#: src/lang.c:1541 +#: src/lang.c:1544 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1545 +#: src/lang.c:1548 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1546 +#: src/lang.c:1549 msgid "Display uue data as an attachment" msgstr "" -#: src/lang.c:1547 +#: src/lang.c:1550 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" @@ -4418,28 +4423,28 @@ msgid "# Handling of uuencoded data in t "# into a tag line.\n" msgstr "" -#: src/lang.c:1556 +#: src/lang.c:1559 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1557 +#: src/lang.c:1560 msgid "Display \"a as Umlaut-a" msgstr "" -#: src/lang.c:1558 +#: src/lang.c:1561 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1563 src/lang.c:1573 +#: src/lang.c:1566 src/lang.c:1576 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1564 +#: src/lang.c:1567 msgid "Display these header fields (or *)" msgstr "" -#: src/lang.c:1565 +#: src/lang.c:1568 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" @@ -4448,11 +4453,11 @@ msgid "# Which news headers you wish to "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1574 +#: src/lang.c:1577 msgid "Do not display these header fields" msgstr "" -#: src/lang.c:1575 +#: src/lang.c:1578 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 " @@ -4463,520 +4468,520 @@ msgid "# Same as 'news_headers_to_displa "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1585 +#: src/lang.c:1588 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1586 +#: src/lang.c:1589 msgid "Skip multipart/alternative parts" msgstr "" -#: src/lang.c:1587 +#: src/lang.c:1590 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1592 +#: src/lang.c:1595 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Regex used to show quoted lines" msgstr "" -#: src/lang.c:1594 +#: src/lang.c:1597 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:1600 +#: src/lang.c:1603 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1601 +#: src/lang.c:1604 msgid "Regex used to show twice quoted l." msgstr "" -#: src/lang.c:1602 +#: src/lang.c:1605 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:1608 +#: src/lang.c:1611 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1609 +#: src/lang.c:1612 msgid "Regex used to show >= 3 times q.l." msgstr "" -#: src/lang.c:1610 +#: src/lang.c:1613 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:1617 +#: src/lang.c:1620 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Regex used to highlight /slashes/" msgstr "" -#: src/lang.c:1619 +#: src/lang.c:1622 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:1625 +#: src/lang.c:1628 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1626 +#: src/lang.c:1629 msgid "Regex used to highlight *stars*" msgstr "" -#: src/lang.c:1627 +#: src/lang.c:1630 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:1633 +#: src/lang.c:1636 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1634 +#: src/lang.c:1637 msgid "Regex used to highlight -strokes-" msgstr "" -#: src/lang.c:1635 +#: src/lang.c:1638 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:1641 +#: src/lang.c:1644 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Regex used to highlight _underline_" msgstr "" -#: src/lang.c:1643 +#: src/lang.c:1646 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:1649 +#: src/lang.c:1652 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "Regex with Subject prefixes" msgstr "" -#: src/lang.c:1651 +#: src/lang.c:1654 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:1656 +#: src/lang.c:1659 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1657 +#: src/lang.c:1660 msgid "Regex with Subject suffixes" msgstr "" -#: src/lang.c:1658 +#: src/lang.c:1661 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:1663 +#: src/lang.c:1666 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1664 +#: src/lang.c:1667 msgid "MIME binary content viewer" msgstr "" -#: src/lang.c:1665 +#: src/lang.c:1668 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:1672 +#: src/lang.c:1675 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Ask before using MIME viewer" msgstr "" -#: src/lang.c:1674 +#: src/lang.c:1677 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:1679 +#: src/lang.c:1682 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1680 +#: src/lang.c:1683 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:1681 +#: src/lang.c:1684 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:1687 +#: src/lang.c:1690 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1692 +#: src/lang.c:1695 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:1698 +#: src/lang.c:1701 msgid "Which actions require confirmation" msgstr "" -#: src/lang.c:1699 +#: src/lang.c:1702 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1704 +#: src/lang.c:1707 msgid "'Mark article read' ignores tags" msgstr "" -#: src/lang.c:1705 +#: src/lang.c:1708 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Program that opens URL's" msgstr "" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1716 +#: src/lang.c:1719 msgid "Use mouse in xterm" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1720 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1723 +#: src/lang.c:1726 msgid "Use scroll keys on keypad" msgstr "" -#: src/lang.c:1724 +#: src/lang.c:1727 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1730 +#: src/lang.c:1733 msgid "Number of articles to get" msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1734 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:1736 +#: src/lang.c:1739 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1740 msgid "Article recentness time limit" msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1741 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1742 +#: src/lang.c:1745 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1743 +#: src/lang.c:1746 msgid "Wildcard matching" msgstr "" -#: src/lang.c:1744 +#: src/lang.c:1747 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1748 +#: src/lang.c:1751 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1749 +#: src/lang.c:1752 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1753 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1754 +#: src/lang.c:1757 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1755 +#: src/lang.c:1758 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1759 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1760 +#: src/lang.c:1763 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1761 +#: src/lang.c:1764 msgid "Score limit (select)" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1765 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1766 +#: src/lang.c:1769 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1767 +#: src/lang.c:1770 msgid "Default score to select articles" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1774 +#: src/lang.c:1777 msgid "Use slrnface to show ''X-Face:''s" msgstr "" -#: src/lang.c:1775 +#: src/lang.c:1778 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:1783 +#: src/lang.c:1786 msgid "Use ANSI color" msgstr "Use ANSI colour" -#: src/lang.c:1784 +#: src/lang.c:1787 msgid "# If ON using ANSI-color\n" msgstr "# If ON using ANSI-colour\n" -#: src/lang.c:1789 +#: src/lang.c:1792 msgid "Standard foreground color" msgstr "Standard foreground colour" -#: src/lang.c:1790 +#: src/lang.c:1793 msgid "# Standard foreground color\n" msgstr "# Standard foreground colour\n" -#: src/lang.c:1795 +#: src/lang.c:1798 msgid "Standard background color" msgstr "Standard background colour" -#: src/lang.c:1796 +#: src/lang.c:1799 msgid "# Standard-Background-Color\n" msgstr "# Standard-Background-Colour\n" -#: src/lang.c:1801 +#: src/lang.c:1804 msgid "Color for inverse text (background)" msgstr "Colour for inverse text (bg)" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "# Color of background for inverse text\n" msgstr "# Colour of background for inverse text\n" -#: src/lang.c:1807 +#: src/lang.c:1810 msgid "Color for inverse text (foreground)" msgstr "Colour for inverse text (fg)" -#: src/lang.c:1808 +#: src/lang.c:1811 msgid "# Color of foreground for inverse text\n" msgstr "# Colour of foreground for inverse text\n" -#: src/lang.c:1813 +#: src/lang.c:1816 msgid "Color of text lines" msgstr "Colour of text lines" -#: src/lang.c:1814 +#: src/lang.c:1817 msgid "# Color of text-lines\n" msgstr "# Colour of text-lines\n" -#: src/lang.c:1819 +#: src/lang.c:1822 msgid "Color of mini help menu" msgstr "Colour of mini help menu" -#: src/lang.c:1820 +#: src/lang.c:1823 msgid "# Color of mini help menu\n" msgstr "# Colour of mini help menu\n" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "Color of help text" msgstr "Colour of help text" -#: src/lang.c:1826 +#: src/lang.c:1829 msgid "# Color of help pages\n" msgstr "# Colour of help pages\n" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Color of status messages" msgstr "Colour of status messages" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "# Color of messages in last line\n" msgstr "# Colour of messages in last line\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Color of quoted lines" msgstr "Colour of quoted lines" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "# Color of quote-lines\n" msgstr "# Colour of quote-lines\n" -#: src/lang.c:1843 +#: src/lang.c:1846 msgid "Color of twice quoted line" msgstr "Colour of twice quoted line" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "# Color of twice quoted lines\n" msgstr "# Colour of twice quoted lines\n" -#: src/lang.c:1849 +#: src/lang.c:1852 msgid "Color of =>3 times quoted line" msgstr "Colour of =>3 times quoted line" -#: src/lang.c:1850 +#: src/lang.c:1853 msgid "# Color of >=3 times quoted lines\n" msgstr "# Colour of >=3 times quoted lines\n" -#: src/lang.c:1855 +#: src/lang.c:1858 msgid "Color of article header lines" msgstr "Colour of article header lines" -#: src/lang.c:1856 +#: src/lang.c:1859 msgid "# Color of header-lines\n" msgstr "# Colour of header-lines\n" -#: src/lang.c:1861 +#: src/lang.c:1864 msgid "Color of actual news header fields" msgstr "Colour of actual news header fields" -#: src/lang.c:1862 +#: src/lang.c:1865 msgid "# Color of actual news header fields\n" msgstr "# Colour of actual news header fields\n" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "Color of article subject lines" msgstr "Colour of article subject lines" -#: src/lang.c:1868 +#: src/lang.c:1871 msgid "# Color of article subject\n" msgstr "# Colour of article subject\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "Color of response counter" msgstr "Colour of response counter" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "# Color of response counter\n" msgstr "# Colour of response counter\n" -#: src/lang.c:1879 +#: src/lang.c:1882 msgid "Color of sender (From:)" msgstr "Colour of sender (From:)" -#: src/lang.c:1880 +#: src/lang.c:1883 msgid "# Color of sender (From:)\n" msgstr "# Colour of sender (From:)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Color of help/mail sign" msgstr "Colour of help/mail sign" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "# Color of Help/Mail-Sign\n" msgstr "# Colour of Help/Mail-Sign\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "Color of signatures" msgstr "Colour of signatures" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "# Color of signature\n" msgstr "# Colour of signature\n" -#: src/lang.c:1897 +#: src/lang.c:1900 msgid "Color of highlighted URLs" msgstr "Colour of highlighted URLs" -#: src/lang.c:1898 +#: src/lang.c:1901 msgid "# Color of highlighted URLs\n" msgstr "# Colour of highlighted URLs\n" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "Color of highlighting with *stars*" msgstr "Colour of highlighting with *stars*" -#: src/lang.c:1904 +#: src/lang.c:1907 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:1910 +#: src/lang.c:1913 msgid "Color of highlighting with _dash_" msgstr "Colour of highlighting with _dash_" -#: src/lang.c:1916 +#: src/lang.c:1919 msgid "Color of highlighting with /slash/" msgstr "Colour of highlighting with /slash/" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "Color of highlighting with -stroke-" msgstr "Colour of highlighting w. -stroke-" -#: src/lang.c:1929 +#: src/lang.c:1932 msgid "Attr. of highlighting with *stars*" msgstr "" -#: src/lang.c:1930 +#: src/lang.c:1933 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -4985,93 +4990,93 @@ msgid "# Attribute of word highlighting "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Attr. of highlighting with /slash/" msgstr "" -#: src/lang.c:1952 +#: src/lang.c:1955 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:1958 +#: src/lang.c:1961 msgid "URL highlighting in message body" msgstr "" -#: src/lang.c:1959 +#: src/lang.c:1962 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:1964 +#: src/lang.c:1967 msgid "Word highlighting in message body" msgstr "" -#: src/lang.c:1965 +#: src/lang.c:1968 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:1971 +#: src/lang.c:1974 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:1977 +#: src/lang.c:1980 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1978 +#: src/lang.c:1981 msgid "Page line wrap column" msgstr "" -#: src/lang.c:1979 +#: src/lang.c:1982 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1989 +#: src/lang.c:1992 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1990 +#: src/lang.c:1993 msgid "Mail address (and fullname)" msgstr "" -#: src/lang.c:1991 +#: src/lang.c:1994 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:1996 +#: src/lang.c:1999 msgid "Show empty Followup-To in editor" msgstr "" -#: src/lang.c:1997 +#: src/lang.c:2000 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "Create signature from path/command" msgstr "" -#: src/lang.c:2003 +#: src/lang.c:2006 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 " @@ -5079,48 +5084,48 @@ msgid "# Signature path (random sigs)/fi "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2011 +#: src/lang.c:2014 msgid "Prepend signature with \"-- \"" msgstr "" -#: src/lang.c:2012 +#: src/lang.c:2015 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Add signature when reposting" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2022 +#: src/lang.c:2025 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "Characters used as quote-marks" msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2027 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:2030 +#: src/lang.c:2033 msgid "Quoting behavior" msgstr "Quoting behaviour" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5132,49 +5137,49 @@ msgid "# How quoting should be handled w "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 +#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "Quote line when following up" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2048 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:2052 +#: src/lang.c:2055 msgid "Quote line when cross-posting" msgstr "" -#: src/lang.c:2058 +#: src/lang.c:2061 msgid "Quote line when mailing" msgstr "" -#: src/lang.c:2063 +#: src/lang.c:2066 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2064 +#: src/lang.c:2067 msgid "Insert 'User-Agent:'-header" msgstr "" -#: src/lang.c:2065 +#: src/lang.c:2068 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2069 +#: src/lang.c:2073 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2070 +#: src/lang.c:2074 msgid "MM_CHARSET" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2075 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" @@ -5183,27 +5188,27 @@ msgid "# Charset supported locally which "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2082 +#: src/lang.c:2085 msgid "MM_NETWORK_CHARSET" msgstr "" -#: src/lang.c:2083 +#: src/lang.c:2086 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2089 +#: src/lang.c:2092 msgid "Mailbox format" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2095 +#: src/lang.c:2098 msgid "MIME encoding in news messages" msgstr "" -#: src/lang.c:2096 +#: src/lang.c:2099 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" @@ -5211,42 +5216,42 @@ msgid "# MIME encoding (8bit, base64, qu "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2104 src/lang.c:2125 +#: src/lang.c:2107 src/lang.c:2128 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "Use 8bit characters in news headers" msgstr "" -#: src/lang.c:2106 +#: src/lang.c:2109 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:2113 +#: src/lang.c:2116 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2114 +#: src/lang.c:2117 msgid "View post-processed files" msgstr "" -#: src/lang.c:2115 +#: src/lang.c:2118 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2120 +#: src/lang.c:2123 msgid "MIME encoding in mail messages" msgstr "" -#: src/lang.c:2126 +#: src/lang.c:2129 msgid "Use 8bit characters in mail headers" msgstr "" -#: src/lang.c:2127 +#: src/lang.c:2130 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 " @@ -5256,393 +5261,393 @@ msgid "# If ON, 8bit characters in mail "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2137 +#: src/lang.c:2140 msgid "Strip blanks from ends of lines" msgstr "" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2143 +#: src/lang.c:2146 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Transliteration" msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2148 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:2152 +#: src/lang.c:2155 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2153 +#: src/lang.c:2156 msgid "Send you a cc automatically" msgstr "" -#: src/lang.c:2154 +#: src/lang.c:2157 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "Send you a blind cc automatically" msgstr "" -#: src/lang.c:2160 +#: src/lang.c:2163 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2164 +#: src/lang.c:2167 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2165 +#: src/lang.c:2168 msgid "Spamtrap warning address parts" msgstr "" -#: src/lang.c:2166 +#: src/lang.c:2169 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:2171 +#: src/lang.c:2174 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2172 +#: src/lang.c:2175 msgid "No. of days a filter entry is valid" msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2177 +#: src/lang.c:2180 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2178 +#: src/lang.c:2181 msgid "Add posted articles to filter" msgstr "" -#: src/lang.c:2179 +#: src/lang.c:2182 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2183 +#: src/lang.c:2186 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2184 +#: src/lang.c:2187 msgid "Mail directory" msgstr "" -#: src/lang.c:2185 +#: src/lang.c:2188 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2190 +#: src/lang.c:2193 msgid "Save articles in batch mode (-S)" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2194 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:2196 +#: src/lang.c:2199 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2197 +#: src/lang.c:2200 msgid "Directory to save arts/threads in" msgstr "" -#: src/lang.c:2198 +#: src/lang.c:2201 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "" -#: src/lang.c:2203 +#: src/lang.c:2206 msgid "Use Archive-name: header for save" msgstr "" -#: src/lang.c:2204 +#: src/lang.c:2207 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:2209 +#: src/lang.c:2212 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2210 +#: src/lang.c:2213 msgid "Mark saved articles/threads as read" msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2214 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "Post process saved articles" msgstr "" -#: src/lang.c:2217 +#: src/lang.c:2220 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:2223 +#: src/lang.c:2226 msgid "Process only unread articles" msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2227 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "Print all headers when printing" msgstr "" -#: src/lang.c:2231 +#: src/lang.c:2234 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2235 +#: src/lang.c:2238 msgid "The printer program with options that is to be used to print articles/threads." msgstr "" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Printer program with options" msgstr "" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Force redraw after certain commands" msgstr "" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2248 +#: src/lang.c:2251 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2249 +#: src/lang.c:2252 msgid "Start editor with line offset" msgstr "" -#: src/lang.c:2250 +#: src/lang.c:2253 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:2255 +#: src/lang.c:2258 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2256 +#: src/lang.c:2259 msgid "Invocation of your editor" msgstr "" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2262 +#: src/lang.c:2265 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2263 +#: src/lang.c:2266 msgid "External inews" msgstr "" -#: src/lang.c:2264 +#: src/lang.c:2267 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:2268 +#: src/lang.c:2271 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2269 +#: src/lang.c:2272 msgid "Invocation of your mail command" msgstr "" -#: src/lang.c:2270 +#: src/lang.c:2273 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:2278 +#: src/lang.c:2281 msgid "Use interactive mail reader" msgstr "" -#: src/lang.c:2279 +#: src/lang.c:2282 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:2287 +#: src/lang.c:2290 msgid "Remove ~/.article after posting" msgstr "" -#: src/lang.c:2288 +#: src/lang.c:2291 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "Filename for posted articles" msgstr "" -#: src/lang.c:2294 +#: src/lang.c:2297 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:2299 +#: src/lang.c:2302 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "Keep failed arts in ~/dead.articles" msgstr "" -#: src/lang.c:2301 +#: src/lang.c:2304 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2305 +#: src/lang.c:2308 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "No unsubscribed groups in newsrc" msgstr "" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2312 +#: src/lang.c:2315 msgid "Remove bogus groups from newsrc" msgstr "" -#: src/lang.c:2313 +#: src/lang.c:2316 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:2317 +#: src/lang.c:2320 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2318 +#: src/lang.c:2321 msgid "Interval in secs to reread active" msgstr "" -#: src/lang.c:2319 +#: src/lang.c:2322 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2324 +#: src/lang.c:2327 msgid "Reconnect to server automatically" msgstr "" -#: src/lang.c:2325 +#: src/lang.c:2328 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2329 +#: src/lang.c:2332 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2330 +#: src/lang.c:2333 msgid "Cache NNTP overview files locally" msgstr "" -#: src/lang.c:2331 +#: src/lang.c:2334 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2336 +#: src/lang.c:2339 msgid "Format string for display of dates" msgstr "" -#: src/lang.c:2337 +#: src/lang.c:2340 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2343 +#: src/lang.c:2346 msgid "Unicode normalization form" msgstr "Unicode normalisation form" -#: src/lang.c:2344 +#: src/lang.c:2347 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/lang.c:2351 +#: src/lang.c:2354 msgid "Render BiDi" msgstr "" -#: src/lang.c:2352 +#: src/lang.c:2355 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/main.c:590 +#: src/misc.c:3711 #, c-format -msgid "Version: %s release %s (\"%s\") %s %s" +msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/main.c:593 +#: src/misc.c:3714 #, c-format -msgid "Version: %s release %s (\"%s\")" +msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" #: src/newsrc.c:432 @@ -5674,7 +5679,7 @@ msgstr "" msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1951 +#: src/post.c:1962 #, c-format msgid "Posting: %.*s ..." msgstr "" @@ -5713,19 +5718,19 @@ msgid "This message has been composed in "\n" msgstr "" -#: src/save.c:967 +#: src/save.c:974 msgid "bytes" msgstr "" -#: src/select.c:351 +#: src/select.c:352 msgid "unread" msgstr "" -#: src/select.c:351 +#: src/select.c:352 msgid "all" msgstr "" -#: src/select.c:529 src/select.c:531 +#: src/select.c:530 src/select.c:532 msgid " R" msgstr "" Binary files tin-1.7.5/po/et.gmo and tin-1.7.6/po/et.gmo differ diff -Nurp tin-1.7.5/po/et.po tin-1.7.6/po/et.po --- tin-1.7.5/po/et.po 2004-08-20 10:35:18.000000000 +0200 +++ tin-1.7.6/po/et.po 2004-09-06 10:41:33.000000000 +0200 @@ -4,7 +4,7 @@ # msgid "" msgstr "Project-Id-Version: tin 1.7.2\n" - "POT-Creation-Date: 2004-06-04 13:31+0200\n" + "POT-Creation-Date: 2004-09-06 10:40+0200\n" "PO-Revision-Date: 2003-01-07 18:45+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -13,222 +13,222 @@ msgstr "Project-Id-Version: tin 1.7.2\n" "Content-Transfer-Encoding: 8bit\n" "Report-Msgid-Bugs-To: \n" -#: src/art.c:1430 +#: src/art.c:1447 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Vigane overview kirje (%d välja) '%s'" -#: src/attrib.c:590 +#: src/attrib.c:594 msgid "# Do not edit this comment block\n" "#\n" msgstr "# Ärge seda kommentaari blokki muutke\n" "#\n" -#: src/attrib.c:591 +#: src/attrib.c:595 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=SÕNE (n. alt.*,!alt.bin*) [kohustuslik]\n" -#: src/attrib.c:592 +#: src/attrib.c:596 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=SÕNE (n. ~/Mail)\n" -#: src/attrib.c:593 +#: src/attrib.c:597 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=SÕNE (n. ~user/News)\n" -#: src/attrib.c:594 +#: src/attrib.c:598 msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=SÕNE (n. =linux)\n" -#: src/attrib.c:595 +#: src/attrib.c:599 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=SÕNE (n. $var/sig)\n" -#: src/attrib.c:596 +#: src/attrib.c:600 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=SÕNE (kui algab sümboliga '/', loe failist)\n" -#: src/attrib.c:597 +#: src/attrib.c:601 msgid "# followup_to=STRING\n" msgstr "# followup_to=SÕNE\n" -#: src/attrib.c:598 +#: src/attrib.c:602 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=SÕNE (n. majordomo@example.org)\n" -#: src/attrib.c:599 +#: src/attrib.c:603 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=SÕNE (n. ~/.tin/extra-headers)\n" -#: src/attrib.c:600 +#: src/attrib.c:604 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=SÕNE (n. ~/.tin/extra-body-text)\n" -#: src/attrib.c:601 +#: src/attrib.c:605 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=SÕNE (kirjutage soovitav From: rida, ärge kasutage jutumärke)\n" -#: src/attrib.c:602 +#: src/attrib.c:606 msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=SÕNE\n" -#: src/attrib.c:603 +#: src/attrib.c:607 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=SÕNE (%%s, %%S annavad initsiaalid)\n" -#: src/attrib.c:604 +#: src/attrib.c:608 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=SÕNE (n. image/*,!image/bmp)\n" -#: src/attrib.c:606 +#: src/attrib.c:610 msgid "# ispell=STRING\n" msgstr "# ispell=SÕNE\n" -#: src/attrib.c:608 +#: src/attrib.c:612 msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:609 +#: src/attrib.c:613 msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:610 +#: src/attrib.c:614 msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:611 +#: src/attrib.c:615 msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:612 +#: src/attrib.c:616 msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" -#: src/attrib.c:613 +#: src/attrib.c:617 msgid "# thread_arts=NUM" msgstr "# thread_arts=NUM" -#: src/attrib.c:620 +#: src/attrib.c:624 msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:626 +#: src/attrib.c:630 msgid "# show_info=NUM\n" msgstr "# show_info=NUM\n" -#: src/attrib.c:632 +#: src/attrib.c:636 msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=NUM\n" -#: src/attrib.c:650 +#: src/attrib.c:654 msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:655 +#: src/attrib.c:659 msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=NUM\n" -#: src/attrib.c:660 +#: src/attrib.c:664 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=SÕNE (n. talk.*)\n" -#: src/attrib.c:661 +#: src/attrib.c:665 msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:662 +#: src/attrib.c:666 msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:663 +#: src/attrib.c:667 msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:664 src/attrib.c:671 +#: src/attrib.c:668 src/attrib.c:675 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0=teema (tõstutundlik) 1=teema (tõstutundetu)\n" -#: src/attrib.c:665 src/attrib.c:672 +#: src/attrib.c:669 src/attrib.c:676 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2=saatja (tõstutundlik) 3=saatja (tõstutundetu)\n" -#: src/attrib.c:666 src/attrib.c:673 +#: src/attrib.c:670 src/attrib.c:677 msgid "# 4=msgid 5=lines\n" msgstr "# 4=msgid 5=read\n" -#: src/attrib.c:667 +#: src/attrib.c:671 msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=SÕNE\n" -#: src/attrib.c:668 +#: src/attrib.c:672 msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:669 +#: src/attrib.c:673 msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:670 +#: src/attrib.c:674 msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:674 +#: src/attrib.c:678 msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:675 +#: src/attrib.c:679 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=SÕNE (n. =postkast)\n" # -#: src/attrib.c:676 +#: src/attrib.c:680 msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" # TRANSLATION MISSING -#: src/attrib.c:677 +#: src/attrib.c:681 msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:683 msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=toetatud_koodileht" -#: src/attrib.c:686 +#: src/attrib.c:690 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=SÕNE (vaikimisi on US-ASCII)\n" -#: src/attrib.c:688 +#: src/attrib.c:692 msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Märkus: parem on kõigepealt kirjeldada üldisemad (globaalse skoobiga)\n" -#: src/attrib.c:689 +#: src/attrib.c:693 msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# ning seejärel konkreetsemad, grupi spetsiifilised, reeglid.\n" "#\n" -#: src/attrib.c:690 +#: src/attrib.c:694 msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:696 +#: src/attrib.c:700 msgid "# include extra headers\n" msgstr "# lisa täiendavaid päiseid\n" -#: src/attrib.c:704 +#: src/attrib.c:708 msgid "# in *sources* set post process type to shar only\n" msgstr "# *tekstidel* sea järeltöötlemise tüübiks ainult shar\n" -#: src/attrib.c:708 +#: src/attrib.c:712 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "# *binaarfailidel* sea täielik järeltöötlemine, kustuta ajutised failid\n" -#: src/attrib.c:709 +#: src/attrib.c:713 msgid "# and set Followup-To: poster\n" msgstr "# ja sea Followup-To: postitaja\n" @@ -591,7 +591,7 @@ msgstr "Loon salvestatud gruppidele acti msgid "Creating newsrc file...\n" msgstr "Loon newsrc faili...\n" -#: src/lang.c:127 src/lang.c:1118 +#: src/lang.c:127 src/lang.c:1121 msgid "Default" msgstr "Vaikimisi" @@ -1627,7 +1627,7 @@ msgstr "liiguta valitud gruppi loendis" msgid "choose next group with unread news" msgstr "vali järgmine lugemata artiklitega grupp" -#: src/lang.c:384 src/lang.c:1165 +#: src/lang.c:384 src/lang.c:1168 msgid "quit" msgstr "välju" @@ -2530,91 +2530,97 @@ msgstr "Loen gruppide kirjeldusi... " msgid "Reading newsrc file..." msgstr "Loen newsrc faili..." -#: src/lang.c:609 +# TRANSLATION MISSING +#: src/lang.c:610 +#, c-format +msgid "(%d:%02d remaining)" +msgstr "" + +#: src/lang.c:612 #, c-format msgid "Bogus group %s removed." msgstr "Vigane grupp %s on eemaldatud." -#: src/lang.c:610 +#: src/lang.c:613 #, c-format msgid "Error: rename %s to %s" msgstr "Viga: %s uus nimi %s" -#: src/lang.c:611 +#: src/lang.c:614 msgid "Reply to author..." msgstr "Vastan autorile..." -#: src/lang.c:612 +#: src/lang.c:615 msgid "Repost" msgstr "Uuesti postitus" -#: src/lang.c:613 +#: src/lang.c:616 msgid "Reposting article..." msgstr "Postitan artikli uuesti..." -#: src/lang.c:614 +#: src/lang.c:617 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Postitan artikli(d) gruppi(desse) [%s]> " -#: src/lang.c:615 +#: src/lang.c:618 msgid "Reset newsrc?" msgstr "Algväärtustan newsrc?" -#: src/lang.c:616 +#: src/lang.c:619 msgid "Responses have been directed to the following newsgroups" msgstr "Vastused edastatakse järgnevatesse gruppidesse" -#: src/lang.c:617 +#: src/lang.c:620 #, 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:618 +#: src/lang.c:621 #, c-format msgid "RespNo %4d of %4d" msgstr "Vastus %4d : %4d" -#: src/lang.c:619 +#: src/lang.c:622 msgid "Press to continue..." msgstr "Jätkamiseks vajutage ..." -#: src/lang.c:621 +#: src/lang.c:624 #, c-format msgid "Select From [%s] (y/n): " msgstr "Valige From [%s] (j/e): " -#: src/lang.c:622 +#: src/lang.c:625 msgid "Select Lines: (num): " msgstr "Valige read: (num): " -#: src/lang.c:623 +#: src/lang.c:626 msgid "Auto-select Article Menu" msgstr "Automaatselt valitavate artiklite menüü" -#: src/lang.c:624 +#: src/lang.c:627 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "Valige Msg-Id [%s] (f/l/o/n): " -#: src/lang.c:625 +#: src/lang.c:628 msgid "Select pattern scope: " msgstr "Valige mustri ulatus: " -#: src/lang.c:626 +#: src/lang.c:629 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Valige teema [%s] (j/e): " -#: src/lang.c:627 +#: src/lang.c:630 msgid "Select text pattern : " msgstr "Valige tekstimuster : " -#: src/lang.c:628 +#: src/lang.c:631 msgid "Select time in days : " msgstr "Valige aeg päevades : " -#: src/lang.c:629 +#: src/lang.c:632 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2633,218 +2639,218 @@ msgstr "# %s serveri seadete fail\n" "############################################################################\n" "\n" -#: src/lang.c:635 +#: src/lang.c:638 msgid "Showing unread groups only" msgstr "Näitan ainult lugemata gruppe" -#: src/lang.c:636 +#: src/lang.c:639 msgid "Subject: line (ignore case) " msgstr "Subject: rida (tõstutundetu)" -#: src/lang.c:637 +#: src/lang.c:640 msgid "Subject: line (case sensitive)" msgstr "Subject: rida (tõstutundlik)" -#: src/lang.c:638 +#: src/lang.c:641 msgid "Save" msgstr "Salvesta" -#: src/lang.c:639 +#: src/lang.c:642 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Salvestan '%s' (%s/%s)?" -#: src/lang.c:640 +#: src/lang.c:643 msgid "Save configuration before continuing?" msgstr "Salvestan seaded enne jätkamist?" -#: src/lang.c:641 +#: src/lang.c:644 msgid "Save filename> " msgstr "Fail salvestamiseks> " -#: src/lang.c:642 +#: src/lang.c:645 msgid "Saved" msgstr "Salvestatud" -#: src/lang.c:643 +#: src/lang.c:646 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "%4d lugemata (%4d kuuma) %s grupis %s\n" -#: src/lang.c:644 +#: src/lang.c:647 #, c-format msgid "Saved %s...\n" msgstr "Salvestatud %s...\n" -#: src/lang.c:645 +#: src/lang.c:648 msgid "Nothing was saved" msgstr "Midagi ei salvestatud" -#: src/lang.c:646 +#: src/lang.c:649 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s %d grupist%s\n" -#: src/lang.c:647 +#: src/lang.c:650 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s salvestati %s%s --" -#: src/lang.c:648 +#: src/lang.c:651 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s salvestati %s - %s --" -#: src/lang.c:649 +#: src/lang.c:652 msgid "Saving..." msgstr "Salvestan..." -#: src/lang.c:650 +#: src/lang.c:653 #, c-format msgid "%s: Screen initialization failed" msgstr "%s: Ekraani initsialiseerimine ebaõnnestus" -#: src/lang.c:651 +#: src/lang.c:654 #, c-format msgid "%s: screen is too small\n" msgstr "%s: ekraan on liiga väike\n" -#: src/lang.c:652 +#: src/lang.c:655 #, 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:653 +#: src/lang.c:656 #, c-format msgid "Search backwards [%s]> " msgstr "Otsin tagurpidi [%s]> " -#: src/lang.c:654 +#: src/lang.c:657 #, c-format msgid "Search body [%s]> " msgstr "Otsi kehast [%s]> " -#: src/lang.c:655 +#: src/lang.c:658 #, c-format msgid "Search forwards [%s]> " msgstr "Otsi edaspidi [%s]> " -#: src/lang.c:656 +#: src/lang.c:659 msgid "Searching..." msgstr "Otsin..." -#: src/lang.c:657 +#: src/lang.c:660 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Otsin artiklit %d/%d ('q' katkestamiseks)..." -#: src/lang.c:658 +#: src/lang.c:661 msgid "Select article> " msgstr "Valige artikkel> " -#: src/lang.c:659 +#: src/lang.c:662 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:660 +#: src/lang.c:663 msgid "Select group> " msgstr "Valige grupp> " -#: src/lang.c:661 +#: src/lang.c:664 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Sisestage valiku muster [%s]> " -#: src/lang.c:662 +#: src/lang.c:665 msgid "Select thread > " msgstr "Valige teema > " -#: src/lang.c:663 +#: src/lang.c:666 #, 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:664 +#: src/lang.c:667 msgid "servers active-file" msgstr "serveri aktiivsete gruppide fail" -#: src/lang.c:665 +#: src/lang.c:668 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Uutesse gruppidesse ei saa siseneda. Tellige kõigepealt..." -#: src/lang.c:666 +#: src/lang.c:669 msgid "" msgstr "" -#: src/lang.c:667 +#: src/lang.c:670 #, c-format msgid "Starting: (%s)" msgstr "Stardin: (%s)" -#: src/lang.c:668 +#: src/lang.c:671 #, c-format msgid "List Thread (%d of %d)" msgstr "Teemad (%d/%d)" -#: src/lang.c:669 +#: src/lang.c:672 #, c-format msgid "Thread (%.*s)" msgstr "Teema (%.*s)" -#: src/lang.c:670 +#: src/lang.c:673 msgid "Enter wildcard subscribe pattern> " msgstr "Sisestage tellimise muster> " -#: src/lang.c:671 +#: src/lang.c:674 #, c-format msgid "subscribed to %d groups" msgstr "%d gruppi on tellitud" -#: src/lang.c:672 +#: src/lang.c:675 #, c-format msgid "Subscribed to %s" msgstr "%s on tellitud" -#: src/lang.c:673 +#: src/lang.c:676 msgid "Subscribing... " msgstr "Tellin... " -#: src/lang.c:674 +#: src/lang.c:677 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:675 +#: src/lang.c:678 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Asendan artikli(d) gruppides [%s]> " -#: src/lang.c:676 +#: src/lang.c:679 msgid "Superseding article ..." msgstr "Asendan artikli ..." -#: src/lang.c:677 +#: src/lang.c:680 #, 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:679 +#: src/lang.c:682 #, c-format msgid "%d days" msgstr "%d päeva" -#: src/lang.c:680 +#: src/lang.c:683 msgid "" msgstr "" -#: src/lang.c:681 +#: src/lang.c:684 msgid "# Default action/prompt strings\n" msgstr "# Vaikimisi aktsioonide/viipade sõned\n" -#: src/lang.c:682 +#: src/lang.c:685 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" @@ -2861,261 +2867,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:695 +#: src/lang.c:698 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:696 +#: src/lang.c:699 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:697 +#: src/lang.c:700 msgid "There is no news\n" msgstr "Uudiseid pole\n" -#: src/lang.c:698 +#: src/lang.c:701 msgid "Thread" msgstr "Teema" -#: src/lang.c:699 +#: src/lang.c:702 msgid "Thread Level Commands" msgstr "Teemataseme käsud" -#: src/lang.c:700 +#: src/lang.c:703 msgid "Thread deselected" msgstr "Teema pole valitud" -#: src/lang.c:701 +#: src/lang.c:704 msgid "Thread selected" msgstr "Teema on valitud" -#: src/lang.c:702 +#: src/lang.c:705 msgid "threads" msgstr "teemad" -#: src/lang.c:703 +#: src/lang.c:706 msgid "Thread range" msgstr "Teemade vahemik" -#: src/lang.c:704 +#: src/lang.c:707 msgid "thread" msgstr "teema" -#: src/lang.c:705 +#: src/lang.c:708 #, c-format msgid "Thread %4s of %4s" msgstr "Teema %4s : %4s" -#: src/lang.c:706 +#: src/lang.c:709 msgid "Threading articles..." msgstr "Järjestan artiklid teemade kaupa..." -#: src/lang.c:707 +#: src/lang.c:710 #, c-format msgid "Toggled word highlighting %s" msgstr "Sõnade esiletõstmine lülitatud %s" -#: src/lang.c:708 +#: src/lang.c:711 msgid "Toggled rot13 encoding" msgstr "Lülitatud rot13 kodeerimine" -#: src/lang.c:709 +#: src/lang.c:712 #, c-format msgid "Toggled german TeX encoding %s" msgstr "Lülitatud saksa TeX kodeering %s" -#: src/lang.c:710 +#: src/lang.c:713 #, c-format msgid "Toggled tab-width to %d" msgstr "Lülitatud tab-width väärtus %d" -#: src/lang.c:711 +#: src/lang.c:714 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d Üritan punkt-lukustada %s" -#: src/lang.c:712 +#: src/lang.c:715 #, c-format msgid "%d Trying to lock %s" msgstr "%d Üritan lukustada %s" -#: src/lang.c:713 +#: src/lang.c:716 msgid " h=help\n" msgstr " h=appi\n" -#: src/lang.c:715 +#: src/lang.c:718 msgid "Unlimited" msgstr "Piiramata" -#: src/lang.c:716 +#: src/lang.c:719 msgid "Enter wildcard unsubscribe pattern> " msgstr "Sisestage loobumise muster> " -#: src/lang.c:717 +#: src/lang.c:720 #, c-format msgid "Error decoding %s : %s" msgstr "Viga %s dekodeerimisel: %s" -#: src/lang.c:718 +#: src/lang.c:721 msgid "No end." msgstr "Lõpp puudub." -#: src/lang.c:719 +#: src/lang.c:722 #, c-format msgid "%s successfully decoded." msgstr "%s on edukalt dekodeeritud." -#: src/lang.c:720 +#: src/lang.c:723 #, 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:721 +#: src/lang.c:724 msgid "unread " msgstr "lugemata " -#: src/lang.c:722 +#: src/lang.c:725 #, c-format msgid "unsubscribed from %d groups" msgstr "loobunud %d grupist" -#: src/lang.c:723 +#: src/lang.c:726 #, c-format msgid "Unsubscribed from %s" msgstr "Loobunud grupist %s" -#: src/lang.c:724 +#: src/lang.c:727 msgid "Unsubscribing... " msgstr "Loobun gruppidest... " -#: src/lang.c:725 +#: src/lang.c:728 msgid "Unthreading articles..." msgstr "Tükeldan teemad..." -#: src/lang.c:726 +#: src/lang.c:729 msgid "Updated" msgstr "Uuendatud" -#: src/lang.c:727 +#: src/lang.c:730 msgid "Updating" msgstr "Uuendan" -#: src/lang.c:728 +#: src/lang.c:731 #, c-format msgid "Opening %s\n" msgstr "Proovin %s\n" -#: src/lang.c:729 +#: src/lang.c:732 msgid "No more URL's in this article" msgstr "Selles artiklis pole rohkem URL'e" -#: src/lang.c:730 +#: src/lang.c:733 msgid "Use MIME display program for this message?" msgstr "Kasutan selle teate lugemiseks MIME näitamise programmi?" -#: src/lang.c:731 +#: src/lang.c:734 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:732 +#: src/lang.c:735 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:733 +#: src/lang.c:736 msgid " -q don't check for new newsgroups" msgstr " -q ära otsi uusi gruppe" -#: src/lang.c:734 +#: src/lang.c:737 msgid " -X don't save any files on quit" msgstr " -X töö lõpetamisel ära salvesta ühtegi faili" -#: src/lang.c:735 +#: src/lang.c:738 msgid " -d don't show newsgroup descriptions" msgstr " -d ära näita gruppide kirjeldusi" -#: src/lang.c:736 +#: src/lang.c:739 msgid " -G limit get only limit articles/group" msgstr " -G num loe aunult num artiklit/gruppi" -#: src/lang.c:737 +#: src/lang.c:740 #, c-format msgid " -H help information about %s" msgstr " -H %s kasutamise abiinfo" -#: src/lang.c:738 +#: src/lang.c:741 msgid " -h this help message" msgstr " -h see abitekst" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr " -I kat uudiste indeksfaili kataloog [vaikimisi=%s]" -#: src/lang.c:740 +#: src/lang.c:743 msgid " -u update index files (batch mode)" msgstr " -u värskenda indeksfaile (pakettmood)" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr " -m kat kirjakaustade kataloog [vaikimisi=%s]" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Saatke palun vea raport/kommentaarid aadressil %s" -#: src/lang.c:743 +#: src/lang.c:746 msgid " -N mail new news to your posts (batch mode)" msgstr " -N saada uued vastused teie postitustele (pakettmood)" -#: src/lang.c:744 +#: src/lang.c:747 msgid " -M user mail new news to specified user (batch mode)" msgstr " -M kasut saada uued artiklid näidatud kasutajale (pakettmood)" -#: src/lang.c:745 +#: src/lang.c:748 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f fail tellitud gruppide fail [vaikimisi=%s]" -#: src/lang.c:746 +#: src/lang.c:749 msgid " -x no posting mode" msgstr " -x postitamiseta mood" -#: src/lang.c:747 +#: src/lang.c:750 msgid " -w post an article and exit" msgstr " -w postita artikkel ja lõpeta töö" -#: src/lang.c:748 +#: src/lang.c:751 msgid " -o post all postponed articles and exit" msgstr " -o postita kõik postitamisootel artiklid ja lõpeta töö" -#: src/lang.c:749 +#: src/lang.c:752 msgid " -r read news remotely from default NNTP server" msgstr " -r loe artikleid kasutades vaikimisi NNTP serverit" -#: src/lang.c:750 +#: src/lang.c:753 msgid " -R read news saved by -S option" msgstr " -R loe artikleid, mis on salvestatud -S võtmega" -#: src/lang.c:751 +#: src/lang.c:754 #, c-format msgid " -s dir save news directory [default=%s]" msgstr " -s kat artiklite salvestamise kataloog [vaikimisi=%s]" -#: src/lang.c:752 +#: src/lang.c:755 msgid " -S save new news for later reading (batch mode)" msgstr " -S salvesta uued artiklid hilisemaks lugemiseks (pakettmood)" -#: src/lang.c:753 +#: src/lang.c:756 msgid " -z start if any unread news" msgstr " -z alusta tööd, kui on lugemata uudiseid" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3124,37 +3130,37 @@ msgstr "Usenet klient.\n" "\n" "Kasuta: %s [võtmed] [grupp[,...]]" -#: src/lang.c:755 +#: src/lang.c:758 msgid " -v verbose output for batch mode options" msgstr " -v esita pakettmoodi käskudega detailsemat informatsiooni" -#: src/lang.c:756 +#: src/lang.c:759 msgid " -V print version & date information" msgstr " -V esita versiooni ja kuupäeva informatsioon" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "%s on kasutatav ainult pakettmoodi käskudeta\n" -#: src/lang.c:758 +#: src/lang.c:761 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "%s on kasutatav ainult pakettmoodi käskudega\n" -#: src/lang.c:760 +#: src/lang.c:763 #, 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:761 +#: src/lang.c:764 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Vaatan '%s' (%s/%s)?" -#: src/lang.c:763 +#: src/lang.c:766 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3163,26 +3169,26 @@ msgstr "\n" "Hoiatus: postitus ületab %d veergu. Esimene pikk rida on rida %d:\n" "%-100s\n" -#: src/lang.c:764 +#: src/lang.c:767 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Hoiatus: artiklit ei ole toimetamise käigus muudetud\n" -#: src/lang.c:765 +#: src/lang.c:768 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Hoiatus: \"Subject:\" real on ainult tühikud.\n" -#: src/lang.c:766 +#: src/lang.c:769 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:768 +#: src/lang.c:771 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3190,7 +3196,7 @@ msgstr "\n" "Hoiatus: Artiklis on \"References:\" päis, aga \"Subject:\" ei alga fraasiga\n" " \"Re: \" ega sisalda \"(was:\".\n" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3210,7 +3216,7 @@ msgstr "Lugege hoolikalt!\n" "Siin on artikkel, mida te hakkate kustutama:\n" "\n" -#: src/lang.c:775 +#: src/lang.c:778 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" @@ -3222,7 +3228,7 @@ msgstr "\n" " lisab artiklile signatuuri, siis on võimalik, et seda ei kodeerita\n" " korrektselt.\n" -#: src/lang.c:780 +#: src/lang.c:783 #, c-format msgid "\n" "\n" @@ -3235,7 +3241,7 @@ msgstr "\n" "Väärtused failis %s on muutunud!\n" "Palun lugege faile WHATSNEW, jne...\n" -#: src/lang.c:782 +#: src/lang.c:785 #, c-format msgid "\n" "\n" @@ -3247,7 +3253,7 @@ msgstr "\n" "kasutatu!\n" "Mõningaid väärtusi failis %s võidakse ignoreerida, mõningaid võidakse muuta!\n" -#: src/lang.c:785 +#: src/lang.c:788 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3260,7 +3266,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:789 +#: src/lang.c:792 #, c-format msgid "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" @@ -3268,12 +3274,12 @@ msgstr "\n" "Hoiatus: Leidsin %d '-- \\n' rida, mis võib tekitada osades inimestes " "segadust.\n" -#: src/lang.c:790 +#: src/lang.c:793 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "Hoiatus: Salvestati ainult %d artiklit %d artiklist" -#: src/lang.c:791 +#: src/lang.c:794 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3288,48 +3294,48 @@ msgstr "\n" "võimalikult\n" " lühikesed.\n" -#: src/lang.c:795 +#: src/lang.c:798 #, 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:796 +#: src/lang.c:799 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:797 +#: src/lang.c:800 msgid "Writing attributes file..." msgstr "Kirjutan atribuutide faili..." -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "%d Responses" msgstr "%d Vastust" -#: src/lang.c:801 +#: src/lang.c:804 #, c-format msgid "Added %d %s" msgstr "Lisatud %d %s" -#: src/lang.c:802 +#: src/lang.c:805 msgid "No unsubscribed groups to show" msgstr "Tellimata gruppe pole" -#: src/lang.c:803 +#: src/lang.c:806 msgid "Showing subscribed to groups only" msgstr "Näitan ainult tellitud gruppe" -#: src/lang.c:804 +#: src/lang.c:807 msgid "Yes " msgstr "Jah " -#: src/lang.c:805 +#: src/lang.c:808 msgid " You have mail\n" msgstr " Teil on kiri\n" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3348,16 +3354,16 @@ msgstr "\n" " MM_NETWORK_CHARSET. Viimast saate teostada kasutades valikut " "M)enüü.\n" -#: src/lang.c:821 +#: src/lang.c:824 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Klahvi %s uus definitsioon '%s' -> '%s'\n" -#: src/lang.c:822 +#: src/lang.c:825 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D silumismood 1=NNTP 2=KÕIK" -#: src/lang.c:826 +#: src/lang.c:829 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3381,11 +3387,11 @@ msgstr "Lugege hoolikalt!\n" "Siin on artikkel, mida te asute kustutama:\n" "\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "toggle color" msgstr "lülita värve" -#: src/lang.c:836 +#: src/lang.c:839 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" @@ -3405,44 +3411,44 @@ msgstr "# Värvide seadmiseks kasutage jä "# taust must)\n" "\n" -#: src/lang.c:844 +#: src/lang.c:847 msgid " -a toggle color flag" msgstr " -a lülita värvide kasutamist" -#: src/lang.c:848 +#: src/lang.c:851 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:849 +#: src/lang.c:852 #, 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:850 +#: src/lang.c:853 #, c-format msgid "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "\n" "Viga: \"%s\" ei ole lubatud grupp!\n" -#: src/lang.c:852 +#: src/lang.c:855 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:853 +#: src/lang.c:856 #, 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:854 +#: src/lang.c:857 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" @@ -3450,308 +3456,308 @@ msgstr "\n" "Hoiatus: \"%s\" puudub teie newsrc failist, see võib olla selles serveris " "vigane!\n" -#: src/lang.c:855 +#: src/lang.c:858 #, 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:859 +#: src/lang.c:862 #, 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:860 +#: src/lang.c:863 msgid "Missing parts." msgstr "Osad puuduvad." -#: src/lang.c:861 +#: src/lang.c:864 msgid "No beginning." msgstr "Algus puudub." -#: src/lang.c:862 +#: src/lang.c:865 msgid "No data." msgstr "Andmeid pole." -#: src/lang.c:863 +#: src/lang.c:866 msgid "Unknown error." msgstr "Tundmatu viga." -#: src/lang.c:865 +#: src/lang.c:868 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\t%s kontrollsumma (%ld %s)" -#: src/lang.c:869 +#: src/lang.c:872 msgid "Reading mail active file... " msgstr "Loen aktiivsete kirjade kausta... " -#: src/lang.c:870 +#: src/lang.c:873 msgid "Reading mailgroups file... " msgstr "Loen kirjagruppide faili... " -#: src/lang.c:874 +#: src/lang.c:877 msgid "perform PGP operations on article" msgstr "kasuta artiklil PGP operatsioone" -#: src/lang.c:875 +#: src/lang.c:878 msgid "Add key(s) to public keyring?" msgstr "Lisan võtmed avalike võtmete hoidlasse?" -#: src/lang.c:876 +#: src/lang.c:879 #, 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:877 +#: src/lang.c:880 #, 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:878 +#: src/lang.c:881 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "PGP pole seadistatud (ei saa avada %s)" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Article not signed and no public keys found" msgstr "Artikkel pole allkirjastatud ja avalikke võtmeid pole" -#: src/lang.c:881 +#: src/lang.c:884 #, 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:882 +#: src/lang.c:885 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:883 +#: src/lang.c:886 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]: " -#: src/lang.c:885 +#: src/lang.c:888 #, 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:886 +#: src/lang.c:889 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=pgp, %s=saada [%%s]: " -#: src/lang.c:887 +#: src/lang.c:890 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:891 +#: src/lang.c:894 #, 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:892 +#: src/lang.c:895 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 +#: src/lang.c:896 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:895 +#: src/lang.c:898 #, 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:896 +#: src/lang.c:899 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=välju, %s=toimeta, %s=saada [%%s]: " -#: src/lang.c:897 +#: src/lang.c:900 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:906 +#: src/lang.c:909 msgid "Try cache_overview_files to speed up things.\n" msgstr "Proovige asjade kiirendamiseks cache_overview_files.\n" -#: src/lang.c:907 +#: src/lang.c:910 msgid "Tin will use local index files instead.\n" msgstr "Tin kasutab hoopis kohalikke indeksfaile.\n" -#: src/lang.c:908 +#: src/lang.c:911 msgid "Cannot find NNTP server name" msgstr "Ei leia NNTP serveri nime" -#: src/lang.c:909 +#: src/lang.c:912 #, c-format msgid "Connecting to %s:%d..." msgstr "Loon ühendust serveriga %s:%d..." -#: src/lang.c:910 +#: src/lang.c:913 msgid "Disconnecting from server...\n" msgstr "Lõpetan ühenduse...\n" -#: src/lang.c:911 +#: src/lang.c:914 #, 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:912 +#: src/lang.c:915 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "NNTP serveriga %s ühenduse loomine ebaõnnestus. Lõpetan..." -#: src/lang.c:913 +#: src/lang.c:916 msgid "205 Closing connection" msgstr "205 Sulen ühendust" -#: src/lang.c:914 +#: src/lang.c:917 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:915 +#: src/lang.c:918 msgid "Connection to news server has timed out. Reconnect?" msgstr "Ühendus uudisegruppide serveriga aegus. ühendun uuesti?" -#: src/lang.c:916 +#: src/lang.c:919 #, 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:917 +#: src/lang.c:920 msgid " -A force authentication on connect" msgstr " -A sunni ühenduse loomisel autentima" -#: src/lang.c:918 +#: src/lang.c:921 #, 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:919 +#: src/lang.c:922 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr " -p port kasuta NNTP porti [vaikimisi=%d]" -#: src/lang.c:920 +#: src/lang.c:923 msgid " -Q quick start. Same as -nqd" msgstr " -Q kiirstart. Sama kui -nqd" -#: src/lang.c:921 +#: src/lang.c:924 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l kasuta LIST käsku GROUP (-n) käsu asemel" -#: src/lang.c:922 +#: src/lang.c:925 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr " -n loe NNTP serverist ainult tellitud .newsrc grupid" -#: src/lang.c:924 +#: src/lang.c:927 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp: Tundmatu teenus.\n" -#: src/lang.c:927 +#: src/lang.c:930 msgid "\n" "socket or connect problem\n" msgstr "\n" "Probleem pistikuga või ühendusega\n" -#: src/lang.c:929 +#: src/lang.c:932 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Loon ühendust serveriga %s: " -#: src/lang.c:930 +#: src/lang.c:933 msgid "Giving up...\n" msgstr "Annan alla...\n" -#: src/lang.c:933 +#: src/lang.c:936 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:936 +#: src/lang.c:939 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:939 +#: src/lang.c:942 #, 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:942 +#: src/lang.c:945 msgid " -Q quick start. Same as -qd" msgstr " -Q kiirstart. Sama kui -qd" -#: src/lang.c:943 +#: src/lang.c:946 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:944 +#: src/lang.c:947 msgid " -n only read subscribed .newsrc groups from spool" msgstr " -n loe poolist ainult tellitud .newsrc gruppe" -#: src/lang.c:945 +#: src/lang.c:948 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:949 +#: src/lang.c:952 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:950 +#: src/lang.c:953 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:958 +#: src/lang.c:961 #, c-format msgid "%d %s printed" msgstr "%d %s trükitud" -#: src/lang.c:959 +#: src/lang.c:962 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "saada artikkel/teema/kuum/muster/märgitud trükkalile" -#: src/lang.c:960 +#: src/lang.c:963 msgid "Print" msgstr "Trüki" -#: src/lang.c:961 +#: src/lang.c:964 msgid "Printing..." msgstr "Trükin..." -#: src/lang.c:965 +#: src/lang.c:968 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "saada artikkel/teema/kuum/muster/märgitud toruga käsule" -#: src/lang.c:966 +#: src/lang.c:969 msgid "No command" msgstr "Käsku pole" -#: src/lang.c:967 +#: src/lang.c:970 msgid "Pipe" msgstr "Toru" -#: src/lang.c:968 +#: src/lang.c:971 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Toru käsku [%.*s]> " -#: src/lang.c:969 +#: src/lang.c:972 msgid "Piping..." msgstr "Saadan torusse..." -#: src/lang.c:971 +#: src/lang.c:974 msgid "Piping not enabled." msgstr "Toru kasutamine pole lubatud." -#: src/lang.c:975 +#: src/lang.c:978 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3763,7 +3769,7 @@ msgstr "\n" " tühik on see, mis eraldab koolonit (:) teistest komponentidest\n" " real. Gruppide eraldamiseks kasutage palun koma (,).\n" -#: src/lang.c:980 +#: src/lang.c:983 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3774,7 +3780,7 @@ msgstr "\n" " tühikuid, siis ei ole see lubatud. Palun kirjutage kõik grupid\n" " ühele reale.\n" -#: src/lang.c:985 +#: src/lang.c:988 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3785,14 +3791,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:989 +#: src/lang.c:992 #, 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:994 +#: src/lang.c:997 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3822,555 +3828,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:1007 +#: src/lang.c:1010 msgid "shell escape" msgstr "paojada käsureale" -#: src/lang.c:1008 +#: src/lang.c:1011 #, c-format msgid "Shell Command (%s)" msgstr "Käsurea käsk (%s)" -#: src/lang.c:1009 +#: src/lang.c:1012 #, c-format msgid "Enter shell command [%s]> " msgstr "Sisestage käsurea käsk [%s]> " -#: src/lang.c:1013 +#: src/lang.c:1016 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "%s: Ei saa TERM kirjet\n" -#: src/lang.c:1017 +#: src/lang.c:1020 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Grupp %.*s ('q' lõpetamiseks)... " -#: src/lang.c:1019 +#: src/lang.c:1022 #, c-format msgid "Group %.*s..." msgstr "Grupp %.*s... " -#: src/lang.c:1023 +#: src/lang.c:1026 msgid "Server unavailable\n" msgstr "Server ei vasta\n" -#: src/lang.c:1029 +#: src/lang.c:1032 #, 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:1030 +#: src/lang.c:1033 #, 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:1032 +#: src/lang.c:1035 #, 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:1033 +#: src/lang.c:1036 #, 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:1037 +#: src/lang.c:1040 #, 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:1038 +#: src/lang.c:1041 #, 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:1040 +#: src/lang.c:1043 #, 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:1041 +#: src/lang.c:1044 #, 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:1047 +#: src/lang.c:1050 msgid "Terminal does not support color" msgstr "Terminal ei toeta värve" -#: src/lang.c:1052 +#: src/lang.c:1055 #, c-format msgid "Trying %s" msgstr "Proovin %s" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:296 +#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 src/refs.c:296 msgid "None" msgstr "Pole" -#: src/lang.c:1067 +#: src/lang.c:1070 msgid "Subject" msgstr "Teema" -#: src/lang.c:1068 +#: src/lang.c:1071 msgid "References" msgstr "Viited" -#: src/lang.c:1069 +#: src/lang.c:1072 msgid "Both Subject and References" msgstr "Nii teema kui viited" -#: src/lang.c:1070 +#: src/lang.c:1073 msgid "Multipart Subject" msgstr "Mitmeosaliste teema" -#: src/lang.c:1082 src/lang.c:1193 +#: src/lang.c:1085 src/lang.c:1196 msgid "No" msgstr "Ei" -#: src/lang.c:1083 src/lang.c:1195 +#: src/lang.c:1086 src/lang.c:1198 msgid "Yes" msgstr "Jah" -#: src/lang.c:1084 +#: src/lang.c:1087 msgid "Hide All" msgstr "Peida kõik" -#: src/lang.c:1092 +#: src/lang.c:1095 msgid "Address" msgstr "Aadress" -#: src/lang.c:1093 +#: src/lang.c:1096 msgid "Full Name" msgstr "Täisnimi" -#: src/lang.c:1094 +#: src/lang.c:1097 msgid "Address and Name" msgstr "Aadress ja nimi" -#: src/lang.c:1101 +#: src/lang.c:1104 msgid "Max" msgstr "Maksimum" -#: src/lang.c:1102 +#: src/lang.c:1105 msgid "Sum" msgstr "Summa" -#: src/lang.c:1103 +#: src/lang.c:1106 msgid "Average" msgstr "Keskmine" -#: src/lang.c:1108 +#: src/lang.c:1111 msgid "Lines" msgstr "Read" -#: src/lang.c:1109 +#: src/lang.c:1112 msgid "Score" msgstr "Kaal" -#: src/lang.c:1110 +#: src/lang.c:1113 msgid "Lines & Score" msgstr "Read & kaal" -#: src/lang.c:1119 +#: src/lang.c:1122 msgid "Black" msgstr "Must" -#: src/lang.c:1120 +#: src/lang.c:1123 msgid "Red" msgstr "Punane" -#: src/lang.c:1121 +#: src/lang.c:1124 msgid "Green" msgstr "Roheline" -#: src/lang.c:1122 +#: src/lang.c:1125 msgid "Brown" msgstr "Pruun" -#: src/lang.c:1123 +#: src/lang.c:1126 msgid "Blue" msgstr "Sinine" -#: src/lang.c:1124 +#: src/lang.c:1127 msgid "Pink" msgstr "Roosa" -#: src/lang.c:1125 +#: src/lang.c:1128 msgid "Cyan" msgstr "Lilla" -#: src/lang.c:1126 +#: src/lang.c:1129 msgid "White" msgstr "valge" -#: src/lang.c:1127 +#: src/lang.c:1130 msgid "Gray" msgstr "Hall" -#: src/lang.c:1128 +#: src/lang.c:1131 msgid "Light Red" msgstr "Helepunane" -#: src/lang.c:1129 +#: src/lang.c:1132 msgid "Light Green" msgstr "Heleroheline" -#: src/lang.c:1130 +#: src/lang.c:1133 msgid "Yellow" msgstr "Kollane" -#: src/lang.c:1131 +#: src/lang.c:1134 msgid "Light Blue" msgstr "Helesinine" -#: src/lang.c:1132 +#: src/lang.c:1135 msgid "Light Pink" msgstr "Heleroosa" -#: src/lang.c:1133 +#: src/lang.c:1136 msgid "Light Cyan" msgstr "Helelilla" -#: src/lang.c:1134 +#: src/lang.c:1137 msgid "Light White" msgstr "Helevalge" -#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 +#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 msgid "Nothing" msgstr "Ei kasuta" -#: src/lang.c:1143 +#: src/lang.c:1146 msgid "Mark" msgstr "Märk" -#: src/lang.c:1144 +#: src/lang.c:1147 msgid "Space" msgstr "Tühik" -#: src/lang.c:1151 +#: src/lang.c:1154 msgid "Normal" msgstr "Tavaline" -#: src/lang.c:1152 +#: src/lang.c:1155 msgid "Best highlighting" msgstr "Parim esiletõstmine" -#: src/lang.c:1153 +#: src/lang.c:1156 msgid "Underline" msgstr "Allajoonitud" -#: src/lang.c:1154 +#: src/lang.c:1157 msgid "Reverse video" msgstr "Pööratud video" -#: src/lang.c:1155 +#: src/lang.c:1158 msgid "Blinking" msgstr "Plinkiv" -#: src/lang.c:1156 +#: src/lang.c:1159 msgid "Half bright" msgstr "Poolhele" -#: src/lang.c:1157 +#: src/lang.c:1160 msgid "Bold" msgstr "Paks" -#: src/lang.c:1162 +#: src/lang.c:1165 msgid "none" msgstr "pole" -#: src/lang.c:1163 +#: src/lang.c:1166 msgid "commands" msgstr "käsud" -#: src/lang.c:1164 +#: src/lang.c:1167 msgid "select" msgstr "valik" -#: src/lang.c:1166 +#: src/lang.c:1169 msgid "commands & quit" msgstr "käsud & välju" -#: src/lang.c:1167 +#: src/lang.c:1170 msgid "commands & select" msgstr "käsud & valik" -#: src/lang.c:1168 +#: src/lang.c:1171 msgid "quit & select" msgstr "välju & valik" -#: src/lang.c:1169 +#: src/lang.c:1172 msgid "commands & quit & select" msgstr "käsud & välju & valik" -#: src/lang.c:1194 +#: src/lang.c:1197 msgid "Shell archive" msgstr "Shelli arhiiv" -#: src/lang.c:1200 +#: src/lang.c:1203 msgid "Subject: (descending)" msgstr "Subject: (kahanevalt)" -#: src/lang.c:1201 +#: src/lang.c:1204 msgid "Subject: (ascending)" msgstr "Subject: (kasvavalt)" -#: src/lang.c:1202 +#: src/lang.c:1205 msgid "From: (descending)" msgstr "From: (kahanevalt)" -#: src/lang.c:1203 +#: src/lang.c:1206 msgid "From: (ascending)" msgstr "From: (kasvavalt)" -#: src/lang.c:1204 +#: src/lang.c:1207 msgid "Date: (descending)" msgstr "Date: (kahanevalt)" -#: src/lang.c:1205 +#: src/lang.c:1208 msgid "Date: (ascending)" msgstr "Date: (kasvavalt)" -#: src/lang.c:1206 src/lang.c:1214 +#: src/lang.c:1209 src/lang.c:1217 msgid "Score (descending)" msgstr "Kaal (kahanevalt)" -#: src/lang.c:1207 src/lang.c:1215 +#: src/lang.c:1210 src/lang.c:1218 msgid "Score (ascending)" msgstr "Kaal (kasvavalt)" -#: src/lang.c:1208 +#: src/lang.c:1211 msgid "Lines: (descending)" msgstr "Lines: (kahanevalt)" -#: src/lang.c:1209 +#: src/lang.c:1212 msgid "Lines: (ascending)" msgstr "Lines: (kasvavalt)" -#: src/lang.c:1220 +#: src/lang.c:1223 msgid "Always Keep" msgstr "Hoia alati" -#: src/lang.c:1221 +#: src/lang.c:1224 msgid "Always Remove" msgstr "Eemalda alati" -#: src/lang.c:1222 +#: src/lang.c:1225 msgid "Mark with D on selection screen" msgstr "Märgi valikuekraanil tähega D" -#: src/lang.c:1227 +#: src/lang.c:1230 msgid "Kill only unread arts" msgstr "Surma ainult lugemata artiklid" -#: src/lang.c:1228 +#: src/lang.c:1231 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:1229 +#: src/lang.c:1232 msgid "Kill all arts and never show" msgstr "Surma kõik artiklid ja ära näita" -#: src/lang.c:1234 +#: src/lang.c:1237 msgid "Nothing special" msgstr "Ei midagi erilist" -#: src/lang.c:1235 +#: src/lang.c:1238 msgid "Compress quotes" msgstr "Tihenda tsitaadid" -#: src/lang.c:1236 +#: src/lang.c:1239 msgid "Quote signatures" msgstr "Tsiteeri allkirju" -#: src/lang.c:1237 +#: src/lang.c:1240 msgid "Compress quotes, quote sigs" msgstr "Tihenda tsitaadid, tsiteeri allkirju" -#: src/lang.c:1238 +#: src/lang.c:1241 msgid "Quote empty lines" msgstr "Tsiteeri tühje ridu" -#: src/lang.c:1239 +#: src/lang.c:1242 msgid "Compress quotes, quote empty lines" msgstr "Tihenda tsitaadid, tsiteeri tühje ridu" -#: src/lang.c:1240 +#: src/lang.c:1243 msgid "Quote sigs & empty lines" msgstr "Tsiteeri allkirju ja tühje ridu" -#: src/lang.c:1241 +#: src/lang.c:1244 msgid "Comp. q., quote sigs & empty lines" msgstr "Tihenda tsitaate, tsiteeri allkirju ja tühje ridu" -#: src/lang.c:1279 +#: src/lang.c:1282 msgid "no" msgstr "ei" -#: src/lang.c:1280 +#: src/lang.c:1283 msgid "with headers" msgstr "päistega" -#: src/lang.c:1281 +#: src/lang.c:1284 msgid "without headers" msgstr "päisteta" # TRANSLATION MISSING -#: src/lang.c:1288 src/lang.c:1294 +#: src/lang.c:1291 src/lang.c:1297 msgid "NFKC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1289 +#: src/lang.c:1292 msgid "NFKD" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1290 +#: src/lang.c:1293 msgid "NFC" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1291 +#: src/lang.c:1294 msgid "NFD" msgstr "" -#: src/lang.c:1302 +#: src/lang.c:1305 msgid "Display Options" msgstr "Ekraani seaded" -#: src/lang.c:1308 +#: src/lang.c:1311 msgid "Color Options" msgstr "Värvide seaded" -#: src/lang.c:1314 +#: src/lang.c:1317 msgid "Article-Limiting Options" msgstr "Artikli piirangute seaded" -#: src/lang.c:1320 +#: src/lang.c:1323 msgid "Posting/Mailing Options" msgstr "Postitamise/saatmise seaded" -#: src/lang.c:1326 +#: src/lang.c:1329 msgid "Saving/Printing Options" msgstr "Salvestamise/trükkimise seaded" -#: src/lang.c:1332 +#: src/lang.c:1335 msgid "Expert Options" msgstr "Ekspertseaded" -#: src/lang.c:1338 +#: src/lang.c:1341 msgid "Filtering Options" msgstr "Filtreerimise seaded" -#: 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 src/lang.c:2350 +#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 src/lang.c:1417 +#: src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 src/lang.c:1526 src/lang.c:1688 +#: src/lang.c:1694 src/lang.c:1700 src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 +#: src/lang.c:1776 src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 +#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 src/lang.c:1833 +#: src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 src/lang.c:1857 src/lang.c:1863 +#: src/lang.c:1869 src/lang.c:1875 src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 +#: src/lang.c:1899 src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 +#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 src/lang.c:1960 +#: src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 src/lang.c:1998 src/lang.c:2032 +#: src/lang.c:2084 src/lang.c:2091 src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 +#: src/lang.c:2192 src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 +#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 msgid " toggles, sets, cancels." msgstr " lülitab, seab, katkestab." -#: src/lang.c:1344 +#: src/lang.c:1347 msgid "Show mini menu & posting etiquette" msgstr "Näita minimenüüd & post. etiketti" -#: src/lang.c:1345 +#: src/lang.c:1348 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:1350 +#: src/lang.c:1353 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Näita gruppide lühikirjeldusi. lülitab ja seab." -#: src/lang.c:1351 +#: src/lang.c:1354 msgid "Show description of each newsgroup" msgstr "Näita iga grupi lühikirjeldust" -#: src/lang.c:1352 +#: src/lang.c:1355 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:1357 +#: src/lang.c:1360 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:1358 +#: src/lang.c:1361 msgid "In group menu, show author by" msgstr "Näita grupimenüüs autorit" -#: src/lang.c:1359 +#: src/lang.c:1362 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:1363 +#: src/lang.c:1366 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Märgi valik -> või heleda ribaga. lülitab, seab." -#: src/lang.c:1364 +#: src/lang.c:1367 msgid "Draw -> instead of highlighted bar" msgstr "Joonista -> heleda riba asemel" -#: src/lang.c:1365 +#: src/lang.c:1368 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:1370 +#: src/lang.c:1373 msgid "Use inverse video for page headers" msgstr "Kasuta päistel pööratud videot" -#: src/lang.c:1371 +#: src/lang.c:1374 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:1376 +#: src/lang.c:1379 msgid "Thread articles by" msgstr "Artiklite teemadesse jagamine" -#: src/lang.c:1377 +#: src/lang.c:1380 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:1383 +#: src/lang.c:1386 msgid "Score of a thread" msgstr "Teema kaal" -#: src/lang.c:1384 +#: src/lang.c:1387 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "# Teema kaal 0=(Maksimum) 1=(Summa) 2=(Keskmine)\n" -#: src/lang.c:1388 +#: src/lang.c:1391 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:1389 +#: src/lang.c:1392 msgid "Sort articles by" msgstr "Artiklite järjestus" -#: src/lang.c:1390 +#: src/lang.c:1393 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,57 +4384,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:1396 +#: src/lang.c:1399 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:1397 +#: src/lang.c:1400 msgid "Sort threads by" msgstr "Teemade järjestus" -#: src/lang.c:1398 +#: src/lang.c:1401 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:1402 +#: src/lang.c:1405 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:1403 +#: src/lang.c:1406 msgid "Goto first unread article in group" msgstr "Mine grupis esimesele lugemata art." -#: src/lang.c:1404 +#: src/lang.c:1407 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:1408 +#: src/lang.c:1411 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:1409 +#: src/lang.c:1412 msgid "Show only unread articles" msgstr "Näita ainult lugemata artikleid" -#: src/lang.c:1410 +#: src/lang.c:1413 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:1415 +#: src/lang.c:1418 msgid "Show only groups with unread arts" msgstr "Ainult lugemata artiklitega grupid" -#: src/lang.c:1416 +#: src/lang.c:1419 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:1421 +#: src/lang.c:1424 msgid "Filter which articles" msgstr "Filtreeri artikleid" -#: src/lang.c:1422 +#: src/lang.c:1425 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" @@ -4436,212 +4442,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:1429 +#: src/lang.c:1432 msgid "Tab goes to next unread article" msgstr "Tab viib järgmisele lugemata art." -#: src/lang.c:1430 +#: src/lang.c:1433 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:1434 +#: src/lang.c:1437 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:1435 +#: src/lang.c:1438 msgid "Space goes to next unread article" msgstr "Tühik viib järgmisele lugemata art." -#: src/lang.c:1436 +#: src/lang.c:1439 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:1441 +#: src/lang.c:1444 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:1442 +#: src/lang.c:1445 msgid "PgDn goes to next unread article" msgstr "PgDn viib järgmisele lugemata art." -#: src/lang.c:1443 +#: src/lang.c:1446 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:1449 +#: src/lang.c:1452 msgid "List thread using right arrow key" msgstr "Nool paremale näitab teema loendit" -#: src/lang.c:1450 +#: src/lang.c:1453 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:1454 +#: src/lang.c:1457 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Sisestage sümbol kustutatud artiklite märkimiseks. seab, katkestab." -#: src/lang.c:1455 +#: src/lang.c:1458 msgid "Character to show deleted articles" msgstr "Kustutatud artiklite marker" -#: src/lang.c:1456 +#: src/lang.c:1459 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:1461 +#: src/lang.c:1464 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:1462 +#: src/lang.c:1465 msgid "Character to show inrange articles" msgstr "Artiklite vahemiku marker" -#: src/lang.c:1463 +#: src/lang.c:1466 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:1468 +#: src/lang.c:1471 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Sisestage tagasituleva artikli marker. seab, katkestab." -#: src/lang.c:1469 +#: src/lang.c:1472 msgid "Character to show returning arts" msgstr "Tagasi tulnud artiklite marker" -#: src/lang.c:1470 +#: src/lang.c:1473 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:1475 +#: src/lang.c:1478 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1476 +#: src/lang.c:1479 msgid "Character to show selected articles" msgstr "Valitud artiklite marker" -#: src/lang.c:1477 +#: src/lang.c:1480 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:1482 +#: src/lang.c:1485 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Sisestage värskeid artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1483 +#: src/lang.c:1486 msgid "Character to show recent articles" msgstr "Värskete artiklite marker" -#: src/lang.c:1484 +#: src/lang.c:1487 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:1489 +#: src/lang.c:1492 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Sisestage lugemata artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1490 +#: src/lang.c:1493 msgid "Character to show unread articles" msgstr "Lugemata artiklite marker" -#: src/lang.c:1491 +#: src/lang.c:1494 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:1496 +#: src/lang.c:1499 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Sisestage loetud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1497 +#: src/lang.c:1500 msgid "Character to show read articles" msgstr "Loetud artiklite marker" -#: src/lang.c:1498 +#: src/lang.c:1501 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:1503 +#: src/lang.c:1506 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Sisestage surmatud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1504 +#: src/lang.c:1507 msgid "Character to show killed articles" msgstr "Surmatud artiklite marker" -#: src/lang.c:1505 +#: src/lang.c:1508 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:1510 +#: src/lang.c:1513 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1511 +#: src/lang.c:1514 msgid "Character to show readselected arts" msgstr "Lugemiseks valitud artiklite marker" -#: src/lang.c:1512 +#: src/lang.c:1515 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:1517 +#: src/lang.c:1520 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Sisestage maksimaalne näidatav grupi nime pikkus. seab." -#: src/lang.c:1518 +#: src/lang.c:1521 msgid "Max. length of group names shown" msgstr "Maksimaalne grupinime pikkus" -#: src/lang.c:1519 +#: src/lang.c:1522 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maksimaalne grupi nime pikkus, mida näidatakse ekraanil\n" -#: src/lang.c:1524 +#: src/lang.c:1527 msgid "Show lines/score in listings" msgstr "Näita loendis artikli kaalu/ridu" -#: src/lang.c:1525 +#: src/lang.c:1528 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:1530 +#: src/lang.c:1533 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:1531 +#: src/lang.c:1534 msgid "Number of lines to scroll in pager" msgstr "Lehitsejas keritavate ridade arv" -#: src/lang.c:1532 +#: src/lang.c:1535 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" @@ -4651,27 +4657,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:1539 +#: src/lang.c:1542 msgid "Display signatures. toggles & sets." msgstr "Näita signatuure, lülitab, seab." -#: src/lang.c:1540 +#: src/lang.c:1543 msgid "Display signatures" msgstr "Näita signatuure" -#: src/lang.c:1541 +#: src/lang.c:1544 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:1545 +#: src/lang.c:1548 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Näita uuenkodeeritud andmeid märgitud lisadena. lülitab ja seab." -#: src/lang.c:1546 +#: src/lang.c:1549 msgid "Display uue data as an attachment" msgstr "Näita uuenk. andmeid lisadena" -#: src/lang.c:1547 +#: src/lang.c:1550 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" @@ -4686,30 +4692,30 @@ msgstr "# uuenkodeeritud andmete käsitle "# märgituna.\n" # -#: src/lang.c:1556 +#: src/lang.c:1559 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:1557 +#: src/lang.c:1560 msgid "Display \"a as Umlaut-a" msgstr "Näita \"a kui Umlaut-a" -#: src/lang.c:1558 +#: src/lang.c:1561 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:1563 src/lang.c:1573 +#: src/lang.c:1566 src/lang.c:1576 msgid "Space separated list of header fields" msgstr "Tühikuga eraldatud päised" -#: src/lang.c:1564 +#: src/lang.c:1567 msgid "Display these header fields (or *)" msgstr "Näita neid päiseid (või *)" -#: src/lang.c:1565 +#: src/lang.c:1568 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" @@ -4724,11 +4730,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:1574 +#: src/lang.c:1577 msgid "Do not display these header fields" msgstr "Ära näita neid päiseridu" -#: src/lang.c:1575 +#: src/lang.c:1578 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 " @@ -4746,28 +4752,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:1585 +#: src/lang.c:1588 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:1586 +#: src/lang.c:1589 msgid "Skip multipart/alternative parts" msgstr "Jäta multipart/alternative osad" -#: src/lang.c:1587 +#: src/lang.c:1590 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:1592 +#: src/lang.c:1595 msgid "A regex used to decide which lines to show in col_quote." msgstr "Regulaaravaldis otsustamaks, milliseid ridu tsitaatides näidata." -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Regex used to show quoted lines" msgstr "Tsiteeritud ridade näitamise regex" -#: src/lang.c:1594 +#: src/lang.c:1597 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" @@ -4775,15 +4781,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:1600 +#: src/lang.c:1603 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:1601 +#: src/lang.c:1604 msgid "Regex used to show twice quoted l." msgstr "Topelt tsiteeritud ridu näitav reg" -#: src/lang.c:1602 +#: src/lang.c:1605 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" @@ -4792,15 +4798,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:1608 +#: src/lang.c:1611 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:1609 +#: src/lang.c:1612 msgid "Regex used to show >= 3 times q.l." msgstr ">= 3 tsiteeritud ridu näitav reg" -#: src/lang.c:1610 +#: src/lang.c:1613 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" @@ -4809,15 +4815,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:1617 +#: src/lang.c:1620 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:1618 +#: src/lang.c:1621 msgid "Regex used to highlight /slashes/" msgstr "Regex et esile tõsta /kaldkriipse/" -#: src/lang.c:1619 +#: src/lang.c:1622 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" @@ -4825,15 +4831,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:1625 +#: src/lang.c:1628 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:1626 +#: src/lang.c:1629 msgid "Regex used to highlight *stars*" msgstr "Regex et esile tõsta *tärne*" -#: src/lang.c:1627 +#: src/lang.c:1630 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" @@ -4841,15 +4847,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:1633 +#: src/lang.c:1636 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:1634 +#: src/lang.c:1637 msgid "Regex used to highlight -strokes-" msgstr "Regex et esile tõsta -kriipse-" -#: src/lang.c:1635 +#: src/lang.c:1638 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" @@ -4857,15 +4863,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:1641 +#: src/lang.c:1644 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:1642 +#: src/lang.c:1645 msgid "Regex used to highlight _underline_" msgstr "Regex et esile tõsta _alakriipse_" -#: src/lang.c:1643 +#: src/lang.c:1646 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" @@ -4873,44 +4879,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:1649 +#: src/lang.c:1652 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "Regulaaravaldis eemaldatava teema prefiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "Regex with Subject prefixes" msgstr "Regex teema prefiksi leidmiseks" -#: src/lang.c:1651 +#: src/lang.c:1654 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:1656 +#: src/lang.c:1659 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "Regulaaravaldis eemaldatava teema sufiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:1657 +#: src/lang.c:1660 msgid "Regex with Subject suffixes" msgstr "Regex teema sufiksi leidmiseks" -#: src/lang.c:1658 +#: src/lang.c:1661 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:1663 +#: src/lang.c:1666 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:1664 +#: src/lang.c:1667 msgid "MIME binary content viewer" msgstr "MIME kahendsisu lehitseja" -#: src/lang.c:1665 +#: src/lang.c:1668 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" @@ -4920,377 +4926,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:1672 +#: src/lang.c:1675 msgid "Confirm before starting non-text viewing program" msgstr "Küsi enne mitte-tekstiliste osade vaatamist kinnitust" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Ask before using MIME viewer" msgstr "Küsi MIME lehitseja kasutamise luba" -#: src/lang.c:1674 +#: src/lang.c:1677 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:1679 +#: src/lang.c:1682 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:1680 +#: src/lang.c:1683 msgid "Catchup read groups when quitting" msgstr "Väljumisel märkida grupid loetuks" -#: src/lang.c:1681 +#: src/lang.c:1684 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:1686 +#: src/lang.c:1689 msgid "Catchup group using left key" msgstr "Nool vasakule märgib grupi loetuks" -#: src/lang.c:1687 +#: src/lang.c:1690 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:1692 +#: src/lang.c:1695 msgid "Catchup thread by using left key" msgstr "Nool vasakule märgib teema loetuks" -#: src/lang.c:1698 +#: src/lang.c:1701 msgid "Which actions require confirmation" msgstr "Tegevused mis nõuavad kinnitust" -#: src/lang.c:1699 +#: src/lang.c:1702 msgid "# What should we ask confirmation for.\n" msgstr "# Millele me peaksime küsima kinnitust.\n" -#: src/lang.c:1704 +#: src/lang.c:1707 msgid "'Mark article read' ignores tags" msgstr "'Märgi art. loetuks' eirab märke" -#: src/lang.c:1705 +#: src/lang.c:1708 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:1709 +#: src/lang.c:1712 msgid "Program to run to open URL's, sets, cancels." msgstr "Programm URLide avamiseks, seab, katkestab." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Program that opens URL's" msgstr "Programm URLide avamiseks" -#: src/lang.c:1711 +#: src/lang.c:1714 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:1716 +#: src/lang.c:1719 msgid "Use mouse in xterm" msgstr "Kasuta xterm aknas hiirt" -#: src/lang.c:1717 +#: src/lang.c:1720 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:1723 +#: src/lang.c:1726 msgid "Use scroll keys on keypad" msgstr "Kasuta kerimisnuppe" -#: src/lang.c:1724 +#: src/lang.c:1727 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:1729 +#: src/lang.c:1732 msgid "Enter maximum number of article to get. sets." msgstr "Sisestage suurim laetavate artiklite arv. seab." -#: src/lang.c:1730 +#: src/lang.c:1733 msgid "Number of articles to get" msgstr "Laetavate artiklite arv" -#: src/lang.c:1731 +#: src/lang.c:1734 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:1736 +#: src/lang.c:1739 msgid "Enter number of days article is considered recent. sets." msgstr "Sisestage artikli värskuse kestus. seab." -#: src/lang.c:1737 +#: src/lang.c:1740 msgid "Article recentness time limit" msgstr "Artikli värskuse ajapiir" -#: src/lang.c:1738 +#: src/lang.c:1741 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:1742 +#: src/lang.c:1745 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT tavalistele jokkeritele, REGEX täisregulaaravaldistega otsimisele." -#: src/lang.c:1743 +#: src/lang.c:1746 msgid "Wildcard matching" msgstr "Jokkeritega otsimine" -#: src/lang.c:1744 +#: src/lang.c:1747 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "# Jokkeritega otsimine 0=(wildmat) 1=(regex)\n" -#: src/lang.c:1748 +#: src/lang.c:1751 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Sisestage minimaalne kaal artikli surmamiseks. seab." -#: src/lang.c:1749 +#: src/lang.c:1752 msgid "Score limit (kill)" msgstr "Kaalu alampiir (surmamine)" -#: src/lang.c:1750 +#: src/lang.c:1753 msgid "# Score limit before an article is marked killed\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse surmatuks\n" -#: src/lang.c:1754 +#: src/lang.c:1757 msgid "Enter default score to kill articles. sets." msgstr "Sisestage vaikimisi kaal artiklite surmamiseks. seab." -#: src/lang.c:1755 +#: src/lang.c:1758 msgid "Default score to kill articles" msgstr "Artiklite surmamise vaikimisi kaal" -#: src/lang.c:1756 +#: src/lang.c:1759 msgid "# Default score to kill articles\n" msgstr "# Vaikimisi kaal artiklite surmamiseks\n" -#: src/lang.c:1760 +#: src/lang.c:1763 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:1761 +#: src/lang.c:1764 msgid "Score limit (select)" msgstr "Kaalu alampiir (valik)" -#: src/lang.c:1762 +#: src/lang.c:1765 msgid "# Score limit before an article is marked hot\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse muumaks\n" -#: src/lang.c:1766 +#: src/lang.c:1769 msgid "Enter default score to select articles. sets." msgstr "Sisestage vaikimisi kaal artiklite valimiseks. seab." -#: src/lang.c:1767 +#: src/lang.c:1770 msgid "Default score to select articles" msgstr "Vaikimisi kaal artiklite valimiseks" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "# Default score to select articles\n" msgstr "# Vaikimisi kaal artiklite valimiseks\n" -#: src/lang.c:1774 +#: src/lang.c:1777 msgid "Use slrnface to show ''X-Face:''s" msgstr "''X-Face:'' näitamiseks slrnface" -#: src/lang.c:1775 +#: src/lang.c:1778 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:1783 +#: src/lang.c:1786 msgid "Use ANSI color" msgstr "Kasuta ANSI värve" -#: src/lang.c:1784 +#: src/lang.c:1787 msgid "# If ON using ANSI-color\n" msgstr "# Kui väärtus on ON, kasuta ANSI värve\n" -#: src/lang.c:1789 +#: src/lang.c:1792 msgid "Standard foreground color" msgstr "Standardne esiplaani värv" -#: src/lang.c:1790 +#: src/lang.c:1793 msgid "# Standard foreground color\n" msgstr "# Standardne esiplaani värv\n" -#: src/lang.c:1795 +#: src/lang.c:1798 msgid "Standard background color" msgstr "Standardne tagaplaani värv" -#: src/lang.c:1796 +#: src/lang.c:1799 msgid "# Standard-Background-Color\n" msgstr "# Standardne tagaplaani värv\n" -#: src/lang.c:1801 +#: src/lang.c:1804 msgid "Color for inverse text (background)" msgstr "Pööratud teksti värv (tagaplaan)" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "# Color of background for inverse text\n" msgstr "# Pööratud teksti tagaplaani värv\n" -#: src/lang.c:1807 +#: src/lang.c:1810 msgid "Color for inverse text (foreground)" msgstr "Pööratud teksti värv (esiplaan)" -#: src/lang.c:1808 +#: src/lang.c:1811 msgid "# Color of foreground for inverse text\n" msgstr "# Pööratud teksti esiplaani värv\n" -#: src/lang.c:1813 +#: src/lang.c:1816 msgid "Color of text lines" msgstr "Tekstiridade värv" -#: src/lang.c:1814 +#: src/lang.c:1817 msgid "# Color of text-lines\n" msgstr "# Tekstiridade värv\n" -#: src/lang.c:1819 +#: src/lang.c:1822 msgid "Color of mini help menu" msgstr "Miniabiinfo värv" -#: src/lang.c:1820 +#: src/lang.c:1823 msgid "# Color of mini help menu\n" msgstr "# Miniabiinfo värv\n" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "Color of help text" msgstr "Abiinfo värv" -#: src/lang.c:1826 +#: src/lang.c:1829 msgid "# Color of help pages\n" msgstr "# Abiinfo värv\n" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Color of status messages" msgstr "Olekuteadete värv" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "# Color of messages in last line\n" msgstr "# Viimasel real olevate teadete värv\n" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Color of quoted lines" msgstr "Tsitaadi värv" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "# Color of quote-lines\n" msgstr "# Tsitaadi värv\n" -#: src/lang.c:1843 +#: src/lang.c:1846 msgid "Color of twice quoted line" msgstr "Topelt tsiteeritud rea värv" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "# Color of twice quoted lines\n" msgstr "# Topelt tsiteeritud rea värv\n" -#: src/lang.c:1849 +#: src/lang.c:1852 msgid "Color of =>3 times quoted line" msgstr "=>3 korda tsiteeritud rea värv" -#: src/lang.c:1850 +#: src/lang.c:1853 msgid "# Color of >=3 times quoted lines\n" msgstr "# =>3 korda tsiteeritud rea värv\n" -#: src/lang.c:1855 +#: src/lang.c:1858 msgid "Color of article header lines" msgstr "Artikli päiseridade värv" -#: src/lang.c:1856 +#: src/lang.c:1859 msgid "# Color of header-lines\n" msgstr "# Päiseridade värv\n" -#: src/lang.c:1861 +#: src/lang.c:1864 msgid "Color of actual news header fields" msgstr "Artikli tegelike päiseridade värv" -#: src/lang.c:1862 +#: src/lang.c:1865 msgid "# Color of actual news header fields\n" msgstr "# Artikli tegelike päiseridade värv\n" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "Color of article subject lines" msgstr "Artikli teemarea värv" -#: src/lang.c:1868 +#: src/lang.c:1871 msgid "# Color of article subject\n" msgstr "# Artikli teema värv\n" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "Color of response counter" msgstr "Vastuste arvu loenduri värv" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "# Color of response counter\n" msgstr "# Vastuste arvu loenduri värv\n" -#: src/lang.c:1879 +#: src/lang.c:1882 msgid "Color of sender (From:)" msgstr "Saatja värv (From:)" -#: src/lang.c:1880 +#: src/lang.c:1883 msgid "# Color of sender (From:)\n" msgstr "# Saatja värv (From:)\n" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Color of help/mail sign" msgstr "Abiinfo/kirja teate värv" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "# Color of Help/Mail-Sign\n" msgstr "# Abiinfo/kirja teate värv\n" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "Color of signatures" msgstr "Signatuuri värv" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "# Color of signature\n" msgstr "# Signatuuri värv\n" # TRANSLATION MISSING -#: src/lang.c:1897 +#: src/lang.c:1900 msgid "Color of highlighted URLs" msgstr "" # TRANSLATION MISSING -#: src/lang.c:1898 +#: src/lang.c:1901 msgid "# Color of highlighted URLs\n" msgstr "" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "Color of highlighting with *stars*" msgstr "*tärnidega* esiletõstmise värv" -#: src/lang.c:1904 +#: src/lang.c:1907 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:1910 +#: src/lang.c:1913 msgid "Color of highlighting with _dash_" msgstr "_alakriipsudega_ esiletõstmise värv" -#: src/lang.c:1916 +#: src/lang.c:1919 msgid "Color of highlighting with /slash/" msgstr "/Kaldkriipsude/ esiletõstmise värv" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "Color of highlighting with -stroke-" msgstr "-Kriipsudega- esiletõstmise värv" -#: src/lang.c:1929 +#: src/lang.c:1932 msgid "Attr. of highlighting with *stars*" msgstr "*tärnidega* esiletõstmise atribuut" -#: src/lang.c:1930 +#: src/lang.c:1933 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5304,39 +5310,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:1940 +#: src/lang.c:1943 msgid "Attr. of highlighting with _dash_" msgstr "_alakriipsudega_ esiletõstmise atr." -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Attr. of highlighting with /slash/" msgstr "/Kaldkriipsude/ esiletõstmise atr." -#: src/lang.c:1952 +#: src/lang.c:1955 msgid "Attr. of highlighting with -stroke-" msgstr "-Kriipsudega- esiletõstmise atr." -#: src/lang.c:1958 +#: src/lang.c:1961 msgid "URL highlighting in message body" msgstr "Teate kehas URL esiletõstmine" -#: src/lang.c:1959 +#: src/lang.c:1962 msgid "# Enable URL highlighting?\n" msgstr "# Luba URLide esiletõstmine?\n" -#: src/lang.c:1964 +#: src/lang.c:1967 msgid "Word highlighting in message body" msgstr "Sõnade esiletõstmine teate kehas" -#: src/lang.c:1965 +#: src/lang.c:1968 msgid "# Enable word highlighting?\n" msgstr "# Lubada sõnade esiletõstmine?\n" -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "What to display instead of mark" msgstr "Mida näidata märgi asemel" -#: src/lang.c:1971 +#: src/lang.c:1974 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" @@ -5344,55 +5350,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:1977 +#: src/lang.c:1980 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:1978 +#: src/lang.c:1981 msgid "Page line wrap column" msgstr "Rea murdmise veerg lehitsejas" -#: src/lang.c:1979 +#: src/lang.c:1982 msgid "# Wrap article lines at column\n" msgstr "# Murra artikli read antud veerus\n" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "Wrap around threads on next unread" msgstr "Liigu lugemata art-le ümber teemade" -#: src/lang.c:1985 +#: src/lang.c:1988 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:1989 +#: src/lang.c:1992 msgid "Enter default mail address (and fullname). sets." msgstr "Sisestage oma e-posti aadress (ja oma nimi). seab." -#: src/lang.c:1990 +#: src/lang.c:1993 msgid "Mail address (and fullname)" msgstr "E-posti aadress (ja teie nimi)" -#: src/lang.c:1991 +#: src/lang.c:1994 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:1996 +#: src/lang.c:1999 msgid "Show empty Followup-To in editor" msgstr "Näita toimetis tühja Followup-To" -#: src/lang.c:1997 +#: src/lang.c:2000 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:2001 +#: src/lang.c:2004 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:2002 +#: src/lang.c:2005 msgid "Create signature from path/command" msgstr "Signatuuri loomiseks tee/käsk" -#: src/lang.c:2003 +#: src/lang.c:2006 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 " @@ -5403,49 +5409,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:2010 +#: src/lang.c:2013 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Signatuurile eelnevale reale \"-- \". lülitab, seab." -#: src/lang.c:2011 +#: src/lang.c:2014 msgid "Prepend signature with \"-- \"" msgstr "Lisa signatuuri ette \"-- \"" -#: src/lang.c:2012 +#: src/lang.c:2015 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:2016 +#: src/lang.c:2019 msgid "Add signature when reposting articles. toggles & sets." msgstr "Lisa artikli uuestipostitamisel signatuur. lülitab, seab." -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Add signature when reposting" msgstr "Lisa uuestipostitusel signatuur" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "# If ON add signature to reposted articles\n" msgstr "# Kui väärtus on ON, lisa uuestipostitatud artiklile signatuur\n" -#: src/lang.c:2022 +#: src/lang.c:2025 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:2023 +#: src/lang.c:2026 msgid "Characters used as quote-marks" msgstr "Tsiteerimise märgid" -#: src/lang.c:2024 +#: src/lang.c:2027 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:2030 +#: src/lang.c:2033 msgid "Quoting behavior" msgstr "Käitumine tsiteerimisel" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5465,15 +5471,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:2043 src/lang.c:2051 src/lang.c:2057 +#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 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:2044 +#: src/lang.c:2047 msgid "Quote line when following up" msgstr "Tsiteerimise rida vastamisel" -#: src/lang.c:2045 +#: src/lang.c:2048 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" @@ -5481,35 +5487,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:2052 +#: src/lang.c:2055 msgid "Quote line when cross-posting" msgstr "Tsiteerimise rida ristpostitusel" -#: src/lang.c:2058 +#: src/lang.c:2061 msgid "Quote line when mailing" msgstr "Tsiteerimise rida kirjutamisel" -#: src/lang.c:2063 +#: src/lang.c:2066 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Kasuta User-Agent: päiserida. lülitab, seab." -#: src/lang.c:2064 +#: src/lang.c:2067 msgid "Insert 'User-Agent:'-header" msgstr "Sisestage 'User-Agent:'-päis" -#: src/lang.c:2065 +#: src/lang.c:2068 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:2069 +#: src/lang.c:2073 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:2070 +#: src/lang.c:2074 msgid "MM_CHARSET" msgstr "MM_CHARSET" -#: src/lang.c:2071 +#: src/lang.c:2075 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" @@ -5525,27 +5531,27 @@ msgstr "# Lokaalselt toetatud kooditabel "# loetakse mm_charset väärtusest erinev kooditabel mitte-näidatavaks\n" "# ja näitamisel kasutatakse '?'.\n" -#: src/lang.c:2082 +#: src/lang.c:2085 msgid "MM_NETWORK_CHARSET" msgstr "MM_NETWORK_CHARSET" -#: src/lang.c:2083 +#: src/lang.c:2086 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Postituste MIME (Content-Type) päises kasutatav kooditabel.\n" -#: src/lang.c:2089 +#: src/lang.c:2092 msgid "Mailbox format" msgstr "Kirjade kataloog" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "# Format of the mailbox.\n" msgstr "# Kirjade kataloog.\n" -#: src/lang.c:2095 +#: src/lang.c:2098 msgid "MIME encoding in news messages" msgstr "Kasuta artiklites MIME kodeerimist" -#: src/lang.c:2096 +#: src/lang.c:2099 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" @@ -5557,15 +5563,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:2104 src/lang.c:2125 +#: src/lang.c:2107 src/lang.c:2128 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:2105 +#: src/lang.c:2108 msgid "Use 8bit characters in news headers" msgstr "Kasuta artikli päises 8bit tähti" -#: src/lang.c:2106 +#: src/lang.c:2109 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" @@ -5575,28 +5581,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:2113 +#: src/lang.c:2116 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Vaata töödeldud faile automaatselt lülitab, seab, " "katkestab." -#: src/lang.c:2114 +#: src/lang.c:2117 msgid "View post-processed files" msgstr "Vaata töödeldud faile" -#: src/lang.c:2115 +#: src/lang.c:2118 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:2120 +#: src/lang.c:2123 msgid "MIME encoding in mail messages" msgstr "Kasuta kirjades MIME kodeerimist" -#: src/lang.c:2126 +#: src/lang.c:2129 msgid "Use 8bit characters in mail headers" msgstr "Kasuta kirja päises 8bit tähti" -#: src/lang.c:2127 +#: src/lang.c:2130 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 " @@ -5611,25 +5617,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:2137 +#: src/lang.c:2140 msgid "Strip blanks from ends of lines" msgstr "Eemalda tühikud realõppudest" -#: src/lang.c:2138 +#: src/lang.c:2141 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:2143 +#: src/lang.c:2146 msgid "If ON, use transliteration. toggles & sets." msgstr "Kui väärtus on ON, kasuta transliteratsiooni. lülitab, seab." -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Transliteration" msgstr "Transliteratsioon" -#: src/lang.c:2145 +#: src/lang.c:2148 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" @@ -5638,245 +5644,245 @@ msgstr "# Kui väärtus on ON, kasuta //TR "kasutades\n" "# üht või enamat sarnast sümbolit.\n" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Saada kasutajale automaatselt koopia. lülitab, seab." -#: src/lang.c:2153 +#: src/lang.c:2156 msgid "Send you a cc automatically" msgstr "Saada automaatselt koopia" -#: src/lang.c:2154 +#: src/lang.c:2157 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:2158 +#: src/lang.c:2161 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Saada automaatselt pimekoopia. lülitab, seab." -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "Send you a blind cc automatically" msgstr "Saada automaatselt pimekoopia" -#: src/lang.c:2160 +#: src/lang.c:2163 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:2164 +#: src/lang.c:2167 msgid "Enter address elements about which you want to be warned. sets." msgstr "Sisestage aadressi komponendid, mille eest peaks hoiatama. seab." -#: src/lang.c:2165 +#: src/lang.c:2168 msgid "Spamtrap warning address parts" msgstr "Rämpsposti hoiatus aadressi osadele" -#: src/lang.c:2166 +#: src/lang.c:2169 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:2171 +#: src/lang.c:2174 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Sisestage kirje kehtivuse aeg päevades. seab." -#: src/lang.c:2172 +#: src/lang.c:2175 msgid "No. of days a filter entry is valid" msgstr "Filtri kehtivus päevades" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "# Number of days a short term filter will be active\n" msgstr "# lühiajalise filtri kehtivus päevades\n" -#: src/lang.c:2177 +#: src/lang.c:2180 msgid "Add posted articles to filter. toggles & sets." msgstr "Lisage postitatud artikkel filtrisse. lülitab, seab." -#: src/lang.c:2178 +#: src/lang.c:2181 msgid "Add posted articles to filter" msgstr "Lisage postitatud artikkel filtrile" -#: src/lang.c:2179 +#: src/lang.c:2182 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:2183 +#: src/lang.c:2186 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "Kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis." -#: src/lang.c:2184 +#: src/lang.c:2187 msgid "Mail directory" msgstr "Kirjade kataloog" -#: src/lang.c:2185 +#: src/lang.c:2188 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis\n" -#: src/lang.c:2190 +#: src/lang.c:2193 msgid "Save articles in batch mode (-S)" msgstr "Salvesta artiklid pakettmoodis (-S)" -#: src/lang.c:2191 +#: src/lang.c:2194 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:2196 +#: src/lang.c:2199 msgid "The directory where you want articles/threads saved." msgstr "Kataloog, kuhu te soovite artikleid salvestada." -#: src/lang.c:2197 +#: src/lang.c:2200 msgid "Directory to save arts/threads in" msgstr "Kataloog artiklite salvestamiseks" -#: src/lang.c:2198 +#: src/lang.c:2201 msgid "# Directory where articles/threads are saved\n" msgstr "# Kataloog, kuhu salvestatakse artiklid/teemad\n" -#: src/lang.c:2202 +#: src/lang.c:2205 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:2203 +#: src/lang.c:2206 msgid "Use Archive-name: header for save" msgstr "Kasuta salvestamisel Archive-name:" -#: src/lang.c:2204 +#: src/lang.c:2207 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:2209 +#: src/lang.c:2212 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "Märgi salvestatud artiklid loetuks. lülitab, seab, " "katkestab." -#: src/lang.c:2210 +#: src/lang.c:2213 msgid "Mark saved articles/threads as read" msgstr "Märgi salvestatud artiklid loetuks" -#: src/lang.c:2211 +#: src/lang.c:2214 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:2215 +#: src/lang.c:2218 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Teosta salvestatud artiklitel järeltöötlemist (nt. lisade eraldamist)." -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "Post process saved articles" msgstr "Salvestatud artikl. järeltöötlemine" -#: src/lang.c:2217 +#: src/lang.c:2220 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:2223 +#: src/lang.c:2226 msgid "Process only unread articles" msgstr "Töötle ainult lugemata artikleid" -#: src/lang.c:2224 +#: src/lang.c:2227 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:2229 +#: src/lang.c:2232 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:2230 +#: src/lang.c:2233 msgid "Print all headers when printing" msgstr "Trükkimisel trüki kõik päised" -#: src/lang.c:2231 +#: src/lang.c:2234 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:2235 +#: src/lang.c:2238 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:2236 +#: src/lang.c:2239 msgid "Printer program with options" msgstr "Trükikäsk koos võtmetega" -#: src/lang.c:2237 +#: src/lang.c:2240 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:2243 +#: src/lang.c:2246 msgid "Force redraw after certain commands" msgstr "Värskenda ekraani peale käske" -#: src/lang.c:2244 +#: src/lang.c:2247 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:2248 +#: src/lang.c:2251 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "Käivita tekstitoimeti etteantud real. lülitab, seab, " "katkestab." -#: src/lang.c:2249 +#: src/lang.c:2252 msgid "Start editor with line offset" msgstr "Käivita tekstitoimeti reanumbril" -#: src/lang.c:2250 +#: src/lang.c:2253 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:2255 +#: src/lang.c:2258 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:2256 +#: src/lang.c:2259 msgid "Invocation of your editor" msgstr "Teie tekstitoimeti" -#: src/lang.c:2257 +#: src/lang.c:2260 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:2262 +#: src/lang.c:2265 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:2263 +#: src/lang.c:2266 msgid "External inews" msgstr "Väline inews" -#: src/lang.c:2264 +#: src/lang.c:2267 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:2268 +#: src/lang.c:2271 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:2269 +#: src/lang.c:2272 msgid "Invocation of your mail command" msgstr "Teie e-posti käsk" -#: src/lang.c:2270 +#: src/lang.c:2273 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" @@ -5886,11 +5892,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:2278 +#: src/lang.c:2281 msgid "Use interactive mail reader" msgstr "Kasuta interaktiivset e-posti" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "# Interactive mailreader:\n" "# 0 = no interactive mailreader\n" "# 1 = use interactive mailreader with headers in file\n" @@ -5900,138 +5906,138 @@ 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:2287 +#: src/lang.c:2290 msgid "Remove ~/.article after posting" msgstr "Eemalda ~/.article peale postitust" -#: src/lang.c:2288 +#: src/lang.c:2291 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Kui väärtus on ON, kustuta ~/.article peale postitust.\n" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "Failinimi postitatud artiklitele. seab. Nime puudumisel ei salvestata." -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "Filename for posted articles" msgstr "Failinimi postitatud artiklitele" -#: src/lang.c:2294 +#: src/lang.c:2297 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:2299 +#: src/lang.c:2302 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:2300 +#: src/lang.c:2303 msgid "Keep failed arts in ~/dead.articles" msgstr "Vigased artiklid ~/dead.articles" -#: src/lang.c:2301 +#: src/lang.c:2304 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:2305 +#: src/lang.c:2308 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Kas te soovite eemaldada tellimata grupid .newsrc failist" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "No unsubscribed groups in newsrc" msgstr "newsrcs ainult tellitud grupid" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Kui väärtus on ON, eemalda tellimata grupid newsrc failist\n" -#: src/lang.c:2312 +#: src/lang.c:2315 msgid "Remove bogus groups from newsrc" msgstr "Eemalda olematud grupid newsrcst" -#: src/lang.c:2313 +#: src/lang.c:2316 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:2317 +#: src/lang.c:2320 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Sisestage aktiivsete faili lugemise intervall sekundites. seab." -#: src/lang.c:2318 +#: src/lang.c:2321 msgid "Interval in secs to reread active" msgstr "Aktiivsete faili lugemise intervall" -#: src/lang.c:2319 +#: src/lang.c:2322 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:2324 +#: src/lang.c:2327 msgid "Reconnect to server automatically" msgstr "Taasta automaatselt NNTP ühendus" -#: src/lang.c:2325 +#: src/lang.c:2328 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:2329 +#: src/lang.c:2332 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Loo NNTP overview failidest lokaalne koopia. lülitab ja seab." -#: src/lang.c:2330 +#: src/lang.c:2333 msgid "Cache NNTP overview files locally" msgstr "Puhverda NNTP overview lokaalselt" -#: src/lang.c:2331 +#: src/lang.c:2334 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:2335 +#: src/lang.c:2338 msgid "Enter format string. sets, cancels." msgstr "Sisestage vormingusõne. seab, katkestab." -#: src/lang.c:2336 +#: src/lang.c:2339 msgid "Format string for display of dates" msgstr "Kuupäevade esitamise vormingusõne" -#: src/lang.c:2337 +#: src/lang.c:2340 msgid "# Format string for date representation\n" msgstr "# Vormingusõne kuupäevade esitamiseks\n" # TRANSLATION MISSING -#: src/lang.c:2343 +#: src/lang.c:2346 msgid "Unicode normalization form" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2344 +#: src/lang.c:2347 msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2351 +#: src/lang.c:2354 msgid "Render BiDi" msgstr "" # TRANSLATION MISSING -#: src/lang.c:2352 +#: src/lang.c:2355 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/main.c:590 +#: src/misc.c:3711 #, c-format -msgid "Version: %s release %s (\"%s\") %s %s" -msgstr "Versioon: %s väljalase %s (\"%s\") %s %s" +msgid "Version: %s %s release %s (\"%s\") %s %s\n" +msgstr "Versioon: %s %s väljalase %s (\"%s\") %s %s\n" -#: src/main.c:593 +#: src/misc.c:3714 #, c-format -msgid "Version: %s release %s (\"%s\")" -msgstr "Versioon: %s väljalase %s (\"%s\")" +msgid "Version: %s %s release %s (\"%s\")\n" +msgstr "Versioon: %s %s väljalase %s (\"%s\")\n" #: src/newsrc.c:432 msgid "Unreachable?\n" @@ -6063,7 +6069,7 @@ msgstr "Saada viimane käsk uuesti (%s)\n msgid "couldn't expand %s\n" msgstr "ei saa laiendada %s\n" -#: src/post.c:1951 +#: src/post.c:1962 #, c-format msgid "Posting: %.*s ..." msgstr "Postitan: %.*s ..." @@ -6103,19 +6109,19 @@ msgid "This message has been composed in "\n" msgstr "" -#: src/save.c:967 +#: src/save.c:974 msgid "bytes" msgstr "baiti" -#: src/select.c:351 +#: src/select.c:352 msgid "unread" msgstr "lugemata" -#: src/select.c:351 +#: src/select.c:352 msgid "all" msgstr "kõik" -#: src/select.c:529 src/select.c:531 +#: src/select.c:530 src/select.c:532 msgid " R" msgstr " L" Binary files tin-1.7.5/po/fr.gmo and tin-1.7.6/po/fr.gmo differ diff -Nurp tin-1.7.5/po/fr.po tin-1.7.6/po/fr.po --- tin-1.7.5/po/fr.po 2004-08-20 10:35:18.000000000 +0200 +++ tin-1.7.6/po/fr.po 2004-09-06 10:40:50.000000000 +0200 @@ -3,7 +3,7 @@ # msgid "" msgstr "Project-Id-Version: 1.7.4\n" - "POT-Creation-Date: 2004-06-04 13:31+0200\n" + "POT-Creation-Date: 2004-09-06 10:40+0200\n" "PO-Revision-Date: 2004-03-01 16:07+0100\n" "Last-Translator: Matt Anton \n" @@ -12,221 +12,221 @@ msgstr "Project-Id-Version: 1.7.4\n" "Content-Transfer-Encoding: 8bit\n" "Report-Msgid-Bugs-To: \n" -#: src/art.c:1430 +#: src/art.c:1447 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Mauvais overview (%d champs) '%s'" -#: src/attrib.c:590 +#: src/attrib.c:594 msgid "# Do not edit this comment block\n" "#\n" msgstr "# Ne pas éditer ce commentaire\n" "#\n" -#: src/attrib.c:591 +#: src/attrib.c:595 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=TERME (pe. alt.*,!alt.bin*) [obligatoire]\n" -#: src/attrib.c:592 +#: src/attrib.c:596 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=TERME (pe. ~/Mail)\n" -#: src/attrib.c:593 +#: src/attrib.c:597 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=TERME (pe. ~user/News)\n" -#: src/attrib.c:594 +#: src/attrib.c:598 msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=TERME (pe. =linux)\n" -#: src/attrib.c:595 +#: src/attrib.c:599 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=TERME (pe. $var/sig)\n" -#: src/attrib.c:596 +#: src/attrib.c:600 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=TERME (si commence par '/' lire dans fichier)\n" -#: src/attrib.c:597 +#: src/attrib.c:601 msgid "# followup_to=STRING\n" msgstr "# followup_to=TERME\n" -#: src/attrib.c:598 +#: src/attrib.c:602 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=TERME (pe. majordomo@example.org)\n" -#: src/attrib.c:599 +#: src/attrib.c:603 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=TERME (pe. ~/.tin/extra-headers)\n" -#: src/attrib.c:600 +#: src/attrib.c:604 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=TERME (pe. ~/.tin/extra-body-text)\n" -#: src/attrib.c:601 +#: src/attrib.c:605 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=TERME (choix du 'From:', ne pas utiliser celui cité)\n" -#: src/attrib.c:602 +#: src/attrib.c:606 msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=TERME\n" -#: src/attrib.c:603 +#: src/attrib.c:607 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=TERME (%%s, %%S pour les initiales)\n" -#: src/attrib.c:604 +#: src/attrib.c:608 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=TERME (pe. image/*,!image/bmp)\n" -#: src/attrib.c:606 +#: src/attrib.c:610 msgid "# ispell=STRING\n" msgstr "# ispell=TERME\n" -#: src/attrib.c:608 +#: src/attrib.c:612 msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:609 +#: src/attrib.c:613 msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:610 +#: src/attrib.c:614 msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:611 +#: src/attrib.c:615 msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:612 +#: src/attrib.c:616 msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" -#: src/attrib.c:613 +#: src/attrib.c:617 msgid "# thread_arts=NUM" msgstr "# thread_arts=NUM" -#: src/attrib.c:620 +#: src/attrib.c:624 msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:626 +#: src/attrib.c:630 msgid "# show_info=NUM\n" msgstr "# show_info=NUM\n" -#: src/attrib.c:632 +#: src/attrib.c:636 msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=NUM\n" -#: src/attrib.c:650 +#: src/attrib.c:654 msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:655 +#: src/attrib.c:659 msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=NUM\n" -#: src/attrib.c:660 +#: src/attrib.c:664 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=TERME (pe. talk.*)\n" -#: src/attrib.c:661 +#: src/attrib.c:665 msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:662 +#: src/attrib.c:666 msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:663 +#: src/attrib.c:667 msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:664 src/attrib.c:671 +#: src/attrib.c:668 src/attrib.c:675 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0=subject (casse sensible) 1=subject (ignore la casse)\n" -#: src/attrib.c:665 src/attrib.c:672 +#: src/attrib.c:669 src/attrib.c:676 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2=from (casse sensible) 3=from (ignore la casse)\n" -#: src/attrib.c:666 src/attrib.c:673 +#: src/attrib.c:670 src/attrib.c:677 msgid "# 4=msgid 5=lines\n" msgstr "# 4=msgid 5=lines\n" -#: src/attrib.c:667 +#: src/attrib.c:671 msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=TERME\n" -#: src/attrib.c:668 +#: src/attrib.c:672 msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:669 +#: src/attrib.c:673 msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:670 +#: src/attrib.c:674 msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:674 +#: src/attrib.c:678 msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:675 +#: src/attrib.c:679 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=TERME (pe. =mailbox)\n" -#: src/attrib.c:676 +#: src/attrib.c:680 msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:677 +#: src/attrib.c:681 msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:683 msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=encodage_supporté" -#: src/attrib.c:686 +#: src/attrib.c:690 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=TERME (défaut est US-ASCII)\n" -#: src/attrib.c:688 +#: src/attrib.c:692 msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Notez que placer les entrées générales (portée globale) en premier\n" -#: src/attrib.c:689 +#: src/attrib.c:693 msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# est préférable, suivies des entrées spécifiques aux groupes.\n" "#\n" -#: src/attrib.c:690 +#: src/attrib.c:694 msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:696 +#: src/attrib.c:700 msgid "# include extra headers\n" msgstr "# inclure des en-têtes supplémentaires\n" -#: src/attrib.c:704 +#: src/attrib.c:708 msgid "# in *sources* set post process type to shar only\n" msgstr "# dans *sources* choisir le type shar en post-traitement\n" -#: src/attrib.c:708 +#: src/attrib.c:712 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "# dans *binaries* faire traitement complet, effaçant les fichiers " "temporaires\n" -#: src/attrib.c:709 +#: src/attrib.c:713 msgid "# and set Followup-To: poster\n" msgstr "# et utiliser Followup-To: poster\n" @@ -589,7 +589,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:1118 +#: src/lang.c:127 src/lang.c:1121 msgid "Default" msgstr "Défaut" @@ -1640,7 +1640,7 @@ msgstr "déplacer le groupe sélectionné" msgid "choose next group with unread news" msgstr "choisir le groupe suivant ayant articles non lus" -#: src/lang.c:384 src/lang.c:1165 +#: src/lang.c:384 src/lang.c:1168 msgid "quit" msgstr "quitter" @@ -2552,91 +2552,96 @@ msgstr "Lecture du fichier newsgroups... msgid "Reading newsrc file..." msgstr "Lecture du fichier newsrc..." -#: src/lang.c:609 +#: src/lang.c:610 +#, c-format +msgid "(%d:%02d remaining)" +msgstr "" + +#: src/lang.c:612 #, c-format msgid "Bogus group %s removed." msgstr "Effacement du groupe corrompu %s." -#: src/lang.c:610 +#: src/lang.c:613 #, c-format msgid "Error: rename %s to %s" msgstr "Erreur : renommer %s à %s" -#: src/lang.c:611 +#: src/lang.c:614 msgid "Reply to author..." msgstr "Répondre à l'auteur..." -#: src/lang.c:612 +#: src/lang.c:615 msgid "Repost" msgstr "Reposter" -#: src/lang.c:613 +#: src/lang.c:616 msgid "Reposting article..." msgstr "Repostage de l'article..." -#: src/lang.c:614 +#: src/lang.c:617 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "Reposter article(s) dans groupe(s) [%s]> " -#: src/lang.c:615 +#: src/lang.c:618 msgid "Reset newsrc?" msgstr "Réinitialiser newsrc ?" -#: src/lang.c:616 +#: src/lang.c:619 msgid "Responses have been directed to the following newsgroups" msgstr "Les réponses ont été redirigées vers les groupes suivants" -#: src/lang.c:617 +#: src/lang.c:620 #, 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:618 +#: src/lang.c:621 #, c-format msgid "RespNo %4d of %4d" msgstr "Réponse %4d sur %4d" -#: src/lang.c:619 +#: src/lang.c:622 msgid "Press to continue..." msgstr "Appuyez sur pour continuer..." -#: src/lang.c:621 +#: src/lang.c:624 #, c-format msgid "Select From [%s] (y/n): " msgstr " De : [%s] (o/n) : " -#: src/lang.c:622 +#: src/lang.c:625 msgid "Select Lines: (num): " msgstr "Nombre de lignes (num) : " -#: src/lang.c:623 +#: src/lang.c:626 msgid "Auto-select Article Menu" msgstr "Créer une règle" -#: src/lang.c:624 +#: src/lang.c:627 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr " MID : [%s] (t/d/a/n) : " -#: src/lang.c:625 +#: src/lang.c:628 msgid "Select pattern scope: " msgstr "Règle s'appliquant à : " -#: src/lang.c:626 +#: src/lang.c:629 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "Sujet : [%s] (o/n) : " -#: src/lang.c:627 +#: src/lang.c:630 msgid "Select text pattern : " msgstr "Texte ou terme : " -#: src/lang.c:628 +#: src/lang.c:631 msgid "Select time in days : " msgstr "Durée de la règle : " -#: src/lang.c:629 +#: src/lang.c:632 #, c-format msgid "# %s server configuration file\n" "# This file was automatically saved by %s %s %s (\"%s\")\n" @@ -2654,220 +2659,220 @@ msgstr "# Fichier de configuration serve "# Enfin, ne touchez pas à ce fichier si vous ne savez pas quoi y faire.\n" "############################################################################\n" -#: src/lang.c:635 +#: src/lang.c:638 msgid "Showing unread groups only" msgstr "Afficher uniquement les groupes non lus" -#: src/lang.c:636 +#: src/lang.c:639 msgid "Subject: line (ignore case) " msgstr "l'en-tête 'Subject:' (ignorer la casse)" -#: src/lang.c:637 +#: src/lang.c:640 msgid "Subject: line (case sensitive)" msgstr "l'en-tête 'Subject:' (casse sensible)" -#: src/lang.c:638 +#: src/lang.c:641 msgid "Save" msgstr "Enregistrer" -#: src/lang.c:639 +#: src/lang.c:642 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "Enregistrer '%s' (%s/%s) ?" -#: src/lang.c:640 +#: src/lang.c:643 msgid "Save configuration before continuing?" msgstr "Enregistrer la configuration avant de continuer ?" -#: src/lang.c:641 +#: src/lang.c:644 msgid "Save filename> " msgstr "Enregistrer sous le nom de fichier > " -#: src/lang.c:642 +#: src/lang.c:645 msgid "Saved" msgstr "Enregistré" -#: src/lang.c:643 +#: src/lang.c:646 #, 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:644 +#: src/lang.c:647 #, c-format msgid "Saved %s...\n" msgstr "Enregistrement de %s...\n" -#: src/lang.c:645 +#: src/lang.c:648 msgid "Nothing was saved" msgstr "Rien n'a été enregistré" -#: src/lang.c:646 +#: src/lang.c:649 #, c-format msgid "\n" "%s %d %s from %d %s\n" msgstr "\n" "%s %d %s de %d %s\n" -#: src/lang.c:647 +#: src/lang.c:650 #, c-format msgid "-- %s saved to %s%s --" msgstr "-- %s enregistré dans %s%s --" -#: src/lang.c:648 +#: src/lang.c:651 #, c-format msgid "-- %s saved to %s - %s --" msgstr "-- %s enregistré dans %s - %s --" -#: src/lang.c:649 +#: src/lang.c:652 msgid "Saving..." msgstr "Enregistrement..." -#: src/lang.c:650 +#: src/lang.c:653 #, c-format msgid "%s: Screen initialization failed" msgstr "%s : Échec de l'initialisation de l'écran" -#: src/lang.c:651 +#: src/lang.c:654 #, c-format msgid "%s: screen is too small\n" msgstr "%s : l'écran est trop petit\n" -#: src/lang.c:652 +#: src/lang.c:655 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "l'écran est trop petit, %s quitte\n" -#: src/lang.c:653 +#: src/lang.c:656 #, c-format msgid "Search backwards [%s]> " msgstr "Recherche arrière [%s]> " -#: src/lang.c:654 +#: src/lang.c:657 #, c-format msgid "Search body [%s]> " msgstr "Rechercher dans le corps [%s]> " -#: src/lang.c:655 +#: src/lang.c:658 #, c-format msgid "Search forwards [%s]> " msgstr "Recherche avant [%s]> " -#: src/lang.c:656 +#: src/lang.c:659 msgid "Searching..." msgstr "Recherche..." -#: src/lang.c:657 +#: src/lang.c:660 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "Recherche article %d sur %d ('q' pour annuler)..." -#: src/lang.c:658 +#: src/lang.c:661 msgid "Select article> " msgstr "Sélectionner l'article > " # TRANSLATION TOO LONG (75 chars max) -#: src/lang.c:659 +#: src/lang.c:662 msgid "Select option number before text or use arrow keys and . 'q' to quit." msgstr "Choisir un numéro d'option ou utiliser les flèches puis . 'q' pour " "quitter." -#: src/lang.c:660 +#: src/lang.c:663 msgid "Select group> " msgstr "Sélectionner le groupe > " -#: src/lang.c:661 +#: src/lang.c:664 #, c-format msgid "Enter selection pattern [%s]> " msgstr "Entrez le critère de sélection [%s]> " -#: src/lang.c:662 +#: src/lang.c:665 msgid "Select thread > " msgstr "Sélectionner le fil > " -#: src/lang.c:663 +#: src/lang.c:666 #, 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:664 +#: src/lang.c:667 msgid "servers active-file" msgstr "fichier active des serveurs" -#: src/lang.c:665 +#: src/lang.c:668 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "Déplacement dans nouveaux groupes impossible. Abonnez-vous d'abord..." -#: src/lang.c:666 +#: src/lang.c:669 msgid "" msgstr "" -#: src/lang.c:667 +#: src/lang.c:670 #, c-format msgid "Starting: (%s)" msgstr "Démarrage : (%s)" -#: src/lang.c:668 +#: src/lang.c:671 #, c-format msgid "List Thread (%d of %d)" msgstr "Visualisation du fil (%d sur %d)" -#: src/lang.c:669 +#: src/lang.c:672 #, c-format msgid "Thread (%.*s)" msgstr "Fil (%.*s)" -#: src/lang.c:670 +#: src/lang.c:673 msgid "Enter wildcard subscribe pattern> " msgstr "Entrer un caractère joker comme critère > " -#: src/lang.c:671 +#: src/lang.c:674 #, c-format msgid "subscribed to %d groups" msgstr "Abonné à %d groupes" -#: src/lang.c:672 +#: src/lang.c:675 #, c-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: src/lang.c:673 +#: src/lang.c:676 msgid "Subscribing... " msgstr "Abonnement..." -#: src/lang.c:674 +#: src/lang.c:677 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:675 +#: src/lang.c:678 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "Remplacer le(s) article(s) du(es) groupe(s) [%s] > " -#: src/lang.c:676 +#: src/lang.c:679 msgid "Superseding article ..." msgstr "Remplacement de l'article..." -#: src/lang.c:677 +#: src/lang.c:680 #, c-format msgid "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "\n" "Arrêté. Tapez 'fg' pour relancer %s\n" -#: src/lang.c:679 +#: src/lang.c:682 #, c-format msgid "%d days" msgstr "%d jours" -#: src/lang.c:680 +#: src/lang.c:683 msgid "" msgstr "" -#: src/lang.c:681 +#: src/lang.c:684 msgid "# Default action/prompt strings\n" msgstr "# Termes action/prompt par défaut\n" -#: src/lang.c:682 +#: src/lang.c:685 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" @@ -2885,266 +2890,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:695 +#: src/lang.c:698 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:696 +#: src/lang.c:699 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:697 +#: src/lang.c:700 msgid "There is no news\n" msgstr "Rien de neuf\n" -#: src/lang.c:698 +#: src/lang.c:701 msgid "Thread" msgstr "Fil" -#: src/lang.c:699 +#: src/lang.c:702 msgid "Thread Level Commands" msgstr "Commandes pour fil" -#: src/lang.c:700 +#: src/lang.c:703 msgid "Thread deselected" msgstr "Fil désélectionné" -#: src/lang.c:701 +#: src/lang.c:704 msgid "Thread selected" msgstr "Fil sélectionné" -#: src/lang.c:702 +#: src/lang.c:705 msgid "threads" msgstr "fils" -#: src/lang.c:703 +#: src/lang.c:706 msgid "Thread range" msgstr "Champ du fil" -#: src/lang.c:704 +#: src/lang.c:707 msgid "thread" msgstr "fil" -#: src/lang.c:705 +#: src/lang.c:708 #, c-format msgid "Thread %4s of %4s" msgstr " Fil %4s sur %4s" -#: src/lang.c:706 +#: src/lang.c:709 msgid "Threading articles..." msgstr "Regroupement des articles..." -#: src/lang.c:707 +#: src/lang.c:710 #, c-format msgid "Toggled word highlighting %s" msgstr "(Dés)activer surbrillance %s" -#: src/lang.c:708 +#: src/lang.c:711 msgid "Toggled rot13 encoding" msgstr "(Dés)activer codage rot13" -#: src/lang.c:709 +#: src/lang.c:712 #, c-format msgid "Toggled german TeX encoding %s" msgstr "(Dés)activer codage TeX Allemand %s" -#: src/lang.c:710 +#: src/lang.c:713 #, c-format msgid "Toggled tab-width to %d" msgstr "(Dés)activer largeur de tabulation à %d" -#: src/lang.c:711 +#: src/lang.c:714 #, c-format msgid "%d Trying to dotlock %s" msgstr "%d essaye de déverrouiller %s" -#: src/lang.c:712 +#: src/lang.c:715 #, c-format msgid "%d Trying to lock %s" msgstr "%d essaye de verrouiller %s" -#: src/lang.c:713 +#: src/lang.c:716 msgid " h=help\n" msgstr " h=aide\n" -#: src/lang.c:715 +#: src/lang.c:718 msgid "Unlimited" msgstr "Illimitée" -#: src/lang.c:716 +#: src/lang.c:719 msgid "Enter wildcard unsubscribe pattern> " msgstr "Terme joker pour se désabonner > " -#: src/lang.c:717 +#: src/lang.c:720 #, c-format msgid "Error decoding %s : %s" msgstr "Erreur lors du décodage de %s : %s" -#: src/lang.c:718 +#: src/lang.c:721 msgid "No end." msgstr "Pas de fin." -#: src/lang.c:719 +#: src/lang.c:722 #, c-format msgid "%s successfully decoded." msgstr "%s décodé avec succès." -#: src/lang.c:720 +#: src/lang.c:723 #, 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:721 +#: src/lang.c:724 msgid "unread " msgstr "non lu" -#: src/lang.c:722 +#: src/lang.c:725 #, c-format msgid "unsubscribed from %d groups" msgstr "désabonné de %d groupes" -#: src/lang.c:723 +#: src/lang.c:726 #, c-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: src/lang.c:724 +#: src/lang.c:727 msgid "Unsubscribing... " msgstr "Désabonnement..." -#: src/lang.c:725 +#: src/lang.c:728 msgid "Unthreading articles..." msgstr "Dégroupement des articles..." -#: src/lang.c:726 +#: src/lang.c:729 msgid "Updated" msgstr "Mis à jour" -#: src/lang.c:727 +#: src/lang.c:730 msgid "Updating" msgstr "Rafraîchissement" -#: src/lang.c:728 +#: src/lang.c:731 #, c-format msgid "Opening %s\n" msgstr "Ouverture de %s\n" -#: src/lang.c:729 +#: src/lang.c:732 msgid "No more URL's in this article" msgstr "Plus d'URL dans cet article" -#: src/lang.c:730 +#: src/lang.c:733 msgid "Use MIME display program for this message?" msgstr "Utiliser le programme d'affichage MIME pour ce message ?" -#: src/lang.c:731 +#: src/lang.c:734 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:732 +#: src/lang.c:735 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:733 +#: src/lang.c:736 msgid " -q don't check for new newsgroups" msgstr " -q ne pas vérifier s'il y a des nouveaux groupes" -#: src/lang.c:734 +#: src/lang.c:737 msgid " -X don't save any files on quit" msgstr " -X ne pas enregistrer de fichiers à la fermeture" -#: src/lang.c:735 +#: src/lang.c:738 msgid " -d don't show newsgroup descriptions" msgstr " -d ne pas afficher les descriptions des groupes" -#: src/lang.c:736 +#: src/lang.c:739 msgid " -G limit get only limit articles/group" msgstr " -G nombre d'articles par groupe limite" -#: src/lang.c:737 +#: src/lang.c:740 #, c-format msgid " -H help information about %s" msgstr " -H aide à propos de %s" -#: src/lang.c:738 +#: src/lang.c:741 msgid " -h this help message" msgstr " -h ce message d'aide" -#: src/lang.c:739 +#: src/lang.c:742 #, 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:740 +#: src/lang.c:743 msgid " -u update index files (batch mode)" msgstr " -u màj des fichiers index (en tâche de fond)" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr " -m rép. dossier des bàl [défaut=%s]" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "\n" "Mail bug reports/comments to %s" msgstr "\n" "Envoyez par mail vos rapports de bugs/suggestions à %s" -#: src/lang.c:743 +#: src/lang.c:746 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:744 +#: src/lang.c:747 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:745 +#: src/lang.c:748 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr " -f fich. abonné au fichier groupes [défaut=%s]" -#: src/lang.c:746 +#: src/lang.c:749 msgid " -x no posting mode" msgstr "" -#: src/lang.c:747 +#: src/lang.c:750 msgid " -w post an article and exit" msgstr "" -#: src/lang.c:748 +#: src/lang.c:751 msgid " -o post all postponed articles and exit" msgstr " -o poster tous les brouillons puis quitter" -#: src/lang.c:749 +#: src/lang.c:752 msgid " -r read news remotely from default NNTP server" msgstr " -r lire les articles depuis le serveur NNTP par défaut" -#: src/lang.c:750 +#: src/lang.c:753 msgid " -R read news saved by -S option" msgstr " -R lire les articles enregistrés via l'option -S" -#: src/lang.c:751 +#: src/lang.c:754 #, 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:752 +#: src/lang.c:755 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:753 +#: src/lang.c:756 msgid " -z start if any unread news" msgstr " -z lancer si articles non lus" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "A Usenet reader.\n" "\n" @@ -3152,37 +3157,37 @@ msgid "A Usenet reader.\n" msgstr "Un lecteur UseNet.\n" "Usage : %s [options] [groupe[,...]]" -#: src/lang.c:755 +#: src/lang.c:758 msgid " -v verbose output for batch mode options" msgstr " -v sortie détaillée pour options en tâche de fond" -#: src/lang.c:756 +#: src/lang.c:759 msgid " -V print version & date information" msgstr " -V afficher infos date & version" -#: src/lang.c:757 +#: src/lang.c:760 #, 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:758 +#: src/lang.c:761 #, 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:760 +#: src/lang.c:763 #, 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:761 +#: src/lang.c:764 #, c-format msgid "View '%s' (%s/%s)?" msgstr "Vue '%s' (%s/%s) ?" -#: src/lang.c:763 +#: src/lang.c:766 #, c-format msgid "\n" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" @@ -3192,26 +3197,26 @@ msgstr "\n" ":\n" "%-100s\n" -#: src/lang.c:764 +#: src/lang.c:767 msgid "\n" "Warning: article unchanged after editing\n" msgstr "\n" "Attention : article inchangé après son édition\n" -#: src/lang.c:765 +#: src/lang.c:768 msgid "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "\n" "Attention : \"Subject:\" contient que des espaces.\n" -#: src/lang.c:766 +#: src/lang.c:769 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:768 +#: src/lang.c:771 msgid "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" @@ -3219,7 +3224,7 @@ msgstr "\n" "Attention : L'article a \"References:\" mais \"Subject:\" ne commence\n" " avec \"Re: \" et ne contient pas \"(was:\".\n" -#: src/lang.c:771 +#: src/lang.c:774 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3241,7 +3246,7 @@ msgstr "Lisez ceci attentivement !\n" "Voici l'article que vous vous apprêtez à effacer :\n" "\n" -#: src/lang.c:775 +#: src/lang.c:778 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" @@ -3253,7 +3258,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:780 +#: src/lang.c:783 #, c-format msgid "\n" "\n" @@ -3266,7 +3271,7 @@ msgstr "\n" "Certaines valeurs dans votre fichier %s ont changé !\n" "Lisez le fichier WHATSNEW, etc...\n" -#: src/lang.c:782 +#: src/lang.c:785 #, c-format msgid "\n" "\n" @@ -3278,7 +3283,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:785 +#: src/lang.c:788 #, c-format msgid "Warning: tin wrote fewer groups to your\n" "\t%s\n" @@ -3291,19 +3296,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:789 +#: src/lang.c:792 #, 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:790 +#: src/lang.c:793 #, 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:791 +#: src/lang.c:794 #, c-format msgid "\n" "Warning: Your signature is longer than %d lines. Since signatures usually " @@ -3318,50 +3323,50 @@ msgstr "\n" "d'être\n" " le plus court possible.\n" -#: src/lang.c:795 +#: src/lang.c:798 #, 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:796 +#: src/lang.c:799 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:797 +#: src/lang.c:800 msgid "Writing attributes file..." msgstr "Écriture du fichier attributes..." -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "%d Responses" msgstr "%d Réponses" -#: src/lang.c:801 +#: src/lang.c:804 #, c-format msgid "Added %d %s" msgstr "%d %s ajouté(s)" -#: src/lang.c:802 +#: src/lang.c:805 msgid "No unsubscribed groups to show" msgstr "Aucuns groupes non abonnés à afficher" -#: src/lang.c:803 +#: src/lang.c:806 msgid "Showing subscribed to groups only" msgstr "Afficher uniquement les groupes abonnés" -#: src/lang.c:804 +#: src/lang.c:807 msgid "Yes " msgstr "Oui " -#: src/lang.c:805 +#: src/lang.c:808 msgid " You have mail\n" msgstr " Nouveau mail\n" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "\n" "Warning: Posting is in %s and contains characters which are not\n" @@ -3380,16 +3385,16 @@ msgstr "\n" " problème, ou bien changer la valeur de MM_NETWORK_CHARSET\n" " via le M)enu.\n" -#: src/lang.c:821 +#: src/lang.c:824 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "Clé %s redéfinie '%s' -> '%s'\n" -#: src/lang.c:822 +#: src/lang.c:825 msgid " -D debug mode 1=NNTP 2=ALL" msgstr " -D mode debug 1=NNTP 2=TOUS" -#: src/lang.c:826 +#: src/lang.c:829 msgid "Read carefully!\n" "\n" " You are about to cancel an article seemingly not written by you. This " @@ -3405,8 +3410,8 @@ msgid "Read carefully!\n" "\n" msgstr "Lisez ceci attentivement !\n" "\n" - " Vous vous apprêtez à effacer un article qui fut apparemment écrit par " - "vous. Cela\n" + " Vous vous apprêtez à effacer un article qui fut apparemment écrit par vous. " + "Cela\n" " effacera l'article sur de nombreux serveurs UseNet répartis sur el globe;\n" " La mojorité d'UseNet considère cela comme inapproprié, pour ne pas dire " "complètement.\n" @@ -3416,11 +3421,11 @@ msgstr "Lisez ceci attentivement !\n" "Voici l'article que vous vous apprêtez a effacer :\n" "\n" -#: src/lang.c:835 +#: src/lang.c:838 msgid "toggle color" msgstr "(dés)activer la couleur" -#: src/lang.c:836 +#: src/lang.c:839 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" @@ -3440,44 +3445,44 @@ msgstr "# Pour ajuster les couleurs util "# et l'arrière-plan noir)\n" "\n" -#: src/lang.c:844 +#: src/lang.c:847 msgid " -a toggle color flag" msgstr " -a change la couleur" -#: src/lang.c:848 +#: src/lang.c:851 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:849 +#: src/lang.c:852 #, 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:850 +#: src/lang.c:853 #, 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:852 +#: src/lang.c:855 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:853 +#: src/lang.c:856 #, 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:854 +#: src/lang.c:857 #, c-format msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" @@ -3486,307 +3491,307 @@ msgstr "\n" " pas apparaître dans ce groupe !\n" "\n" -#: src/lang.c:855 +#: src/lang.c:858 #, 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:859 +#: src/lang.c:862 #, 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:860 +#: src/lang.c:863 msgid "Missing parts." msgstr "Parties manquantes" -#: src/lang.c:861 +#: src/lang.c:864 msgid "No beginning." msgstr "Pas de début." -#: src/lang.c:862 +#: src/lang.c:865 msgid "No data." msgstr "Pas de données." -#: src/lang.c:863 +#: src/lang.c:866 msgid "Unknown error." msgstr "Erreur inconnue." -#: src/lang.c:865 +#: src/lang.c:868 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "\tSomme de contrôle de %s (%ld %s)" -#: src/lang.c:869 +#: src/lang.c:872 msgid "Reading mail active file... " msgstr "Lecture du fichier active mail... " -#: src/lang.c:870 +#: src/lang.c:873 msgid "Reading mailgroups file... " msgstr "Lecture du fichier mailgroups... " -#: src/lang.c:874 +#: src/lang.c:877 msgid "perform PGP operations on article" msgstr "effectuer des opérations PGP sur l'article" -#: src/lang.c:875 +#: src/lang.c:878 msgid "Add key(s) to public keyring?" msgstr "Ajouter les clé(s) au cercle public ?" -#: src/lang.c:876 +#: src/lang.c:879 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "%s=encoder, %s=signer, %s=les deux, %s=quitter : " -#: src/lang.c:877 +#: src/lang.c:880 #, 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:878 +#: src/lang.c:881 #, 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:879 +#: src/lang.c:882 msgid "Article not signed and no public keys found" msgstr "Article non signé et pas de clés publiques trouvées" -#: src/lang.c:881 +#: src/lang.c:884 #, 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:882 +#: src/lang.c:885 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:883 +#: src/lang.c:886 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=pgp, %s=menu, %s=poster, %s=brouillon " "[%%s]: " -#: src/lang.c:885 +#: src/lang.c:888 #, 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:886 +#: src/lang.c:889 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=pgp, %s=envoyer [%%s] : " -#: src/lang.c:887 +#: src/lang.c:890 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:891 +#: src/lang.c:894 #, 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:892 +#: src/lang.c:895 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=ispell, %s=envoyer [%%s] : " -#: src/lang.c:893 +#: src/lang.c:896 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:895 +#: src/lang.c:898 #, 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:896 +#: src/lang.c:899 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "%s=quitter, %s=éditer, %s=envoyer [%%s] : " -#: src/lang.c:897 +#: src/lang.c:900 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:906 +#: src/lang.c:909 msgid "Try cache_overview_files to speed up things.\n" msgstr "Activez 'cache_overview_files' pour accélérer les choses.\n" -#: src/lang.c:907 +#: src/lang.c:910 msgid "Tin will use local index files instead.\n" msgstr "Tin utilisera à la place un index local.\n" -#: src/lang.c:908 +#: src/lang.c:911 msgid "Cannot find NNTP server name" msgstr "Nom du serveur NNTP introuvable" -#: src/lang.c:909 +#: src/lang.c:912 #, c-format msgid "Connecting to %s:%d..." msgstr "Connexion à %s:%d..." -#: src/lang.c:910 +#: src/lang.c:913 msgid "Disconnecting from server...\n" msgstr "Déconnexion du serveur...\n" -#: src/lang.c:911 +#: src/lang.c:914 #, 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:912 +#: src/lang.c:915 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "Échec de la connexion au serveur NNTP %s. Fermeture..." -#: src/lang.c:913 +#: src/lang.c:916 msgid "205 Closing connection" msgstr "205 Fermeture de la connexion" -#: src/lang.c:914 +#: src/lang.c:917 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:915 +#: src/lang.c:918 msgid "Connection to news server has timed out. Reconnect?" msgstr "Connexion au serveur de nouvelles expirée. Se reconnecter ?" -#: src/lang.c:916 +#: src/lang.c:919 #, 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:917 +#: src/lang.c:920 msgid " -A force authentication on connect" msgstr " -A force l'authentication à la connexion" -#: src/lang.c:918 +#: src/lang.c:921 #, 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:919 +#: src/lang.c:922 #, 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:920 +#: src/lang.c:923 msgid " -Q quick start. Same as -nqd" msgstr " -Q démarrage rapide. Idem que -npd" -#: src/lang.c:921 +#: src/lang.c:924 msgid " -l use only LIST instead of GROUP (-n) command" msgstr " -l utilise seulement LIST plutôt que GROUP (-n)" -#: src/lang.c:922 +#: src/lang.c:925 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:924 +#: src/lang.c:927 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "%s/tcp : Service inconnu.\n" -#: src/lang.c:927 +#: src/lang.c:930 msgid "\n" "socket or connect problem\n" msgstr "\n" "problème de socket ou de connexion\n" -#: src/lang.c:929 +#: src/lang.c:932 #, c-format msgid "\n" "Connection to %s: " msgstr "\n" "Connexion à %s : " -#: src/lang.c:930 +#: src/lang.c:933 msgid "Giving up...\n" msgstr "Abandon...\n" -#: src/lang.c:933 +#: src/lang.c:936 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:936 +#: src/lang.c:939 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:939 +#: src/lang.c:942 #, 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:942 +#: src/lang.c:945 msgid " -Q quick start. Same as -qd" msgstr " -Q démarrage rapide. Idem que -qd" -#: src/lang.c:943 +#: src/lang.c:946 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:944 +#: src/lang.c:947 msgid " -n only read subscribed .newsrc groups from spool" msgstr " -n lire seulement groupes abonnés du .newsrc depuis le spool" -#: src/lang.c:945 +#: src/lang.c:948 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "Votre serveur n'a pas d'Xref: dans ses fichiers NOV.\n" -#: src/lang.c:949 +#: src/lang.c:952 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:950 +#: src/lang.c:953 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:958 +#: src/lang.c:961 #, c-format msgid "%d %s printed" msgstr "%d %s imprimé" -#: src/lang.c:959 +#: src/lang.c:962 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "envoyer article/fil/sél./articles marqués à l'imprimante" -#: src/lang.c:960 +#: src/lang.c:963 msgid "Print" msgstr "Imprimer" -#: src/lang.c:961 +#: src/lang.c:964 msgid "Printing..." msgstr "Impression..." -#: src/lang.c:965 +#: src/lang.c:968 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "passer article/fil/sél./articles marqués à une commande" -#: src/lang.c:966 +#: src/lang.c:969 msgid "No command" msgstr "Aucune commande" -#: src/lang.c:967 +#: src/lang.c:970 msgid "Pipe" msgstr "Passer (pipe)" -#: src/lang.c:968 +#: src/lang.c:971 #, c-format msgid "Pipe to command [%.*s]> " msgstr "Passer à la commande [%.*s] > " -#: src/lang.c:969 +#: src/lang.c:972 msgid "Piping..." msgstr "Passage..." -#: src/lang.c:971 +#: src/lang.c:974 msgid "Piping not enabled." msgstr "Passage non activé." -#: src/lang.c:975 +#: src/lang.c:978 #, c-format msgid "\n" "Error: The \"%s:\" line has spaces in it that MUST be removed.\n" @@ -3799,7 +3804,7 @@ msgstr "\n" " du contenu. Utilisez une virgule (,) pour séparer de multiples\n" " noms de groupes.\n" -#: src/lang.c:980 +#: src/lang.c:983 #, c-format msgid "\n" "Error: The \"%s:\" line is continued in the next line. Since\n" @@ -3810,7 +3815,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:985 +#: src/lang.c:988 #, c-format msgid "\n" "Warning: The \"%s:\" line is continued in the next line.\n" @@ -3823,7 +3828,7 @@ msgstr "\n" " Pour éviter les problèmes, indiquez tous les groupes sur une\n" " seule ligne.\n" -#: src/lang.c:989 +#: src/lang.c:992 #, c-format msgid "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" @@ -3831,7 +3836,7 @@ msgstr "\n" "Attention : La ligne \"%s:\" contient un ou des espaces qui DOIVENT\n" " être enlevés.\n" -#: src/lang.c:994 +#: src/lang.c:997 msgid "\n" " If your article contains quoted text please take some time to pare it " "down\n" @@ -3865,41 +3870,41 @@ msgstr "\n" "simples\n" " règles, pratiquement toutes les personnes ignoreront vos articles.\n" -#: src/lang.c:1007 +#: src/lang.c:1010 msgid "shell escape" msgstr "accéder à un shell" -#: src/lang.c:1008 +#: src/lang.c:1011 #, c-format msgid "Shell Command (%s)" msgstr "Commande shell (%s)" -#: src/lang.c:1009 +#: src/lang.c:1012 #, c-format msgid "Enter shell command [%s]> " msgstr "Commande shell [%s] > " -#: src/lang.c:1013 +#: src/lang.c:1016 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "%s : Entrée pour TERM introuvable\n" -#: src/lang.c:1017 +#: src/lang.c:1020 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "Groupe %.*s ('q' pour quitter)..." -#: src/lang.c:1019 +#: src/lang.c:1022 #, c-format msgid "Group %.*s..." msgstr "Groupe %.*s..." -#: src/lang.c:1023 +#: src/lang.c:1026 msgid "Server unavailable\n" msgstr "Service indisponible\n" # TRANSLATION TOO LONG -#: src/lang.c:1029 +#: src/lang.c:1032 #, c-format msgid "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " "%s=post" @@ -3907,516 +3912,516 @@ msgstr "%s=pipe; %s=mail; %s=imprimer; % "%s=marquer; %s=poster" # TRANSLATION TOO LONG -#: src/lang.c:1030 +#: src/lang.c:1033 #, 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:1032 +#: src/lang.c:1035 #, 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:1033 +#: src/lang.c:1036 #, 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:1037 +#: src/lang.c:1040 #, 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:1038 +#: src/lang.c:1041 #, 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:1040 +#: src/lang.c:1043 #, 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:1041 +#: src/lang.c:1044 #, 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:1047 +#: src/lang.c:1050 msgid "Terminal does not support color" msgstr "Le terminal ne supporte pas les couleurs" -#: src/lang.c:1052 +#: src/lang.c:1055 #, c-format msgid "Trying %s" msgstr "Essai %s" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:296 +#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 src/refs.c:296 msgid "None" msgstr "Aucun" -#: src/lang.c:1067 +#: src/lang.c:1070 msgid "Subject" msgstr "Sujet" -#: src/lang.c:1068 +#: src/lang.c:1071 msgid "References" msgstr "Références" -#: src/lang.c:1069 +#: src/lang.c:1072 msgid "Both Subject and References" msgstr "Sujet & Références" -#: src/lang.c:1070 +#: src/lang.c:1073 msgid "Multipart Subject" msgstr "Sujet multiparties" -#: src/lang.c:1082 src/lang.c:1193 +#: src/lang.c:1085 src/lang.c:1196 msgid "No" msgstr "Non" -#: src/lang.c:1083 src/lang.c:1195 +#: src/lang.c:1086 src/lang.c:1198 msgid "Yes" msgstr "Oui" -#: src/lang.c:1084 +#: src/lang.c:1087 msgid "Hide All" msgstr "Tout masquer" -#: src/lang.c:1092 +#: src/lang.c:1095 msgid "Address" msgstr "Adresse" -#: src/lang.c:1093 +#: src/lang.c:1096 msgid "Full Name" msgstr "Nom complet" -#: src/lang.c:1094 +#: src/lang.c:1097 msgid "Address and Name" msgstr "Adresse et Nom" -#: src/lang.c:1101 +#: src/lang.c:1104 msgid "Max" msgstr "Max" -#: src/lang.c:1102 +#: src/lang.c:1105 msgid "Sum" msgstr "Addition" -#: src/lang.c:1103 +#: src/lang.c:1106 msgid "Average" msgstr "Moyenne" -#: src/lang.c:1108 +#: src/lang.c:1111 msgid "Lines" msgstr "Lignes" -#: src/lang.c:1109 +#: src/lang.c:1112 msgid "Score" msgstr "Score" -#: src/lang.c:1110 +#: src/lang.c:1113 msgid "Lines & Score" msgstr "Lignes & Score" -#: src/lang.c:1119 +#: src/lang.c:1122 msgid "Black" msgstr "Noir" -#: src/lang.c:1120 +#: src/lang.c:1123 msgid "Red" msgstr "Rouge" -#: src/lang.c:1121 +#: src/lang.c:1124 msgid "Green" msgstr "Vert" -#: src/lang.c:1122 +#: src/lang.c:1125 msgid "Brown" msgstr "Marron" -#: src/lang.c:1123 +#: src/lang.c:1126 msgid "Blue" msgstr "Bleu" -#: src/lang.c:1124 +#: src/lang.c:1127 msgid "Pink" msgstr "Rose" -#: src/lang.c:1125 +#: src/lang.c:1128 msgid "Cyan" msgstr "Cyan" -#: src/lang.c:1126 +#: src/lang.c:1129 msgid "White" msgstr "Blanc" -#: src/lang.c:1127 +#: src/lang.c:1130 msgid "Gray" msgstr "Gris" -#: src/lang.c:1128 +#: src/lang.c:1131 msgid "Light Red" msgstr "Rouge gras" -#: src/lang.c:1129 +#: src/lang.c:1132 msgid "Light Green" msgstr "Vert gras" -#: src/lang.c:1130 +#: src/lang.c:1133 msgid "Yellow" msgstr "Jaune" -#: src/lang.c:1131 +#: src/lang.c:1134 msgid "Light Blue" msgstr "Bleu gras" -#: src/lang.c:1132 +#: src/lang.c:1135 msgid "Light Pink" msgstr "Rose gras" -#: src/lang.c:1133 +#: src/lang.c:1136 msgid "Light Cyan" msgstr "Cyan gras" -#: src/lang.c:1134 +#: src/lang.c:1137 msgid "Light White" msgstr "Blanc gras" -#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 +#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 msgid "Nothing" msgstr "Rien" -#: src/lang.c:1143 +#: src/lang.c:1146 msgid "Mark" msgstr "Marque" -#: src/lang.c:1144 +#: src/lang.c:1147 msgid "Space" msgstr "Espace" -#: src/lang.c:1151 +#: src/lang.c:1154 msgid "Normal" msgstr "Normal" -#: src/lang.c:1152 +#: src/lang.c:1155 msgid "Best highlighting" msgstr "Meilleure surbrillance" -#: src/lang.c:1153 +#: src/lang.c:1156 msgid "Underline" msgstr "Souligné" -#: src/lang.c:1154 +#: src/lang.c:1157 msgid "Reverse video" msgstr "Vidéo inversée" -#: src/lang.c:1155 +#: src/lang.c:1158 msgid "Blinking" msgstr "Clignotement" -#: src/lang.c:1156 +#: src/lang.c:1159 msgid "Half bright" msgstr "Moins lumineux" -#: src/lang.c:1157 +#: src/lang.c:1160 msgid "Bold" msgstr "Gras" -#: src/lang.c:1162 +#: src/lang.c:1165 msgid "none" msgstr "aucun" -#: src/lang.c:1163 +#: src/lang.c:1166 msgid "commands" msgstr "commandes" -#: src/lang.c:1164 +#: src/lang.c:1167 msgid "select" msgstr "sélection" -#: src/lang.c:1166 +#: src/lang.c:1169 msgid "commands & quit" msgstr "commandes & quitter" -#: src/lang.c:1167 +#: src/lang.c:1170 msgid "commands & select" msgstr "commandes & sélection" -#: src/lang.c:1168 +#: src/lang.c:1171 msgid "quit & select" msgstr "quitter & sélection" -#: src/lang.c:1169 +#: src/lang.c:1172 msgid "commands & quit & select" msgstr "commandes, quitter & sélection" -#: src/lang.c:1194 +#: src/lang.c:1197 msgid "Shell archive" msgstr "Archive shell" -#: src/lang.c:1200 +#: src/lang.c:1203 msgid "Subject: (descending)" msgstr "Subject : (descendant)" -#: src/lang.c:1201 +#: src/lang.c:1204 msgid "Subject: (ascending)" msgstr "Subject : (ascendant)" -#: src/lang.c:1202 +#: src/lang.c:1205 msgid "From: (descending)" msgstr "From: (descendant)" -#: src/lang.c:1203 +#: src/lang.c:1206 msgid "From: (ascending)" msgstr "From: (ascendant)" -#: src/lang.c:1204 +#: src/lang.c:1207 msgid "Date: (descending)" msgstr "Date: (descendant)" -#: src/lang.c:1205 +#: src/lang.c:1208 msgid "Date: (ascending)" msgstr "Date: (ascendant)" -#: src/lang.c:1206 src/lang.c:1214 +#: src/lang.c:1209 src/lang.c:1217 msgid "Score (descending)" msgstr "Score (descendant)" -#: src/lang.c:1207 src/lang.c:1215 +#: src/lang.c:1210 src/lang.c:1218 msgid "Score (ascending)" msgstr "Score (ascendant)" -#: src/lang.c:1208 +#: src/lang.c:1211 msgid "Lines: (descending)" msgstr "Lines: (descendant)" -#: src/lang.c:1209 +#: src/lang.c:1212 msgid "Lines: (ascending)" msgstr "Lines: (ascendant)" -#: src/lang.c:1220 +#: src/lang.c:1223 msgid "Always Keep" msgstr "Toujours garder" -#: src/lang.c:1221 +#: src/lang.c:1224 msgid "Always Remove" msgstr "Toujours effacer" -#: src/lang.c:1222 +#: src/lang.c:1225 msgid "Mark with D on selection screen" msgstr "Marquer avec un D dans la vue sélection" -#: src/lang.c:1227 +#: src/lang.c:1230 msgid "Kill only unread arts" msgstr "Filtrer uniquement les articles non lus" -#: src/lang.c:1228 +#: src/lang.c:1231 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:1229 +#: src/lang.c:1232 msgid "Kill all arts and never show" msgstr "Filtrer tous les articles et ne jamais afficher" -#: src/lang.c:1234 +#: src/lang.c:1237 msgid "Nothing special" msgstr "Rien de spécial" -#: src/lang.c:1235 +#: src/lang.c:1238 msgid "Compress quotes" msgstr "Citations compressées" -#: src/lang.c:1236 +#: src/lang.c:1239 msgid "Quote signatures" msgstr "Citer les signatures" -#: src/lang.c:1237 +#: src/lang.c:1240 msgid "Compress quotes, quote sigs" msgstr "Compresser les citations, citer les signatures" -#: src/lang.c:1238 +#: src/lang.c:1241 msgid "Quote empty lines" msgstr "Citer les lignes vides" -#: src/lang.c:1239 +#: src/lang.c:1242 msgid "Compress quotes, quote empty lines" msgstr "Compresser les citations, citer les lignes vides" -#: src/lang.c:1240 +#: src/lang.c:1243 msgid "Quote sigs & empty lines" msgstr "Citer les signatures & les lignes vides" -#: src/lang.c:1241 +#: src/lang.c:1244 msgid "Comp. q., quote sigs & empty lines" msgstr "Compr. les citations, citer les signatures & les lignes vides" -#: src/lang.c:1279 +#: src/lang.c:1282 msgid "no" msgstr "non" -#: src/lang.c:1280 +#: src/lang.c:1283 msgid "with headers" msgstr "avec les en-têtes" -#: src/lang.c:1281 +#: src/lang.c:1284 msgid "without headers" msgstr "sans les en-têtes" -#: src/lang.c:1288 src/lang.c:1294 +#: src/lang.c:1291 src/lang.c:1297 msgid "NFKC" msgstr "NFKC" -#: src/lang.c:1289 +#: src/lang.c:1292 msgid "NFKD" msgstr "NFKD" -#: src/lang.c:1290 +#: src/lang.c:1293 msgid "NFC" msgstr "NFC" -#: src/lang.c:1291 +#: src/lang.c:1294 msgid "NFD" msgstr "NFD" -#: src/lang.c:1302 +#: src/lang.c:1305 msgid "Display Options" msgstr "Options d'affichage" -#: src/lang.c:1308 +#: src/lang.c:1311 msgid "Color Options" msgstr "Options des couleurs" -#: src/lang.c:1314 +#: src/lang.c:1317 msgid "Article-Limiting Options" msgstr "Options des articles" -#: src/lang.c:1320 +#: src/lang.c:1323 msgid "Posting/Mailing Options" msgstr "Options de postage/messagerie" -#: src/lang.c:1326 +#: src/lang.c:1329 msgid "Saving/Printing Options" msgstr "Options d'enregistrement/d'impression" -#: src/lang.c:1332 +#: src/lang.c:1335 msgid "Expert Options" msgstr "Options avancées" -#: src/lang.c:1338 +#: src/lang.c:1341 msgid "Filtering Options" msgstr "Options de filtrage" -#: 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 src/lang.c:2350 +#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 src/lang.c:1417 +#: src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 src/lang.c:1526 src/lang.c:1688 +#: src/lang.c:1694 src/lang.c:1700 src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 +#: src/lang.c:1776 src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 +#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 src/lang.c:1833 +#: src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 src/lang.c:1857 src/lang.c:1863 +#: src/lang.c:1869 src/lang.c:1875 src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 +#: src/lang.c:1899 src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 +#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 src/lang.c:1960 +#: src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 src/lang.c:1998 src/lang.c:2032 +#: src/lang.c:2084 src/lang.c:2091 src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 +#: src/lang.c:2192 src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 +#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 msgid " toggles, sets, cancels." msgstr " change, valide, annule." -#: src/lang.c:1344 +#: src/lang.c:1347 msgid "Show mini menu & posting etiquette" msgstr "Afficher menu & intitulé du postage" -#: src/lang.c:1345 +#: src/lang.c:1348 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:1350 +#: src/lang.c:1353 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Afficher une brève description pour chaque groupe. change & " "valide." -#: src/lang.c:1351 +#: src/lang.c:1354 msgid "Show description of each newsgroup" msgstr "Voir description de chaque groupe" -#: src/lang.c:1352 +#: src/lang.c:1355 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:1357 +#: src/lang.c:1360 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Affiche le sujet & l'auteur dans le menu groupe. change & " "valide." -#: src/lang.c:1358 +#: src/lang.c:1361 msgid "In group menu, show author by" msgstr "Dans vue groupe, voir auteur par" -#: src/lang.c:1359 +#: src/lang.c:1362 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:1363 +#: src/lang.c:1366 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Affiche -> ou une barre de sélection. change & valide." -#: src/lang.c:1364 +#: src/lang.c:1367 msgid "Draw -> instead of highlighted bar" msgstr "Afficher -> plutôt qu'une barre" -#: src/lang.c:1365 +#: src/lang.c:1368 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:1370 +#: src/lang.c:1373 msgid "Use inverse video for page headers" msgstr "Vidéo inversée pour les en-têtes" -#: src/lang.c:1371 +#: src/lang.c:1374 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:1376 +#: src/lang.c:1379 msgid "Thread articles by" msgstr "Regrouper les articles par" -#: src/lang.c:1377 +#: src/lang.c:1380 msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" msgstr "# Regrouper les articles par 0=(rien) 1=(Sujet) 2=(Références) 3=(Les deux)\n" "# 4=(Sujet multi-parties).\n" -#: src/lang.c:1383 +#: src/lang.c:1386 msgid "Score of a thread" msgstr "Score d'un fil" -#: src/lang.c:1384 +#: src/lang.c:1387 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "# Score d'un fil 0=(Max) 1=(Addition) 2=(Moyenne)\n" -#: src/lang.c:1388 +#: src/lang.c:1391 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Trie les articles d'après un en-tête. change & valide." -#: src/lang.c:1389 +#: src/lang.c:1392 msgid "Sort articles by" msgstr "Trier les articles par" -#: src/lang.c:1390 +#: src/lang.c:1393 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" @@ -4425,56 +4430,56 @@ msgstr "# Trie les article par 0=(rien) "# 7=(Score descendant) 8=(Score ascendant) 9=(Lignes descendant) 10=(Lignes " "ascendant)\n" -#: src/lang.c:1396 +#: src/lang.c:1399 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Trier les fils par Rien ou Score. change & valide." -#: src/lang.c:1397 +#: src/lang.c:1400 msgid "Sort threads by" msgstr "Trier les fils par" -#: src/lang.c:1398 +#: src/lang.c:1401 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:1402 +#: src/lang.c:1405 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "Place le curseur sur le 1er article non lu. change & valide." -#: src/lang.c:1403 +#: src/lang.c:1406 msgid "Goto first unread article in group" msgstr "Aller au 1er art. non lu du groupe" -#: src/lang.c:1404 +#: src/lang.c:1407 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:1408 +#: src/lang.c:1411 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Affiche tous les articles ou seulement ceux non lus. change & " " valide." -#: src/lang.c:1409 +#: src/lang.c:1412 msgid "Show only unread articles" msgstr "Afficher articles non lus seulement" -#: src/lang.c:1410 +#: src/lang.c:1413 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:1415 +#: src/lang.c:1418 msgid "Show only groups with unread arts" msgstr "Voir groupes avec articles non lus" -#: src/lang.c:1416 +#: src/lang.c:1419 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:1421 +#: src/lang.c:1424 msgid "Filter which articles" msgstr "Filtrer quel article" -#: src/lang.c:1422 +#: src/lang.c:1425 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" @@ -4482,216 +4487,216 @@ msgstr "# 0=(Filtrer uniquement les arti "# 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:1429 +#: src/lang.c:1432 msgid "Tab goes to next unread article" msgstr "Tab va au prochain article non lu" -#: src/lang.c:1430 +#: src/lang.c:1433 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "# Si ON la touche TAB ira au prochain article non lu directement depuis le " "visualiseur d'article\n" -#: src/lang.c:1434 +#: src/lang.c:1437 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "Naviguer avec ira au prochain non lu." -#: src/lang.c:1435 +#: src/lang.c:1438 msgid "Space goes to next unread article" msgstr "Espace va au prochain art. non lu" -#: src/lang.c:1436 +#: src/lang.c:1439 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 (pager style rn)\n" -#: src/lang.c:1441 +#: src/lang.c:1444 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "Naviguer avec / ira au prochain non lu." -#: src/lang.c:1442 +#: src/lang.c:1445 msgid "PgDn goes to next unread article" msgstr "PgDn va au prochain article non lu" -#: src/lang.c:1443 +#: src/lang.c:1446 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 les touches PGDN ou BAS iront au prochain article non lu\n" "# lorsque la fin d'un article sera atteinte\n" -#: src/lang.c:1449 +#: src/lang.c:1452 msgid "List thread using right arrow key" msgstr "Lister le fil via la flèche droite" -#: src/lang.c:1450 +#: src/lang.c:1453 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:1454 +#: src/lang.c:1457 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Caractère indiquant les articles effacés. valide, annule." -#: src/lang.c:1455 +#: src/lang.c:1458 msgid "Character to show deleted articles" msgstr "Caractère pour articles effacés" -#: src/lang.c:1456 +#: src/lang.c:1459 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:1461 +#: src/lang.c:1464 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "Caractère indiquant les articles inclus. valide, annule." -#: src/lang.c:1462 +#: src/lang.c:1465 msgid "Character to show inrange articles" msgstr "Caractère pour art. non inclus" -#: src/lang.c:1463 +#: src/lang.c:1466 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:1468 +#: src/lang.c:1471 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Caractère indiquant que l'article sera retourné. valide, " "annule." -#: src/lang.c:1469 +#: src/lang.c:1472 msgid "Character to show returning arts" msgstr "Caractère pour articles retournés" -#: src/lang.c:1470 +#: src/lang.c:1473 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article sera retourné (défaut '#')\n" "# _ est transformé en ' '\n" -#: src/lang.c:1475 +#: src/lang.c:1478 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Caractère indiquant les articles sélectionnés. valide, annule." -#: src/lang.c:1476 +#: src/lang.c:1479 msgid "Character to show selected articles" msgstr "Caractère pour articles sélect." -#: src/lang.c:1477 +#: src/lang.c:1480 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article fut sélectionné (defaut '*')\n" "# _est transformé en ' '\n" -#: src/lang.c:1482 +#: src/lang.c:1485 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Caractère indiquant les articles récents. valide, annule." -#: src/lang.c:1483 +#: src/lang.c:1486 msgid "Character to show recent articles" msgstr "Caractère pour articles récents" -#: src/lang.c:1484 +#: src/lang.c:1487 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article est récent (defaut 'o')\n" "# _est transformé en ' '\n" -#: src/lang.c:1489 +#: src/lang.c:1492 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Caractère indiquant les articles non lus. valide, annule." -#: src/lang.c:1490 +#: src/lang.c:1493 msgid "Character to show unread articles" msgstr "Caractère pour articles non lus" -#: src/lang.c:1491 +#: src/lang.c:1494 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article est non lu (defaut '+')\n" "# _est transformé en ' '\n" -#: src/lang.c:1496 +#: src/lang.c:1499 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Caractère indiquant les articles lus. valide, annule." -#: src/lang.c:1497 +#: src/lang.c:1500 msgid "Character to show read articles" msgstr "Caractère pour articles lus" -#: src/lang.c:1498 +#: src/lang.c:1501 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article a été lu (defaut ' ')\n" "# _est transformé en ' '\n" -#: src/lang.c:1503 +#: src/lang.c:1506 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Caractère indiquant les articles filtrés. valide, annule." -#: src/lang.c:1504 +#: src/lang.c:1507 msgid "Character to show killed articles" msgstr "Caractère pour articles filtrés" -#: src/lang.c:1505 +#: src/lang.c:1508 msgid "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "# Caractère utilisé pour indiquer qu'un article a été filtré (defaut 'K')\n" "# kill_level doit être choisi en conséquence, _ est transformé en ' '\n" -#: src/lang.c:1510 +#: src/lang.c:1513 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Caractère indiquant les articles lus et sélectionnés. valide, " "annule." -#: src/lang.c:1511 +#: src/lang.c:1514 msgid "Character to show readselected arts" msgstr "Caractère pour articles lus & sél." -#: src/lang.c:1512 +#: src/lang.c:1515 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 "# Caractère utilisé pour indiquer qu'un article était sélectionné avec d'être " "lu (defaut ':')\n" "# kill_level doit être choisi en conséquence, _ est transformé en ' '\n" -#: src/lang.c:1517 +#: src/lang.c:1520 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Largeur max. à afficher des noms des groupes. valide." -#: src/lang.c:1518 +#: src/lang.c:1521 msgid "Max. length of group names shown" msgstr "Largeur max. des noms des groupes" -#: src/lang.c:1519 +#: src/lang.c:1522 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Largeur maximum à afficher des noms des groupes.\n" -#: src/lang.c:1524 +#: src/lang.c:1527 msgid "Show lines/score in listings" msgstr "Afficher dans les différentes vues" -#: src/lang.c:1525 +#: src/lang.c:1528 msgid "# What informations should be displayed in article/thread listing\n" "# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n" msgstr "# Quelles informations doivent être affichées dans les vues article/fil\n" "# 0 = rien, 1 = lignes, 2 = score, 3 = lignes & score\n" -#: src/lang.c:1530 +#: src/lang.c:1533 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "0 = défilement page par page, -1 = afficher dernière ligne dans page " "suivante, -2 = demi-page" -#: src/lang.c:1531 +#: src/lang.c:1534 msgid "Number of lines to scroll in pager" msgstr "Vitesse de défilement dans le pager" -#: src/lang.c:1532 +#: src/lang.c:1535 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" @@ -4701,29 +4706,29 @@ msgstr "# Nombre de lignes passées lors "# -1 = la dernière ligne sera affichée en haut de la page suivante,\n" "# -2 = défilement par demi-page\n" -#: src/lang.c:1539 +#: src/lang.c:1542 msgid "Display signatures. toggles & sets." msgstr "Affiche les signatures. change & valide." -#: src/lang.c:1540 +#: src/lang.c:1543 msgid "Display signatures" msgstr "Afficher les signatures" -#: src/lang.c:1541 +#: src/lang.c:1544 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Si OFF ne pas afficher les signatures lors de la visualisation\n" "# des articles.\n" -#: src/lang.c:1545 +#: src/lang.c:1548 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Afficher les archives uue comme PJ marquées. change & " "valide." -#: src/lang.c:1546 +#: src/lang.c:1549 msgid "Display uue data as an attachment" msgstr "Afficher donnée uue comme PJ" -#: src/lang.c:1547 +#: src/lang.c:1550 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" @@ -4740,30 +4745,30 @@ msgstr "# Prise en charge des données uu "uuencodée\n" "# sera placée dans une ligne marquée.\n" -#: src/lang.c:1556 +#: src/lang.c:1559 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "Décode les umlauts Allemands de type TeX en ISO. change & " "valide." -#: src/lang.c:1557 +#: src/lang.c:1560 msgid "Display \"a as Umlaut-a" msgstr "Afficher \"a comme Umlaut-a" -#: src/lang.c:1558 +#: src/lang.c:1561 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "# Si ON, convertit les umlauts Allemands de type TeX en codes ISO\n" "# et affiche \"a comme Umlaut-a, etc.\n" -#: src/lang.c:1563 src/lang.c:1573 +#: src/lang.c:1566 src/lang.c:1576 msgid "Space separated list of header fields" msgstr "Liste des en-têtes, séparés par des espaces" -#: src/lang.c:1564 +#: src/lang.c:1567 msgid "Display these header fields (or *)" msgstr "Afficher ces en-têtes (ou *)" -#: src/lang.c:1565 +#: src/lang.c:1568 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" @@ -4779,11 +4784,11 @@ msgstr "# Quels en-têtes voulez-vous voi "# en les délimitant avec des espaces. Ne rien définir, désactive cette " "option.\n" -#: src/lang.c:1574 +#: src/lang.c:1577 msgid "Do not display these header fields" msgstr "Ne pas afficher ces en-têtes" -#: src/lang.c:1575 +#: src/lang.c:1578 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 " @@ -4803,29 +4808,29 @@ msgstr "# Comme l'option 'news_headers_t "# news_headers_to_not_display=X-Alan X-Pape\n" "# Ne rien définir, désactive cette option.\n" -#: src/lang.c:1585 +#: src/lang.c:1588 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "Voulez-vous activer la prise en charge automatique des articles " "multipart/alternative ?" -#: src/lang.c:1586 +#: src/lang.c:1589 msgid "Skip multipart/alternative parts" msgstr "Ignorer parties multipart/alter." -#: src/lang.c:1587 +#: src/lang.c:1590 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Si ON, enlève automatiquement les messages multipart/alternative\n" -#: src/lang.c:1592 +#: src/lang.c:1595 msgid "A regex used to decide which lines to show in col_quote." msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote." -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Regex used to show quoted lines" msgstr "Regex pour afficher les citations" -#: src/lang.c:1594 +#: src/lang.c:1597 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" @@ -4833,16 +4838,16 @@ msgstr "# Une expression régulière qui p "# Les citations sont affichées dans col_quote. Si vous laissez ce champ\n" "# vide, tin utilisera une valeur incluse par défaut.\n" -#: src/lang.c:1600 +#: src/lang.c:1603 msgid "A regex used to decide which lines to show in col_quote2." msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote2." -#: src/lang.c:1601 +#: src/lang.c:1604 msgid "Regex used to show twice quoted l." msgstr "Regex pour afficher le 2nd niveau" -#: src/lang.c:1602 +#: src/lang.c:1605 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" @@ -4850,16 +4855,16 @@ msgstr "# Une expression régulière qui p "# second niveau. Ces citations sont affichées dans col_quote2. Si vous\n" "# laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" -#: src/lang.c:1608 +#: src/lang.c:1611 msgid "A regex used to decide which lines to show in col_quote3." msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " "col_quote3." -#: src/lang.c:1609 +#: src/lang.c:1612 msgid "Regex used to show >= 3 times q.l." msgstr "Regex pour afficher niveau >= 3" -#: src/lang.c:1610 +#: src/lang.c:1613 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" @@ -4869,16 +4874,16 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1617 +#: src/lang.c:1620 msgid "A regex used to decide which words to show in col_markslashes." msgstr "Une expression régulière pour déterminer quels mots afficher dans " "col_markslashes." -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Regex used to highlight /slashes/" msgstr "Regex pour mots entre /slash/" -#: src/lang.c:1619 +#: src/lang.c:1622 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" @@ -4887,16 +4892,16 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1625 +#: src/lang.c:1628 msgid "A regex used to decide which words to show in col_markstars." msgstr "Une expression régulière pour déterminer quels mots afficher dans " "col_markstars." -#: src/lang.c:1626 +#: src/lang.c:1629 msgid "Regex used to highlight *stars*" msgstr "Regex pour mots entre *astérisques*" -#: src/lang.c:1627 +#: src/lang.c:1630 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" @@ -4905,16 +4910,16 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1633 +#: src/lang.c:1636 msgid "A regex used to decide which words to show in col_markstroke." msgstr "Une expression régulière pour déterminer quels mots afficher dans " "col_markstroke." -#: src/lang.c:1634 +#: src/lang.c:1637 msgid "Regex used to highlight -strokes-" msgstr "Regex pour mots entre -tirets-" -#: src/lang.c:1635 +#: src/lang.c:1638 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" @@ -4923,16 +4928,16 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1641 +#: src/lang.c:1644 msgid "A regex used to decide which words to show in col_markdash." msgstr "Une expression régulière pour déterminer quels mots afficher dans " "col_markdash." -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Regex used to highlight _underline_" msgstr "Regex pour mots entre _underscore_" -#: src/lang.c:1643 +#: src/lang.c:1646 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" @@ -4941,47 +4946,47 @@ msgstr "# Une expression régulière qui p "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " "défaut.\n" -#: src/lang.c:1649 +#: src/lang.c:1652 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "Une expression régulière pour trouver les préfixes dans le sujet. '|' est un " "séparateur." -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "Regex with Subject prefixes" msgstr "Regex pour les préfixes dans sujet" -#: src/lang.c:1651 +#: src/lang.c:1654 msgid "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "# Une expression régulière qui permettra à tin de trouver les préfixes\n" "# dans le sujet et qui seront effacés avant d'afficher l'en-tête.\n" -#: src/lang.c:1656 +#: src/lang.c:1659 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "Une expression régulière pour trouver les suffixes dans le sujet. '|' est un " "séparateur." -#: src/lang.c:1657 +#: src/lang.c:1660 msgid "Regex with Subject suffixes" msgstr "Regex pour les suffixes dans sujet" -#: src/lang.c:1658 +#: src/lang.c:1661 msgid "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "# Une expression régulière qui permettra à tin de trouver les suffixes\n" "# dans le sujet et qui seront effacés avant d'afficher l'en-tête.\n" -#: src/lang.c:1663 +#: src/lang.c:1666 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "Nom et options pour le visualisateur MIME externe, --internal pour celui " "inclus" -#: src/lang.c:1664 +#: src/lang.c:1667 msgid "MIME binary content viewer" msgstr "Visualisateur de contenu MIME" -#: src/lang.c:1665 +#: src/lang.c:1668 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" @@ -4991,367 +4996,367 @@ msgstr "# Utilisation du visualisateur M "# Sinon, spécifiez un logiciel externe (pe. metamail) ou laissez ce champ\n" "# vide pour ne pas activer la prévisualisation automatique.\n" -#: src/lang.c:1672 +#: src/lang.c:1675 msgid "Confirm before starting non-text viewing program" msgstr "Confirmation avant le lancement d'un visualisateur externe" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Ask before using MIME viewer" msgstr "Demander avant d'utiliser le visua." -#: src/lang.c:1674 +#: src/lang.c:1677 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:1679 +#: src/lang.c:1682 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1680 +#: src/lang.c:1683 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:1681 +#: src/lang.c:1684 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:1687 +#: src/lang.c:1690 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1692 +#: src/lang.c:1695 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:1698 +#: src/lang.c:1701 msgid "Which actions require confirmation" msgstr "" -#: src/lang.c:1699 +#: src/lang.c:1702 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1704 +#: src/lang.c:1707 msgid "'Mark article read' ignores tags" msgstr "" -#: src/lang.c:1705 +#: src/lang.c:1708 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "Program to run to open URL's, sets, cancels." msgstr "Logiciel utilisé pour lancer les URLs, valide, annule." -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Program that opens URL's" msgstr "Logiciel lançant les URLs" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1716 +#: src/lang.c:1719 msgid "Use mouse in xterm" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1720 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1723 +#: src/lang.c:1726 msgid "Use scroll keys on keypad" msgstr "" -#: src/lang.c:1724 +#: src/lang.c:1727 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1730 +#: src/lang.c:1733 msgid "Number of articles to get" msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1734 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:1736 +#: src/lang.c:1739 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1740 msgid "Article recentness time limit" msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1741 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1742 +#: src/lang.c:1745 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1743 +#: src/lang.c:1746 msgid "Wildcard matching" msgstr "" -#: src/lang.c:1744 +#: src/lang.c:1747 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1748 +#: src/lang.c:1751 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1749 +#: src/lang.c:1752 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1753 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1754 +#: src/lang.c:1757 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1755 +#: src/lang.c:1758 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1759 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1760 +#: src/lang.c:1763 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1761 +#: src/lang.c:1764 msgid "Score limit (select)" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1765 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1766 +#: src/lang.c:1769 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1767 +#: src/lang.c:1770 msgid "Default score to select articles" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1774 +#: src/lang.c:1777 msgid "Use slrnface to show ''X-Face:''s" msgstr "" -#: src/lang.c:1775 +#: src/lang.c:1778 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:1783 +#: src/lang.c:1786 msgid "Use ANSI color" msgstr "" -#: src/lang.c:1784 +#: src/lang.c:1787 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:1789 +#: src/lang.c:1792 msgid "Standard foreground color" msgstr "" -#: src/lang.c:1790 +#: src/lang.c:1793 msgid "# Standard foreground color\n" msgstr "" -#: src/lang.c:1795 +#: src/lang.c:1798 msgid "Standard background color" msgstr "" -#: src/lang.c:1796 +#: src/lang.c:1799 msgid "# Standard-Background-Color\n" msgstr "" -#: src/lang.c:1801 +#: src/lang.c:1804 msgid "Color for inverse text (background)" msgstr "" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "# Color of background for inverse text\n" msgstr "" -#: src/lang.c:1807 +#: src/lang.c:1810 msgid "Color for inverse text (foreground)" msgstr "" -#: src/lang.c:1808 +#: src/lang.c:1811 msgid "# Color of foreground for inverse text\n" msgstr "" -#: src/lang.c:1813 +#: src/lang.c:1816 msgid "Color of text lines" msgstr "" -#: src/lang.c:1814 +#: src/lang.c:1817 msgid "# Color of text-lines\n" msgstr "" -#: src/lang.c:1819 +#: src/lang.c:1822 msgid "Color of mini help menu" msgstr "" -#: src/lang.c:1820 +#: src/lang.c:1823 msgid "# Color of mini help menu\n" msgstr "" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "Color of help text" msgstr "" -#: src/lang.c:1826 +#: src/lang.c:1829 msgid "# Color of help pages\n" msgstr "" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Color of status messages" msgstr "" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "# Color of messages in last line\n" msgstr "" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Color of quoted lines" msgstr "" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "# Color of quote-lines\n" msgstr "" -#: src/lang.c:1843 +#: src/lang.c:1846 msgid "Color of twice quoted line" msgstr "" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "# Color of twice quoted lines\n" msgstr "" -#: src/lang.c:1849 +#: src/lang.c:1852 msgid "Color of =>3 times quoted line" msgstr "" -#: src/lang.c:1850 +#: src/lang.c:1853 msgid "# Color of >=3 times quoted lines\n" msgstr "" -#: src/lang.c:1855 +#: src/lang.c:1858 msgid "Color of article header lines" msgstr "" -#: src/lang.c:1856 +#: src/lang.c:1859 msgid "# Color of header-lines\n" msgstr "" -#: src/lang.c:1861 +#: src/lang.c:1864 msgid "Color of actual news header fields" msgstr "" -#: src/lang.c:1862 +#: src/lang.c:1865 msgid "# Color of actual news header fields\n" msgstr "" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "Color of article subject lines" msgstr "" -#: src/lang.c:1868 +#: src/lang.c:1871 msgid "# Color of article subject\n" msgstr "" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "Color of response counter" msgstr "" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "# Color of response counter\n" msgstr "" -#: src/lang.c:1879 +#: src/lang.c:1882 msgid "Color of sender (From:)" msgstr "" -#: src/lang.c:1880 +#: src/lang.c:1883 msgid "# Color of sender (From:)\n" msgstr "" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Color of help/mail sign" msgstr "" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "# Color of Help/Mail-Sign\n" msgstr "" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "Color of signatures" msgstr "" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "# Color of signature\n" msgstr "" -#: src/lang.c:1897 +#: src/lang.c:1900 msgid "Color of highlighted URLs" msgstr "" -#: src/lang.c:1898 +#: src/lang.c:1901 msgid "# Color of highlighted URLs\n" msgstr "" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "Color of highlighting with *stars*" msgstr "" -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "# Color of word highlighting. There are four possibilities\n" "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" msgstr "" -#: src/lang.c:1910 +#: src/lang.c:1913 msgid "Color of highlighting with _dash_" msgstr "" -#: src/lang.c:1916 +#: src/lang.c:1919 msgid "Color of highlighting with /slash/" msgstr "" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "Color of highlighting with -stroke-" msgstr "" -#: src/lang.c:1929 +#: src/lang.c:1932 msgid "Attr. of highlighting with *stars*" msgstr "" -#: src/lang.c:1930 +#: src/lang.c:1933 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5360,93 +5365,93 @@ msgid "# Attribute of word highlighting "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Attr. of highlighting with /slash/" msgstr "" -#: src/lang.c:1952 +#: src/lang.c:1955 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:1958 +#: src/lang.c:1961 msgid "URL highlighting in message body" msgstr "" -#: src/lang.c:1959 +#: src/lang.c:1962 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:1964 +#: src/lang.c:1967 msgid "Word highlighting in message body" msgstr "" -#: src/lang.c:1965 +#: src/lang.c:1968 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:1971 +#: src/lang.c:1974 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:1977 +#: src/lang.c:1980 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "Largeur du pager. valide." -#: src/lang.c:1978 +#: src/lang.c:1981 msgid "Page line wrap column" msgstr "Largeur du pager" -#: src/lang.c:1979 +#: src/lang.c:1982 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1989 +#: src/lang.c:1992 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1990 +#: src/lang.c:1993 msgid "Mail address (and fullname)" msgstr "" -#: src/lang.c:1991 +#: src/lang.c:1994 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:1996 +#: src/lang.c:1999 msgid "Show empty Followup-To in editor" msgstr "" -#: src/lang.c:1997 +#: src/lang.c:2000 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "Create signature from path/command" msgstr "" -#: src/lang.c:2003 +#: src/lang.c:2006 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 " @@ -5454,48 +5459,48 @@ msgid "# Signature path (random sigs)/fi "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2011 +#: src/lang.c:2014 msgid "Prepend signature with \"-- \"" msgstr "" -#: src/lang.c:2012 +#: src/lang.c:2015 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Add signature when reposting" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2022 +#: src/lang.c:2025 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "Characters used as quote-marks" msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2027 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:2030 +#: src/lang.c:2033 msgid "Quoting behavior" msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5507,49 +5512,49 @@ msgid "# How quoting should be handled w "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 +#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "Quote line when following up" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2048 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:2052 +#: src/lang.c:2055 msgid "Quote line when cross-posting" msgstr "" -#: src/lang.c:2058 +#: src/lang.c:2061 msgid "Quote line when mailing" msgstr "" -#: src/lang.c:2063 +#: src/lang.c:2066 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2064 +#: src/lang.c:2067 msgid "Insert 'User-Agent:'-header" msgstr "Insérer l'en-tête 'User-Agent'" -#: src/lang.c:2065 +#: src/lang.c:2068 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Si ON inclus l'en-tête 'User-Agent:'\n" -#: src/lang.c:2069 +#: src/lang.c:2073 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2070 +#: src/lang.c:2074 msgid "MM_CHARSET" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2075 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" @@ -5558,27 +5563,27 @@ msgid "# Charset supported locally which "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2082 +#: src/lang.c:2085 msgid "MM_NETWORK_CHARSET" msgstr "" -#: src/lang.c:2083 +#: src/lang.c:2086 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2089 +#: src/lang.c:2092 msgid "Mailbox format" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2095 +#: src/lang.c:2098 msgid "MIME encoding in news messages" msgstr "" -#: src/lang.c:2096 +#: src/lang.c:2099 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" @@ -5586,43 +5591,43 @@ msgid "# MIME encoding (8bit, base64, qu "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2104 src/lang.c:2125 +#: src/lang.c:2107 src/lang.c:2128 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "Use 8bit characters in news headers" msgstr "" -#: src/lang.c:2106 +#: src/lang.c:2109 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:2113 +#: src/lang.c:2116 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Visualiser automatiquement les fichiers traités. change, " "valide, annule." -#: src/lang.c:2114 +#: src/lang.c:2117 msgid "View post-processed files" msgstr "Voir les fichiers traités" -#: src/lang.c:2115 +#: src/lang.c:2118 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# Si actif, les fichiers traités seront ouverts\n" -#: src/lang.c:2120 +#: src/lang.c:2123 msgid "MIME encoding in mail messages" msgstr "Encodage MIME pour les mails" -#: src/lang.c:2126 +#: src/lang.c:2129 msgid "Use 8bit characters in mail headers" msgstr "Caractères 8bits dans en-têtes mail" -#: src/lang.c:2127 +#: src/lang.c:2130 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 " @@ -5632,26 +5637,26 @@ msgid "# If ON, 8bit characters in mail "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2137 +#: src/lang.c:2140 msgid "Strip blanks from ends of lines" msgstr "Nettoyer les fins de lignes" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" -msgstr "# Si ON, enlève les blancs présents aux fins de lignes pour un affichage \n# plus " - "rapide sur les terminaux lents.\n" +msgstr "# Si ON, enlève les blancs présents aux fins de lignes pour un affichage \n" + "# plus rapide sur les terminaux lents.\n" -#: src/lang.c:2143 +#: src/lang.c:2146 msgid "If ON, use transliteration. toggles & sets." msgstr "Si ON, utilise 'translit' pour iconv_open(3). change & " "valide." -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Transliteration" msgstr "Transliteration (conversion)" -#: src/lang.c:2145 +#: src/lang.c:2148 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" @@ -5659,373 +5664,373 @@ msgstr "# Si ON, utilise l'extension //T "# caractère n'est pas disponible dans l'encodage choisi, il peut être\n" "# remplacé par un ou plusieurs autres caractères similaires.\n" -#: src/lang.c:2152 +#: src/lang.c:2155 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Vous envoie automatiquement une copie. change & valide." -#: src/lang.c:2153 +#: src/lang.c:2156 msgid "Send you a cc automatically" msgstr "Envoyer automatiquement une copie" -#: src/lang.c:2154 +#: src/lang.c:2157 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "# Si ON, inclus automatiquement votre nom dans le champ Cc: lors d'un envoi " "par mail d'un article.\n" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Vous envoie automatiquement une copie privée. change & " "valide." -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "Send you a blind cc automatically" msgstr "Envoyer auto. d'une copie privée" -#: src/lang.c:2160 +#: src/lang.c:2163 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "# Si ON, inclus automatiquement votre nom dans le champ Bcc: lors d'un envoi " "par mail d'un article.\n" -#: src/lang.c:2164 +#: src/lang.c:2167 msgid "Enter address elements about which you want to be warned. sets." msgstr "Être averti de ces éléments. valide." -#: src/lang.c:2165 +#: src/lang.c:2168 msgid "Spamtrap warning address parts" msgstr "Pièges à spam dans les adresses" -#: src/lang.c:2166 +#: src/lang.c:2169 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:2171 +#: src/lang.c:2174 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2172 +#: src/lang.c:2175 msgid "No. of days a filter entry is valid" msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2177 +#: src/lang.c:2180 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2178 +#: src/lang.c:2181 msgid "Add posted articles to filter" msgstr "" -#: src/lang.c:2179 +#: src/lang.c:2182 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2183 +#: src/lang.c:2186 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2184 +#: src/lang.c:2187 msgid "Mail directory" msgstr "" -#: src/lang.c:2185 +#: src/lang.c:2188 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2190 +#: src/lang.c:2193 msgid "Save articles in batch mode (-S)" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2194 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:2196 +#: src/lang.c:2199 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2197 +#: src/lang.c:2200 msgid "Directory to save arts/threads in" msgstr "" -#: src/lang.c:2198 +#: src/lang.c:2201 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "" -#: src/lang.c:2203 +#: src/lang.c:2206 msgid "Use Archive-name: header for save" msgstr "" -#: src/lang.c:2204 +#: src/lang.c:2207 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:2209 +#: src/lang.c:2212 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2210 +#: src/lang.c:2213 msgid "Mark saved articles/threads as read" msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2214 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "Post process saved articles" msgstr "" -#: src/lang.c:2217 +#: src/lang.c:2220 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:2223 +#: src/lang.c:2226 msgid "Process only unread articles" msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2227 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "Print all headers when printing" msgstr "" -#: src/lang.c:2231 +#: src/lang.c:2234 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2235 +#: src/lang.c:2238 msgid "The printer program with options that is to be used to print articles/threads." msgstr "" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Printer program with options" msgstr "" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Force redraw after certain commands" msgstr "" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2248 +#: src/lang.c:2251 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2249 +#: src/lang.c:2252 msgid "Start editor with line offset" msgstr "" -#: src/lang.c:2250 +#: src/lang.c:2253 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:2255 +#: src/lang.c:2258 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2256 +#: src/lang.c:2259 msgid "Invocation of your editor" msgstr "" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2262 +#: src/lang.c:2265 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2263 +#: src/lang.c:2266 msgid "External inews" msgstr "" -#: src/lang.c:2264 +#: src/lang.c:2267 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:2268 +#: src/lang.c:2271 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2269 +#: src/lang.c:2272 msgid "Invocation of your mail command" msgstr "" -#: src/lang.c:2270 +#: src/lang.c:2273 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:2278 +#: src/lang.c:2281 msgid "Use interactive mail reader" msgstr "" -#: src/lang.c:2279 +#: src/lang.c:2282 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:2287 +#: src/lang.c:2290 msgid "Remove ~/.article after posting" msgstr "" -#: src/lang.c:2288 +#: src/lang.c:2291 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "Filename for posted articles" msgstr "" -#: src/lang.c:2294 +#: src/lang.c:2297 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:2299 +#: src/lang.c:2302 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "Keep failed arts in ~/dead.articles" msgstr "" -#: src/lang.c:2301 +#: src/lang.c:2304 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2305 +#: src/lang.c:2308 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "No unsubscribed groups in newsrc" msgstr "" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2312 +#: src/lang.c:2315 msgid "Remove bogus groups from newsrc" msgstr "" -#: src/lang.c:2313 +#: src/lang.c:2316 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:2317 +#: src/lang.c:2320 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2318 +#: src/lang.c:2321 msgid "Interval in secs to reread active" msgstr "" -#: src/lang.c:2319 +#: src/lang.c:2322 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2324 +#: src/lang.c:2327 msgid "Reconnect to server automatically" msgstr "Reconnexion automatique au serveur" -#: src/lang.c:2325 +#: src/lang.c:2328 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2329 +#: src/lang.c:2332 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Créer des copies locales des en-têtes NNTP. change & valide." -#: src/lang.c:2330 +#: src/lang.c:2333 msgid "Cache NNTP overview files locally" msgstr "Cache local des en-têtes NNTP" -#: src/lang.c:2331 +#: src/lang.c:2334 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:2335 +#: src/lang.c:2338 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2336 +#: src/lang.c:2339 msgid "Format string for display of dates" msgstr "" -#: src/lang.c:2337 +#: src/lang.c:2340 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2343 +#: src/lang.c:2346 msgid "Unicode normalization form" msgstr "" -#: src/lang.c:2344 +#: src/lang.c:2347 msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" -#: src/lang.c:2351 +#: src/lang.c:2354 msgid "Render BiDi" msgstr "" -#: src/lang.c:2352 +#: src/lang.c:2355 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/main.c:590 +#: src/misc.c:3711 #, c-format -msgid "Version: %s release %s (\"%s\") %s %s" -msgstr "Version : %s release %s (\"%s\") %s %s" +msgid "Version: %s %s release %s (\"%s\") %s %s\n" +msgstr "Version : %s %s release %s (\"%s\") %s %s\n" -#: src/main.c:593 +#: src/misc.c:3714 #, c-format -msgid "Version: %s release %s (\"%s\")" -msgstr "Version : %s release %s (\"%s\")" +msgid "Version: %s %s release %s (\"%s\")\n" +msgstr "Version : %s %s release %s (\"%s\")\n" #: src/newsrc.c:432 msgid "Unreachable?\n" @@ -6057,7 +6062,7 @@ msgstr "Réenvoyer la dernière commande ( msgid "couldn't expand %s\n" msgstr "impossible de décompacter %s\n" -#: src/post.c:1951 +#: src/post.c:1962 #, c-format msgid "Posting: %.*s ..." msgstr "Postage : %.*s ..." @@ -6096,19 +6101,19 @@ msgid "This message has been composed in "\n" msgstr "" -#: src/save.c:967 +#: src/save.c:974 msgid "bytes" msgstr "octets" -#: src/select.c:351 +#: src/select.c:352 msgid "unread" msgstr "non lu(s)" -#: src/select.c:351 +#: src/select.c:352 msgid "all" msgstr "tout" -#: src/select.c:529 src/select.c:531 +#: src/select.c:530 src/select.c:532 msgid " R" msgstr " R" diff -Nurp tin-1.7.5/po/tin.pot tin-1.7.6/po/tin.pot --- tin-1.7.5/po/tin.pot 2004-08-20 10:35:17.000000000 +0200 +++ tin-1.7.6/po/tin.pot 2004-09-06 10:40:28.000000000 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-06-04 13:31+0200\n" +"POT-Creation-Date: 2004-09-06 10:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,221 +13,221 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: src/art.c:1430 +#: src/art.c:1447 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" -#: src/attrib.c:590 +#: src/attrib.c:594 msgid "" "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:591 +#: src/attrib.c:595 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:592 +#: src/attrib.c:596 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "" -#: src/attrib.c:593 +#: src/attrib.c:597 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "" -#: src/attrib.c:594 +#: src/attrib.c:598 msgid "# savefile=STRING (ie. =linux)\n" msgstr "" -#: src/attrib.c:595 +#: src/attrib.c:599 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "" -#: src/attrib.c:596 +#: src/attrib.c:600 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:597 +#: src/attrib.c:601 msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:598 +#: src/attrib.c:602 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:599 +#: src/attrib.c:603 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:600 +#: src/attrib.c:604 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:601 +#: src/attrib.c:605 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:602 +#: src/attrib.c:606 msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:603 +#: src/attrib.c:607 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:604 +#: src/attrib.c:608 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:606 +#: src/attrib.c:610 msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:608 +#: src/attrib.c:612 msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:609 +#: src/attrib.c:613 msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:610 +#: src/attrib.c:614 msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:611 +#: src/attrib.c:615 msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:612 +#: src/attrib.c:616 msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:613 +#: src/attrib.c:617 msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:620 +#: src/attrib.c:624 msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:626 +#: src/attrib.c:630 msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:632 +#: src/attrib.c:636 msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:650 +#: src/attrib.c:654 msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:655 +#: src/attrib.c:659 msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:660 +#: src/attrib.c:664 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:661 +#: src/attrib.c:665 msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:666 msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:663 +#: src/attrib.c:667 msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:664 src/attrib.c:671 +#: src/attrib.c:668 src/attrib.c:675 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "" -#: src/attrib.c:665 src/attrib.c:672 +#: src/attrib.c:669 src/attrib.c:676 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "" -#: src/attrib.c:666 src/attrib.c:673 +#: src/attrib.c:670 src/attrib.c:677 msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:667 +#: src/attrib.c:671 msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:668 +#: src/attrib.c:672 msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:669 +#: src/attrib.c:673 msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:670 +#: src/attrib.c:674 msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:674 +#: src/attrib.c:678 msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:675 +#: src/attrib.c:679 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:676 +#: src/attrib.c:680 msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:677 +#: src/attrib.c:681 msgid "# mime_forward=ON/OFF\n" msgstr "" -#: src/attrib.c:679 +#: src/attrib.c:683 msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:686 +#: src/attrib.c:690 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:688 +#: src/attrib.c:692 msgid "" "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:689 +#: src/attrib.c:693 msgid "" "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:690 +#: src/attrib.c:694 msgid "" "############################################################################" "\n" "\n" msgstr "" -#: src/attrib.c:696 +#: src/attrib.c:700 msgid "# include extra headers\n" msgstr "" -#: src/attrib.c:704 +#: src/attrib.c:708 msgid "# in *sources* set post process type to shar only\n" msgstr "" -#: src/attrib.c:708 +#: src/attrib.c:712 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "" -#: src/attrib.c:709 +#: src/attrib.c:713 msgid "# and set Followup-To: poster\n" msgstr "" @@ -590,7 +590,7 @@ msgstr "" msgid "Creating newsrc file...\n" msgstr "" -#: src/lang.c:127 src/lang.c:1118 +#: src/lang.c:127 src/lang.c:1121 msgid "Default" msgstr "" @@ -1596,7 +1596,7 @@ msgstr "" msgid "choose next group with unread news" msgstr "" -#: src/lang.c:384 src/lang.c:1165 +#: src/lang.c:384 src/lang.c:1168 msgid "quit" msgstr "" @@ -2473,91 +2473,96 @@ msgstr "" msgid "Reading newsrc file..." msgstr "" -#: src/lang.c:609 +#: src/lang.c:610 +#, c-format +msgid "(%d:%02d remaining)" +msgstr "" + +#: src/lang.c:612 #, c-format msgid "Bogus group %s removed." msgstr "" -#: src/lang.c:610 +#: src/lang.c:613 #, c-format msgid "Error: rename %s to %s" msgstr "" -#: src/lang.c:611 +#: src/lang.c:614 msgid "Reply to author..." msgstr "" -#: src/lang.c:612 +#: src/lang.c:615 msgid "Repost" msgstr "" -#: src/lang.c:613 +#: src/lang.c:616 msgid "Reposting article..." msgstr "" -#: src/lang.c:614 +#: src/lang.c:617 #, c-format msgid "Repost article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:615 +#: src/lang.c:618 msgid "Reset newsrc?" msgstr "" -#: src/lang.c:616 +#: src/lang.c:619 msgid "Responses have been directed to the following newsgroups" msgstr "" -#: src/lang.c:617 +#: src/lang.c:620 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " msgstr "" -#: src/lang.c:618 +#: src/lang.c:621 #, c-format msgid "RespNo %4d of %4d" msgstr "" -#: src/lang.c:619 +#: src/lang.c:622 msgid "Press to continue..." msgstr "" -#: src/lang.c:621 +#: src/lang.c:624 #, c-format msgid "Select From [%s] (y/n): " msgstr "" -#: src/lang.c:622 +#: src/lang.c:625 msgid "Select Lines: (num): " msgstr "" -#: src/lang.c:623 +#: src/lang.c:626 msgid "Auto-select Article Menu" msgstr "" -#: src/lang.c:624 +#: src/lang.c:627 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:625 +#: src/lang.c:628 msgid "Select pattern scope: " msgstr "" -#: src/lang.c:626 +#: src/lang.c:629 #, c-format msgid "Select Subject [%s] (y/n): " msgstr "" -#: src/lang.c:627 +#: src/lang.c:630 msgid "Select text pattern : " msgstr "" -#: src/lang.c:628 +#: src/lang.c:631 msgid "Select time in days : " msgstr "" -#: src/lang.c:629 +#: src/lang.c:632 #, c-format msgid "" "# %s server configuration file\n" @@ -2571,219 +2576,219 @@ msgid "" "\n" msgstr "" -#: src/lang.c:635 +#: src/lang.c:638 msgid "Showing unread groups only" msgstr "" -#: src/lang.c:636 +#: src/lang.c:639 msgid "Subject: line (ignore case) " msgstr "" -#: src/lang.c:637 +#: src/lang.c:640 msgid "Subject: line (case sensitive)" msgstr "" -#: src/lang.c:638 +#: src/lang.c:641 msgid "Save" msgstr "" -#: src/lang.c:639 +#: src/lang.c:642 #, c-format msgid "Save '%s' (%s/%s)?" msgstr "" -#: src/lang.c:640 +#: src/lang.c:643 msgid "Save configuration before continuing?" msgstr "" -#: src/lang.c:641 +#: src/lang.c:644 msgid "Save filename> " msgstr "" -#: src/lang.c:642 +#: src/lang.c:645 msgid "Saved" msgstr "" -#: src/lang.c:643 +#: src/lang.c:646 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" msgstr "" -#: src/lang.c:644 +#: src/lang.c:647 #, c-format msgid "Saved %s...\n" msgstr "" -#: src/lang.c:645 +#: src/lang.c:648 msgid "Nothing was saved" msgstr "" -#: src/lang.c:646 +#: src/lang.c:649 #, c-format msgid "" "\n" "%s %d %s from %d %s\n" msgstr "" -#: src/lang.c:647 +#: src/lang.c:650 #, c-format msgid "-- %s saved to %s%s --" msgstr "" -#: src/lang.c:648 +#: src/lang.c:651 #, c-format msgid "-- %s saved to %s - %s --" msgstr "" -#: src/lang.c:649 +#: src/lang.c:652 msgid "Saving..." msgstr "" -#: src/lang.c:650 +#: src/lang.c:653 #, c-format msgid "%s: Screen initialization failed" msgstr "" -#: src/lang.c:651 +#: src/lang.c:654 #, c-format msgid "%s: screen is too small\n" msgstr "" -#: src/lang.c:652 +#: src/lang.c:655 #, c-format msgid "screen is too small, %s is exiting\n" msgstr "" -#: src/lang.c:653 +#: src/lang.c:656 #, c-format msgid "Search backwards [%s]> " msgstr "" -#: src/lang.c:654 +#: src/lang.c:657 #, c-format msgid "Search body [%s]> " msgstr "" -#: src/lang.c:655 +#: src/lang.c:658 #, c-format msgid "Search forwards [%s]> " msgstr "" -#: src/lang.c:656 +#: src/lang.c:659 msgid "Searching..." msgstr "" -#: src/lang.c:657 +#: src/lang.c:660 #, c-format msgid "Searching article %d of %d ('q' to abort)..." msgstr "" -#: src/lang.c:658 +#: src/lang.c:661 msgid "Select article> " msgstr "" -#: src/lang.c:659 +#: src/lang.c:662 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" -#: src/lang.c:660 +#: src/lang.c:663 msgid "Select group> " msgstr "" -#: src/lang.c:661 +#: src/lang.c:664 #, c-format msgid "Enter selection pattern [%s]> " msgstr "" -#: src/lang.c:662 +#: src/lang.c:665 msgid "Select thread > " msgstr "" -#: src/lang.c:663 +#: src/lang.c:666 #, c-format msgid "%s %s %s (\"%s\") [%s]: send a DETAILED bug report to %s\n" msgstr "" -#: src/lang.c:664 +#: src/lang.c:667 msgid "servers active-file" msgstr "" -#: src/lang.c:665 +#: src/lang.c:668 msgid "Cannot move into new newsgroups. Subscribe first..." msgstr "" -#: src/lang.c:666 +#: src/lang.c:669 msgid "" msgstr "" -#: src/lang.c:667 +#: src/lang.c:670 #, c-format msgid "Starting: (%s)" msgstr "" -#: src/lang.c:668 +#: src/lang.c:671 #, c-format msgid "List Thread (%d of %d)" msgstr "" -#: src/lang.c:669 +#: src/lang.c:672 #, c-format msgid "Thread (%.*s)" msgstr "" -#: src/lang.c:670 +#: src/lang.c:673 msgid "Enter wildcard subscribe pattern> " msgstr "" -#: src/lang.c:671 +#: src/lang.c:674 #, c-format msgid "subscribed to %d groups" msgstr "" -#: src/lang.c:672 +#: src/lang.c:675 #, c-format msgid "Subscribed to %s" msgstr "" -#: src/lang.c:673 +#: src/lang.c:676 msgid "Subscribing... " msgstr "" -#: src/lang.c:674 +#: src/lang.c:677 msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " msgstr "" -#: src/lang.c:675 +#: src/lang.c:678 #, c-format msgid "Supersede article(s) to group(s) [%s]> " msgstr "" -#: src/lang.c:676 +#: src/lang.c:679 msgid "Superseding article ..." msgstr "" -#: src/lang.c:677 +#: src/lang.c:680 #, c-format msgid "" "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" -#: src/lang.c:679 +#: src/lang.c:682 #, c-format msgid "%d days" msgstr "" -#: src/lang.c:680 +#: src/lang.c:683 msgid "" msgstr "" -#: src/lang.c:681 +#: src/lang.c:684 msgid "# Default action/prompt strings\n" msgstr "" -#: src/lang.c:682 +#: src/lang.c:685 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" @@ -2794,262 +2799,262 @@ msgid "" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" -#: src/lang.c:695 +#: src/lang.c:698 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" -#: src/lang.c:696 +#: src/lang.c:699 msgid "# Host & time info used for detecting new groups (don't touch)\n" msgstr "" -#: src/lang.c:697 +#: src/lang.c:700 msgid "There is no news\n" msgstr "" -#: src/lang.c:698 +#: src/lang.c:701 msgid "Thread" msgstr "" -#: src/lang.c:699 +#: src/lang.c:702 msgid "Thread Level Commands" msgstr "" -#: src/lang.c:700 +#: src/lang.c:703 msgid "Thread deselected" msgstr "" -#: src/lang.c:701 +#: src/lang.c:704 msgid "Thread selected" msgstr "" -#: src/lang.c:702 +#: src/lang.c:705 msgid "threads" msgstr "" -#: src/lang.c:703 +#: src/lang.c:706 msgid "Thread range" msgstr "" -#: src/lang.c:704 +#: src/lang.c:707 msgid "thread" msgstr "" -#: src/lang.c:705 +#: src/lang.c:708 #, c-format msgid "Thread %4s of %4s" msgstr "" -#: src/lang.c:706 +#: src/lang.c:709 msgid "Threading articles..." msgstr "" -#: src/lang.c:707 +#: src/lang.c:710 #, c-format msgid "Toggled word highlighting %s" msgstr "" -#: src/lang.c:708 +#: src/lang.c:711 msgid "Toggled rot13 encoding" msgstr "" -#: src/lang.c:709 +#: src/lang.c:712 #, c-format msgid "Toggled german TeX encoding %s" msgstr "" -#: src/lang.c:710 +#: src/lang.c:713 #, c-format msgid "Toggled tab-width to %d" msgstr "" -#: src/lang.c:711 +#: src/lang.c:714 #, c-format msgid "%d Trying to dotlock %s" msgstr "" -#: src/lang.c:712 +#: src/lang.c:715 #, c-format msgid "%d Trying to lock %s" msgstr "" -#: src/lang.c:713 +#: src/lang.c:716 msgid " h=help\n" msgstr "" -#: src/lang.c:715 +#: src/lang.c:718 msgid "Unlimited" msgstr "" -#: src/lang.c:716 +#: src/lang.c:719 msgid "Enter wildcard unsubscribe pattern> " msgstr "" -#: src/lang.c:717 +#: src/lang.c:720 #, c-format msgid "Error decoding %s : %s" msgstr "" -#: src/lang.c:718 +#: src/lang.c:721 msgid "No end." msgstr "" -#: src/lang.c:719 +#: src/lang.c:722 #, c-format msgid "%s successfully decoded." msgstr "" -#: src/lang.c:720 +#: src/lang.c:723 #, c-format msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" -#: src/lang.c:721 +#: src/lang.c:724 msgid "unread " msgstr "" -#: src/lang.c:722 +#: src/lang.c:725 #, c-format msgid "unsubscribed from %d groups" msgstr "" -#: src/lang.c:723 +#: src/lang.c:726 #, c-format msgid "Unsubscribed from %s" msgstr "" -#: src/lang.c:724 +#: src/lang.c:727 msgid "Unsubscribing... " msgstr "" -#: src/lang.c:725 +#: src/lang.c:728 msgid "Unthreading articles..." msgstr "" -#: src/lang.c:726 +#: src/lang.c:729 msgid "Updated" msgstr "" -#: src/lang.c:727 +#: src/lang.c:730 msgid "Updating" msgstr "" -#: src/lang.c:728 +#: src/lang.c:731 #, c-format msgid "Opening %s\n" msgstr "" -#: src/lang.c:729 +#: src/lang.c:732 msgid "No more URL's in this article" msgstr "" -#: src/lang.c:730 +#: src/lang.c:733 msgid "Use MIME display program for this message?" msgstr "" -#: src/lang.c:731 +#: src/lang.c:734 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" msgstr "" -#: src/lang.c:732 +#: src/lang.c:735 msgid " -Z return status indicating if any unread news (batch mode)" msgstr "" -#: src/lang.c:733 +#: src/lang.c:736 msgid " -q don't check for new newsgroups" msgstr "" -#: src/lang.c:734 +#: src/lang.c:737 msgid " -X don't save any files on quit" msgstr "" -#: src/lang.c:735 +#: src/lang.c:738 msgid " -d don't show newsgroup descriptions" msgstr "" -#: src/lang.c:736 +#: src/lang.c:739 msgid " -G limit get only limit articles/group" msgstr "" -#: src/lang.c:737 +#: src/lang.c:740 #, c-format msgid " -H help information about %s" msgstr "" -#: src/lang.c:738 +#: src/lang.c:741 msgid " -h this help message" msgstr "" -#: src/lang.c:739 +#: src/lang.c:742 #, c-format msgid " -I dir news index file directory [default=%s]" msgstr "" -#: src/lang.c:740 +#: src/lang.c:743 msgid " -u update index files (batch mode)" msgstr "" -#: src/lang.c:741 +#: src/lang.c:744 #, c-format msgid " -m dir mailbox directory [default=%s]" msgstr "" -#: src/lang.c:742 +#: src/lang.c:745 #, c-format msgid "" "\n" "Mail bug reports/comments to %s" msgstr "" -#: src/lang.c:743 +#: src/lang.c:746 msgid " -N mail new news to your posts (batch mode)" msgstr "" -#: src/lang.c:744 +#: src/lang.c:747 msgid " -M user mail new news to specified user (batch mode)" msgstr "" -#: src/lang.c:745 +#: src/lang.c:748 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" msgstr "" -#: src/lang.c:746 +#: src/lang.c:749 msgid " -x no posting mode" msgstr "" -#: src/lang.c:747 +#: src/lang.c:750 msgid " -w post an article and exit" msgstr "" -#: src/lang.c:748 +#: src/lang.c:751 msgid " -o post all postponed articles and exit" msgstr "" -#: src/lang.c:749 +#: src/lang.c:752 msgid " -r read news remotely from default NNTP server" msgstr "" -#: src/lang.c:750 +#: src/lang.c:753 msgid " -R read news saved by -S option" msgstr "" -#: src/lang.c:751 +#: src/lang.c:754 #, c-format msgid " -s dir save news directory [default=%s]" msgstr "" -#: src/lang.c:752 +#: src/lang.c:755 msgid " -S save new news for later reading (batch mode)" msgstr "" -#: src/lang.c:753 +#: src/lang.c:756 msgid " -z start if any unread news" msgstr "" -#: src/lang.c:754 +#: src/lang.c:757 #, c-format msgid "" "A Usenet reader.\n" @@ -3057,37 +3062,37 @@ msgid "" "Usage: %s [options] [newsgroup[,...]]" msgstr "" -#: src/lang.c:755 +#: src/lang.c:758 msgid " -v verbose output for batch mode options" msgstr "" -#: src/lang.c:756 +#: src/lang.c:759 msgid " -V print version & date information" msgstr "" -#: src/lang.c:757 +#: src/lang.c:760 #, c-format msgid "%s only useful without batch mode operations\n" msgstr "" -#: src/lang.c:758 +#: src/lang.c:761 #, c-format msgid "%s only useful for batch mode operations\n" msgstr "" -#: src/lang.c:760 +#: src/lang.c:763 #, c-format msgid "" "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" -#: src/lang.c:761 +#: src/lang.c:764 #, c-format msgid "View '%s' (%s/%s)?" msgstr "" -#: src/lang.c:763 +#: src/lang.c:766 #, c-format msgid "" "\n" @@ -3095,33 +3100,33 @@ msgid "" "%-100s\n" msgstr "" -#: src/lang.c:764 +#: src/lang.c:767 msgid "" "\n" "Warning: article unchanged after editing\n" msgstr "" -#: src/lang.c:765 +#: src/lang.c:768 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" -#: src/lang.c:766 +#: src/lang.c:769 msgid "" "\n" "Warning: \"Subject:\" begins with \"Re: \" but there are no " "\"References:\".\n" msgstr "" -#: src/lang.c:768 +#: src/lang.c:771 msgid "" "\n" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" -#: src/lang.c:771 +#: src/lang.c:774 msgid "" "Read carefully!\n" "\n" @@ -3135,7 +3140,7 @@ msgid "" "\n" msgstr "" -#: src/lang.c:775 +#: src/lang.c:778 msgid "" "\n" "Warning: You are using a non-plain transfer encoding (such as base64 or\n" @@ -3144,7 +3149,7 @@ msgid "" " not be encoded properly.\n" msgstr "" -#: src/lang.c:780 +#: src/lang.c:783 #, c-format msgid "" "\n" @@ -3154,7 +3159,7 @@ msgid "" "Read WHATSNEW, etc...\n" msgstr "" -#: src/lang.c:782 +#: src/lang.c:785 #, c-format msgid "" "\n" @@ -3163,7 +3168,7 @@ msgid "" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" -#: src/lang.c:785 +#: src/lang.c:788 #, c-format msgid "" "Warning: tin wrote fewer groups to your\n" @@ -3173,19 +3178,19 @@ msgid "" "before you start tin once again!\n" msgstr "" -#: src/lang.c:789 +#: src/lang.c:792 #, c-format msgid "" "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" -#: src/lang.c:790 +#: src/lang.c:793 #, c-format msgid "Warning: Only %d out of %d articles were saved" msgstr "" -#: src/lang.c:791 +#: src/lang.c:794 #, c-format msgid "" "\n" @@ -3196,49 +3201,49 @@ msgid "" " possible.\n" msgstr "" -#: src/lang.c:795 +#: src/lang.c:798 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" -#: src/lang.c:796 +#: src/lang.c:799 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" -#: src/lang.c:797 +#: src/lang.c:800 msgid "Writing attributes file..." msgstr "" -#: src/lang.c:799 +#: src/lang.c:802 #, c-format msgid "%d Responses" msgstr "" -#: src/lang.c:801 +#: src/lang.c:804 #, c-format msgid "Added %d %s" msgstr "" -#: src/lang.c:802 +#: src/lang.c:805 msgid "No unsubscribed groups to show" msgstr "" -#: src/lang.c:803 +#: src/lang.c:806 msgid "Showing subscribed to groups only" msgstr "" -#: src/lang.c:804 +#: src/lang.c:807 msgid "Yes " msgstr "" -#: src/lang.c:805 +#: src/lang.c:808 msgid " You have mail\n" msgstr "" -#: src/lang.c:810 +#: src/lang.c:813 #, c-format msgid "" "\n" @@ -3251,16 +3256,16 @@ msgid "" " M)enu option.\n" msgstr "" -#: src/lang.c:821 +#: src/lang.c:824 #, c-format msgid "Redefined key %s '%s' -> '%s'\n" msgstr "" -#: src/lang.c:822 +#: src/lang.c:825 msgid " -D debug mode 1=NNTP 2=ALL" msgstr "" -#: src/lang.c:826 +#: src/lang.c:829 msgid "" "Read carefully!\n" "\n" @@ -3277,11 +3282,11 @@ msgid "" "\n" msgstr "" -#: src/lang.c:835 +#: src/lang.c:838 msgid "toggle color" msgstr "" -#: src/lang.c:836 +#: src/lang.c:839 msgid "" "# For color-adjust use the following numbers\n" "# 0-black 1-red 2-green 3-brown\n" @@ -3294,351 +3299,351 @@ msgid "" "\n" msgstr "" -#: src/lang.c:844 +#: src/lang.c:847 msgid " -a toggle color flag" msgstr "" -#: src/lang.c:848 +#: src/lang.c:851 msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:849 +#: src/lang.c:852 #, c-format msgid "" "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:850 +#: src/lang.c:853 #, c-format msgid "" "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" -#: src/lang.c:852 +#: src/lang.c:855 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" -#: src/lang.c:853 +#: src/lang.c:856 #, c-format msgid "" "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" -#: src/lang.c:854 +#: src/lang.c:857 #, c-format msgid "" "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" -#: src/lang.c:855 +#: src/lang.c:858 #, c-format msgid "" "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" -#: src/lang.c:859 +#: src/lang.c:862 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." msgstr "" -#: src/lang.c:860 +#: src/lang.c:863 msgid "Missing parts." msgstr "" -#: src/lang.c:861 +#: src/lang.c:864 msgid "No beginning." msgstr "" -#: src/lang.c:862 +#: src/lang.c:865 msgid "No data." msgstr "" -#: src/lang.c:863 +#: src/lang.c:866 msgid "Unknown error." msgstr "" -#: src/lang.c:865 +#: src/lang.c:868 #, c-format msgid "\tChecksum of %s (%ld %s)" msgstr "" -#: src/lang.c:869 +#: src/lang.c:872 msgid "Reading mail active file... " msgstr "" -#: src/lang.c:870 +#: src/lang.c:873 msgid "Reading mailgroups file... " msgstr "" -#: src/lang.c:874 +#: src/lang.c:877 msgid "perform PGP operations on article" msgstr "" -#: src/lang.c:875 +#: src/lang.c:878 msgid "Add key(s) to public keyring?" msgstr "" -#: src/lang.c:876 +#: src/lang.c:879 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " msgstr "" -#: src/lang.c:877 +#: src/lang.c:880 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " msgstr "" -#: src/lang.c:878 +#: src/lang.c:881 #, c-format msgid "PGP has not been set up (can't open %s)" msgstr "" -#: src/lang.c:879 +#: src/lang.c:882 msgid "Article not signed and no public keys found" msgstr "" -#: src/lang.c:881 +#: src/lang.c:884 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:882 +#: src/lang.c:885 msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:883 +#: src/lang.c:886 msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:885 +#: src/lang.c:888 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:886 +#: src/lang.c:889 msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " msgstr "" -#: src/lang.c:887 +#: src/lang.c:890 msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:891 +#: src/lang.c:894 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:892 +#: src/lang.c:895 msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " msgstr "" -#: src/lang.c:893 +#: src/lang.c:896 msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:895 +#: src/lang.c:898 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " msgstr "" -#: src/lang.c:896 +#: src/lang.c:899 msgid "%s=quit, %s=edit, %s=send [%%s]: " msgstr "" -#: src/lang.c:897 +#: src/lang.c:900 msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" -#: src/lang.c:906 +#: src/lang.c:909 msgid "Try cache_overview_files to speed up things.\n" msgstr "" -#: src/lang.c:907 +#: src/lang.c:910 msgid "Tin will use local index files instead.\n" msgstr "" -#: src/lang.c:908 +#: src/lang.c:911 msgid "Cannot find NNTP server name" msgstr "" -#: src/lang.c:909 +#: src/lang.c:912 #, c-format msgid "Connecting to %s:%d..." msgstr "" -#: src/lang.c:910 +#: src/lang.c:913 msgid "Disconnecting from server...\n" msgstr "" -#: src/lang.c:911 +#: src/lang.c:914 #, c-format msgid "Wrong newsgroup name in response of GROUP command, %s for %s" msgstr "" -#: src/lang.c:912 +#: src/lang.c:915 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." msgstr "" -#: src/lang.c:913 +#: src/lang.c:916 msgid "205 Closing connection" msgstr "" -#: src/lang.c:914 +#: src/lang.c:917 msgid "Your server does not support the NNTP XOVER or OVER command.\n" msgstr "" -#: src/lang.c:915 +#: src/lang.c:918 msgid "Connection to news server has timed out. Reconnect?" msgstr "" -#: src/lang.c:916 +#: src/lang.c:919 #, c-format msgid "" "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "" -#: src/lang.c:917 +#: src/lang.c:920 msgid " -A force authentication on connect" msgstr "" -#: src/lang.c:918 +#: src/lang.c:921 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" msgstr "" -#: src/lang.c:919 +#: src/lang.c:922 #, c-format msgid " -p port use port as NNTP port [default=%d]" msgstr "" -#: src/lang.c:920 +#: src/lang.c:923 msgid " -Q quick start. Same as -nqd" msgstr "" -#: src/lang.c:921 +#: src/lang.c:924 msgid " -l use only LIST instead of GROUP (-n) command" msgstr "" -#: src/lang.c:922 +#: src/lang.c:925 msgid " -n only read subscribed .newsrc groups from NNTP server" msgstr "" -#: src/lang.c:924 +#: src/lang.c:927 #, c-format msgid "%s/tcp: Unknown service.\n" msgstr "" -#: src/lang.c:927 +#: src/lang.c:930 msgid "" "\n" "socket or connect problem\n" msgstr "" -#: src/lang.c:929 +#: src/lang.c:932 #, c-format msgid "" "\n" "Connection to %s: " msgstr "" -#: src/lang.c:930 +#: src/lang.c:933 msgid "Giving up...\n" msgstr "" -#: src/lang.c:933 +#: src/lang.c:936 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:936 +#: src/lang.c:939 msgid "Your server does not have Xref: in its XOVER information.\n" msgstr "" -#: src/lang.c:939 +#: src/lang.c:942 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP.\n" msgstr "" -#: src/lang.c:942 +#: src/lang.c:945 msgid " -Q quick start. Same as -qd" msgstr "" -#: src/lang.c:943 +#: src/lang.c:946 msgid " -l read only active file instead of scanning spool (-n) command" msgstr "" -#: src/lang.c:944 +#: src/lang.c:947 msgid " -n only read subscribed .newsrc groups from spool" msgstr "" -#: src/lang.c:945 +#: src/lang.c:948 msgid "Your server does not have Xref: in its NOV-files.\n" msgstr "" -#: src/lang.c:949 +#: src/lang.c:952 msgid "Posting using external inews failed. Use built in inews instead?" msgstr "" -#: src/lang.c:950 +#: src/lang.c:953 msgid "It worked! Should I always use my built in inews from now on?" msgstr "" -#: src/lang.c:958 +#: src/lang.c:961 #, c-format msgid "%d %s printed" msgstr "" -#: src/lang.c:959 +#: src/lang.c:962 msgid "output article/thread/hot/pattern/tagged articles to printer" msgstr "" -#: src/lang.c:960 +#: src/lang.c:963 msgid "Print" msgstr "" -#: src/lang.c:961 +#: src/lang.c:964 msgid "Printing..." msgstr "" -#: src/lang.c:965 +#: src/lang.c:968 msgid "pipe article/thread/hot/pattern/tagged articles into command" msgstr "" -#: src/lang.c:966 +#: src/lang.c:969 msgid "No command" msgstr "" -#: src/lang.c:967 +#: src/lang.c:970 msgid "Pipe" msgstr "" -#: src/lang.c:968 +#: src/lang.c:971 #, c-format msgid "Pipe to command [%.*s]> " msgstr "" -#: src/lang.c:969 +#: src/lang.c:972 msgid "Piping..." msgstr "" -#: src/lang.c:971 +#: src/lang.c:974 msgid "Piping not enabled." msgstr "" -#: src/lang.c:975 +#: src/lang.c:978 #, c-format msgid "" "\n" @@ -3648,7 +3653,7 @@ msgid "" " newsgroup names.\n" msgstr "" -#: src/lang.c:980 +#: src/lang.c:983 #, c-format msgid "" "\n" @@ -3657,7 +3662,7 @@ msgid "" " Please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:985 +#: src/lang.c:988 #, c-format msgid "" "\n" @@ -3666,14 +3671,14 @@ msgid "" " To avoid trouble please write all newsgroups into a single line.\n" msgstr "" -#: src/lang.c:989 +#: src/lang.c:992 #, c-format msgid "" "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" msgstr "" -#: src/lang.c:994 +#: src/lang.c:997 msgid "" "\n" " If your article contains quoted text please take some time to pare it " @@ -3695,832 +3700,832 @@ msgid "" " likely to ignore it completely. It's a crowded net out there.\n" msgstr "" -#: src/lang.c:1007 +#: src/lang.c:1010 msgid "shell escape" msgstr "" -#: src/lang.c:1008 +#: src/lang.c:1011 #, c-format msgid "Shell Command (%s)" msgstr "" -#: src/lang.c:1009 +#: src/lang.c:1012 #, c-format msgid "Enter shell command [%s]> " msgstr "" -#: src/lang.c:1013 +#: src/lang.c:1016 #, c-format msgid "%s: Can't get entry for TERM\n" msgstr "" -#: src/lang.c:1017 +#: src/lang.c:1020 #, c-format msgid "Group %.*s ('q' to quit)..." msgstr "" -#: src/lang.c:1019 +#: src/lang.c:1022 #, c-format msgid "Group %.*s..." msgstr "" -#: src/lang.c:1023 +#: src/lang.c:1026 msgid "Server unavailable\n" msgstr "" -#: src/lang.c:1029 +#: src/lang.c:1032 #, 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:1030 +#: src/lang.c:1033 #, c-format msgid "" "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1032 +#: src/lang.c:1035 #, c-format msgid "" "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1033 +#: src/lang.c:1036 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1037 +#: src/lang.c:1040 #, c-format msgid "" "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1038 +#: src/lang.c:1041 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1040 +#: src/lang.c:1043 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1041 +#: src/lang.c:1044 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" -#: src/lang.c:1047 +#: src/lang.c:1050 msgid "Terminal does not support color" msgstr "" -#: src/lang.c:1052 +#: src/lang.c:1055 #, c-format msgid "Trying %s" msgstr "" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 +#: src/lang.c:1069 src/lang.c:1094 src/lang.c:1110 src/lang.c:1289 #: src/refs.c:296 msgid "None" msgstr "" -#: src/lang.c:1067 +#: src/lang.c:1070 msgid "Subject" msgstr "" -#: src/lang.c:1068 +#: src/lang.c:1071 msgid "References" msgstr "" -#: src/lang.c:1069 +#: src/lang.c:1072 msgid "Both Subject and References" msgstr "" -#: src/lang.c:1070 +#: src/lang.c:1073 msgid "Multipart Subject" msgstr "" -#: src/lang.c:1082 src/lang.c:1193 +#: src/lang.c:1085 src/lang.c:1196 msgid "No" msgstr "" -#: src/lang.c:1083 src/lang.c:1195 +#: src/lang.c:1086 src/lang.c:1198 msgid "Yes" msgstr "" -#: src/lang.c:1084 +#: src/lang.c:1087 msgid "Hide All" msgstr "" -#: src/lang.c:1092 +#: src/lang.c:1095 msgid "Address" msgstr "" -#: src/lang.c:1093 +#: src/lang.c:1096 msgid "Full Name" msgstr "" -#: src/lang.c:1094 +#: src/lang.c:1097 msgid "Address and Name" msgstr "" -#: src/lang.c:1101 +#: src/lang.c:1104 msgid "Max" msgstr "" -#: src/lang.c:1102 +#: src/lang.c:1105 msgid "Sum" msgstr "" -#: src/lang.c:1103 +#: src/lang.c:1106 msgid "Average" msgstr "" -#: src/lang.c:1108 +#: src/lang.c:1111 msgid "Lines" msgstr "" -#: src/lang.c:1109 +#: src/lang.c:1112 msgid "Score" msgstr "" -#: src/lang.c:1110 +#: src/lang.c:1113 msgid "Lines & Score" msgstr "" -#: src/lang.c:1119 +#: src/lang.c:1122 msgid "Black" msgstr "" -#: src/lang.c:1120 +#: src/lang.c:1123 msgid "Red" msgstr "" -#: src/lang.c:1121 +#: src/lang.c:1124 msgid "Green" msgstr "" -#: src/lang.c:1122 +#: src/lang.c:1125 msgid "Brown" msgstr "" -#: src/lang.c:1123 +#: src/lang.c:1126 msgid "Blue" msgstr "" -#: src/lang.c:1124 +#: src/lang.c:1127 msgid "Pink" msgstr "" -#: src/lang.c:1125 +#: src/lang.c:1128 msgid "Cyan" msgstr "" -#: src/lang.c:1126 +#: src/lang.c:1129 msgid "White" msgstr "" -#: src/lang.c:1127 +#: src/lang.c:1130 msgid "Gray" msgstr "" -#: src/lang.c:1128 +#: src/lang.c:1131 msgid "Light Red" msgstr "" -#: src/lang.c:1129 +#: src/lang.c:1132 msgid "Light Green" msgstr "" -#: src/lang.c:1130 +#: src/lang.c:1133 msgid "Yellow" msgstr "" -#: src/lang.c:1131 +#: src/lang.c:1134 msgid "Light Blue" msgstr "" -#: src/lang.c:1132 +#: src/lang.c:1135 msgid "Light Pink" msgstr "" -#: src/lang.c:1133 +#: src/lang.c:1136 msgid "Light Cyan" msgstr "" -#: src/lang.c:1134 +#: src/lang.c:1137 msgid "Light White" msgstr "" -#: src/lang.c:1142 src/lang.c:1199 src/lang.c:1213 +#: src/lang.c:1145 src/lang.c:1202 src/lang.c:1216 msgid "Nothing" msgstr "" -#: src/lang.c:1143 +#: src/lang.c:1146 msgid "Mark" msgstr "" -#: src/lang.c:1144 +#: src/lang.c:1147 msgid "Space" msgstr "" -#: src/lang.c:1151 +#: src/lang.c:1154 msgid "Normal" msgstr "" -#: src/lang.c:1152 +#: src/lang.c:1155 msgid "Best highlighting" msgstr "" -#: src/lang.c:1153 +#: src/lang.c:1156 msgid "Underline" msgstr "" -#: src/lang.c:1154 +#: src/lang.c:1157 msgid "Reverse video" msgstr "" -#: src/lang.c:1155 +#: src/lang.c:1158 msgid "Blinking" msgstr "" -#: src/lang.c:1156 +#: src/lang.c:1159 msgid "Half bright" msgstr "" -#: src/lang.c:1157 +#: src/lang.c:1160 msgid "Bold" msgstr "" -#: src/lang.c:1162 +#: src/lang.c:1165 msgid "none" msgstr "" -#: src/lang.c:1163 +#: src/lang.c:1166 msgid "commands" msgstr "" -#: src/lang.c:1164 +#: src/lang.c:1167 msgid "select" msgstr "" -#: src/lang.c:1166 +#: src/lang.c:1169 msgid "commands & quit" msgstr "" -#: src/lang.c:1167 +#: src/lang.c:1170 msgid "commands & select" msgstr "" -#: src/lang.c:1168 +#: src/lang.c:1171 msgid "quit & select" msgstr "" -#: src/lang.c:1169 +#: src/lang.c:1172 msgid "commands & quit & select" msgstr "" -#: src/lang.c:1194 +#: src/lang.c:1197 msgid "Shell archive" msgstr "" -#: src/lang.c:1200 +#: src/lang.c:1203 msgid "Subject: (descending)" msgstr "" -#: src/lang.c:1201 +#: src/lang.c:1204 msgid "Subject: (ascending)" msgstr "" -#: src/lang.c:1202 +#: src/lang.c:1205 msgid "From: (descending)" msgstr "" -#: src/lang.c:1203 +#: src/lang.c:1206 msgid "From: (ascending)" msgstr "" -#: src/lang.c:1204 +#: src/lang.c:1207 msgid "Date: (descending)" msgstr "" -#: src/lang.c:1205 +#: src/lang.c:1208 msgid "Date: (ascending)" msgstr "" -#: src/lang.c:1206 src/lang.c:1214 +#: src/lang.c:1209 src/lang.c:1217 msgid "Score (descending)" msgstr "" -#: src/lang.c:1207 src/lang.c:1215 +#: src/lang.c:1210 src/lang.c:1218 msgid "Score (ascending)" msgstr "" -#: src/lang.c:1208 +#: src/lang.c:1211 msgid "Lines: (descending)" msgstr "" -#: src/lang.c:1209 +#: src/lang.c:1212 msgid "Lines: (ascending)" msgstr "" -#: src/lang.c:1220 +#: src/lang.c:1223 msgid "Always Keep" msgstr "" -#: src/lang.c:1221 +#: src/lang.c:1224 msgid "Always Remove" msgstr "" -#: src/lang.c:1222 +#: src/lang.c:1225 msgid "Mark with D on selection screen" msgstr "" -#: src/lang.c:1227 +#: src/lang.c:1230 msgid "Kill only unread arts" msgstr "" -#: src/lang.c:1228 +#: src/lang.c:1231 msgid "Kill all arts & show with K" msgstr "" #. TODO: s/K/art_marked_killed/ -#: src/lang.c:1229 +#: src/lang.c:1232 msgid "Kill all arts and never show" msgstr "" -#: src/lang.c:1234 +#: src/lang.c:1237 msgid "Nothing special" msgstr "" -#: src/lang.c:1235 +#: src/lang.c:1238 msgid "Compress quotes" msgstr "" -#: src/lang.c:1236 +#: src/lang.c:1239 msgid "Quote signatures" msgstr "" -#: src/lang.c:1237 +#: src/lang.c:1240 msgid "Compress quotes, quote sigs" msgstr "" -#: src/lang.c:1238 +#: src/lang.c:1241 msgid "Quote empty lines" msgstr "" -#: src/lang.c:1239 +#: src/lang.c:1242 msgid "Compress quotes, quote empty lines" msgstr "" -#: src/lang.c:1240 +#: src/lang.c:1243 msgid "Quote sigs & empty lines" msgstr "" -#: src/lang.c:1241 +#: src/lang.c:1244 msgid "Comp. q., quote sigs & empty lines" msgstr "" -#: src/lang.c:1279 +#: src/lang.c:1282 msgid "no" msgstr "" -#: src/lang.c:1280 +#: src/lang.c:1283 msgid "with headers" msgstr "" -#: src/lang.c:1281 +#: src/lang.c:1284 msgid "without headers" msgstr "" -#: src/lang.c:1288 src/lang.c:1294 +#: src/lang.c:1291 src/lang.c:1297 msgid "NFKC" msgstr "" -#: src/lang.c:1289 +#: src/lang.c:1292 msgid "NFKD" msgstr "" -#: src/lang.c:1290 +#: src/lang.c:1293 msgid "NFC" msgstr "" -#: src/lang.c:1291 +#: src/lang.c:1294 msgid "NFD" msgstr "" -#: src/lang.c:1302 +#: src/lang.c:1305 msgid "Display Options" msgstr "" -#: src/lang.c:1308 +#: src/lang.c:1311 msgid "Color Options" msgstr "" -#: src/lang.c:1314 +#: src/lang.c:1317 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1320 +#: src/lang.c:1323 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1326 +#: src/lang.c:1329 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1332 +#: src/lang.c:1335 msgid "Expert Options" msgstr "" -#: src/lang.c:1338 +#: src/lang.c:1341 msgid "Filtering Options" msgstr "" -#: 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 src/lang.c:2350 +#: src/lang.c:1346 src/lang.c:1372 src/lang.c:1378 src/lang.c:1385 +#: src/lang.c:1417 src/lang.c:1423 src/lang.c:1431 src/lang.c:1451 +#: src/lang.c:1526 src/lang.c:1688 src/lang.c:1694 src/lang.c:1700 +#: src/lang.c:1706 src/lang.c:1718 src/lang.c:1725 src/lang.c:1776 +#: src/lang.c:1785 src/lang.c:1791 src/lang.c:1797 src/lang.c:1803 +#: src/lang.c:1809 src/lang.c:1815 src/lang.c:1821 src/lang.c:1827 +#: src/lang.c:1833 src/lang.c:1839 src/lang.c:1845 src/lang.c:1851 +#: src/lang.c:1857 src/lang.c:1863 src/lang.c:1869 src/lang.c:1875 +#: src/lang.c:1881 src/lang.c:1887 src/lang.c:1893 src/lang.c:1899 +#: src/lang.c:1905 src/lang.c:1912 src/lang.c:1918 src/lang.c:1924 +#: src/lang.c:1931 src/lang.c:1942 src/lang.c:1948 src/lang.c:1954 +#: src/lang.c:1960 src/lang.c:1966 src/lang.c:1972 src/lang.c:1986 +#: src/lang.c:1998 src/lang.c:2032 src/lang.c:2084 src/lang.c:2091 +#: src/lang.c:2097 src/lang.c:2122 src/lang.c:2139 src/lang.c:2192 +#: src/lang.c:2225 src/lang.c:2245 src/lang.c:2280 src/lang.c:2289 +#: src/lang.c:2314 src/lang.c:2326 src/lang.c:2345 src/lang.c:2353 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1344 +#: src/lang.c:1347 msgid "Show mini menu & posting etiquette" msgstr "" -#: src/lang.c:1345 +#: src/lang.c:1348 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:1350 +#: src/lang.c:1353 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1351 +#: src/lang.c:1354 msgid "Show description of each newsgroup" msgstr "" -#: src/lang.c:1352 +#: src/lang.c:1355 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1357 +#: src/lang.c:1360 msgid "" "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "" -#: src/lang.c:1358 +#: src/lang.c:1361 msgid "In group menu, show author by" msgstr "" -#: src/lang.c:1359 +#: src/lang.c:1362 msgid "" "# Part of from field to display 0) none 1) address 2) full name 3) both\n" msgstr "" -#: src/lang.c:1363 +#: src/lang.c:1366 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1364 +#: src/lang.c:1367 msgid "Draw -> instead of highlighted bar" msgstr "" -#: src/lang.c:1365 +#: src/lang.c:1368 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1370 +#: src/lang.c:1373 msgid "Use inverse video for page headers" msgstr "" -#: src/lang.c:1371 +#: src/lang.c:1374 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1376 +#: src/lang.c:1379 msgid "Thread articles by" msgstr "" -#: src/lang.c:1377 +#: src/lang.c:1380 msgid "" "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" msgstr "" -#: src/lang.c:1383 +#: src/lang.c:1386 msgid "Score of a thread" msgstr "" -#: src/lang.c:1384 +#: src/lang.c:1387 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "" -#: src/lang.c:1388 +#: src/lang.c:1391 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1389 +#: src/lang.c:1392 msgid "Sort articles by" msgstr "" -#: src/lang.c:1390 +#: src/lang.c:1393 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:1396 +#: src/lang.c:1399 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1397 +#: src/lang.c:1400 msgid "Sort threads by" msgstr "" -#: src/lang.c:1398 +#: src/lang.c:1401 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" msgstr "" -#: src/lang.c:1402 +#: src/lang.c:1405 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1403 +#: src/lang.c:1406 msgid "Goto first unread article in group" msgstr "" -#: src/lang.c:1404 +#: src/lang.c:1407 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1408 +#: src/lang.c:1411 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1409 +#: src/lang.c:1412 msgid "Show only unread articles" msgstr "" -#: src/lang.c:1410 +#: src/lang.c:1413 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1415 +#: src/lang.c:1418 msgid "Show only groups with unread arts" msgstr "" -#: src/lang.c:1416 +#: src/lang.c:1419 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1421 +#: src/lang.c:1424 msgid "Filter which articles" msgstr "" -#: src/lang.c:1422 +#: src/lang.c:1425 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:1429 +#: src/lang.c:1432 msgid "Tab goes to next unread article" msgstr "" -#: src/lang.c:1430 +#: src/lang.c:1433 msgid "" "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "" -#: src/lang.c:1434 +#: src/lang.c:1437 msgid "" "Scrolling with past the end of an art. jumps to the next unread one." msgstr "" -#: src/lang.c:1435 +#: src/lang.c:1438 msgid "Space goes to next unread article" msgstr "" -#: src/lang.c:1436 +#: src/lang.c:1439 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:1441 +#: src/lang.c:1444 msgid "" "Scrolling with / past the end of an art. jumps to the unread one." msgstr "" -#: src/lang.c:1442 +#: src/lang.c:1445 msgid "PgDn goes to next unread article" msgstr "" -#: src/lang.c:1443 +#: src/lang.c:1446 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:1449 +#: src/lang.c:1452 msgid "List thread using right arrow key" msgstr "" -#: src/lang.c:1450 +#: src/lang.c:1453 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1454 +#: src/lang.c:1457 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1455 +#: src/lang.c:1458 msgid "Character to show deleted articles" msgstr "" -#: src/lang.c:1456 +#: src/lang.c:1459 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1461 +#: src/lang.c:1464 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1462 +#: src/lang.c:1465 msgid "Character to show inrange articles" msgstr "" -#: src/lang.c:1463 +#: src/lang.c:1466 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1468 +#: src/lang.c:1471 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1469 +#: src/lang.c:1472 msgid "Character to show returning arts" msgstr "" -#: src/lang.c:1470 +#: src/lang.c:1473 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1475 +#: src/lang.c:1478 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1476 +#: src/lang.c:1479 msgid "Character to show selected articles" msgstr "" -#: src/lang.c:1477 +#: src/lang.c:1480 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1482 +#: src/lang.c:1485 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1483 +#: src/lang.c:1486 msgid "Character to show recent articles" msgstr "" -#: src/lang.c:1484 +#: src/lang.c:1487 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1489 +#: src/lang.c:1492 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1490 +#: src/lang.c:1493 msgid "Character to show unread articles" msgstr "" -#: src/lang.c:1491 +#: src/lang.c:1494 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1496 +#: src/lang.c:1499 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1497 +#: src/lang.c:1500 msgid "Character to show read articles" msgstr "" -#: src/lang.c:1498 +#: src/lang.c:1501 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1503 +#: src/lang.c:1506 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1504 +#: src/lang.c:1507 msgid "Character to show killed articles" msgstr "" -#: src/lang.c:1505 +#: src/lang.c:1508 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:1510 +#: src/lang.c:1513 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1511 +#: src/lang.c:1514 msgid "Character to show readselected arts" msgstr "" -#: src/lang.c:1512 +#: src/lang.c:1515 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:1517 +#: src/lang.c:1520 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1518 +#: src/lang.c:1521 msgid "Max. length of group names shown" msgstr "" -#: src/lang.c:1519 +#: src/lang.c:1522 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1524 +#: src/lang.c:1527 msgid "Show lines/score in listings" msgstr "" -#: src/lang.c:1525 +#: src/lang.c:1528 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:1530 +#: src/lang.c:1533 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1531 +#: src/lang.c:1534 msgid "Number of lines to scroll in pager" msgstr "" -#: src/lang.c:1532 +#: src/lang.c:1535 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" @@ -4528,28 +4533,28 @@ msgid "" "# -2 = half-page scrolling\n" msgstr "" -#: src/lang.c:1539 +#: src/lang.c:1542 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1540 +#: src/lang.c:1543 msgid "Display signatures" msgstr "" -#: src/lang.c:1541 +#: src/lang.c:1544 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1545 +#: src/lang.c:1548 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1546 +#: src/lang.c:1549 msgid "Display uue data as an attachment" msgstr "" -#: src/lang.c:1547 +#: src/lang.c:1550 msgid "" "# Handling of uuencoded data in the pager\n" "# 0 = display raw uuencoded data\n" @@ -4559,30 +4564,30 @@ msgid "" "# into a tag line.\n" msgstr "" -#: src/lang.c:1556 +#: src/lang.c:1559 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1557 +#: src/lang.c:1560 msgid "Display \"a as Umlaut-a" msgstr "" -#: src/lang.c:1558 +#: src/lang.c:1561 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1563 src/lang.c:1573 +#: src/lang.c:1566 src/lang.c:1576 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1564 +#: src/lang.c:1567 msgid "Display these header fields (or *)" msgstr "" -#: src/lang.c:1565 +#: src/lang.c:1568 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" @@ -4592,11 +4597,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1574 +#: src/lang.c:1577 msgid "Do not display these header fields" msgstr "" -#: src/lang.c:1575 +#: src/lang.c:1578 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" @@ -4608,163 +4613,163 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1585 +#: src/lang.c:1588 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1586 +#: src/lang.c:1589 msgid "Skip multipart/alternative parts" msgstr "" -#: src/lang.c:1587 +#: src/lang.c:1590 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1592 +#: src/lang.c:1595 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1593 +#: src/lang.c:1596 msgid "Regex used to show quoted lines" msgstr "" -#: src/lang.c:1594 +#: src/lang.c:1597 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:1600 +#: src/lang.c:1603 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1601 +#: src/lang.c:1604 msgid "Regex used to show twice quoted l." msgstr "" -#: src/lang.c:1602 +#: src/lang.c:1605 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:1608 +#: src/lang.c:1611 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1609 +#: src/lang.c:1612 msgid "Regex used to show >= 3 times q.l." msgstr "" -#: src/lang.c:1610 +#: src/lang.c:1613 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:1617 +#: src/lang.c:1620 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1618 +#: src/lang.c:1621 msgid "Regex used to highlight /slashes/" msgstr "" -#: src/lang.c:1619 +#: src/lang.c:1622 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:1625 +#: src/lang.c:1628 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1626 +#: src/lang.c:1629 msgid "Regex used to highlight *stars*" msgstr "" -#: src/lang.c:1627 +#: src/lang.c:1630 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:1633 +#: src/lang.c:1636 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1634 +#: src/lang.c:1637 msgid "Regex used to highlight -strokes-" msgstr "" -#: src/lang.c:1635 +#: src/lang.c:1638 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:1641 +#: src/lang.c:1644 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1642 +#: src/lang.c:1645 msgid "Regex used to highlight _underline_" msgstr "" -#: src/lang.c:1643 +#: src/lang.c:1646 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:1649 +#: src/lang.c:1652 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1650 +#: src/lang.c:1653 msgid "Regex with Subject prefixes" msgstr "" -#: src/lang.c:1651 +#: src/lang.c:1654 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:1656 +#: src/lang.c:1659 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1657 +#: src/lang.c:1660 msgid "Regex with Subject suffixes" msgstr "" -#: src/lang.c:1658 +#: src/lang.c:1661 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:1663 +#: src/lang.c:1666 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1664 +#: src/lang.c:1667 msgid "MIME binary content viewer" msgstr "" -#: src/lang.c:1665 +#: src/lang.c:1668 msgid "" "# If --internal automatically use the built in MIME viewer for non-text\n" "# parts of articles.\n" @@ -4773,373 +4778,373 @@ msgid "" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:1672 +#: src/lang.c:1675 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1673 +#: src/lang.c:1676 msgid "Ask before using MIME viewer" msgstr "" -#: src/lang.c:1674 +#: src/lang.c:1677 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:1679 +#: src/lang.c:1682 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1680 +#: src/lang.c:1683 msgid "Catchup read groups when quitting" msgstr "" -#: src/lang.c:1681 +#: src/lang.c:1684 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1689 msgid "Catchup group using left key" msgstr "" -#: src/lang.c:1687 +#: src/lang.c:1690 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1692 +#: src/lang.c:1695 msgid "Catchup thread by using left key" msgstr "" -#: src/lang.c:1698 +#: src/lang.c:1701 msgid "Which actions require confirmation" msgstr "" -#: src/lang.c:1699 +#: src/lang.c:1702 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1704 +#: src/lang.c:1707 msgid "'Mark article read' ignores tags" msgstr "" -#: src/lang.c:1705 +#: src/lang.c:1708 msgid "" "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1709 +#: src/lang.c:1712 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1710 +#: src/lang.c:1713 msgid "Program that opens URL's" msgstr "" -#: src/lang.c:1711 +#: src/lang.c:1714 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1716 +#: src/lang.c:1719 msgid "Use mouse in xterm" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1720 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1723 +#: src/lang.c:1726 msgid "Use scroll keys on keypad" msgstr "" -#: src/lang.c:1724 +#: src/lang.c:1727 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1729 +#: src/lang.c:1732 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1730 +#: src/lang.c:1733 msgid "Number of articles to get" msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1734 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:1736 +#: src/lang.c:1739 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1740 msgid "Article recentness time limit" msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1741 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1742 +#: src/lang.c:1745 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1743 +#: src/lang.c:1746 msgid "Wildcard matching" msgstr "" -#: src/lang.c:1744 +#: src/lang.c:1747 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1748 +#: src/lang.c:1751 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1749 +#: src/lang.c:1752 msgid "Score limit (kill)" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1753 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1754 +#: src/lang.c:1757 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1755 +#: src/lang.c:1758 msgid "Default score to kill articles" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1759 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1760 +#: src/lang.c:1763 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1761 +#: src/lang.c:1764 msgid "Score limit (select)" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1765 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1766 +#: src/lang.c:1769 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1767 +#: src/lang.c:1770 msgid "Default score to select articles" msgstr "" -#: src/lang.c:1768 +#: src/lang.c:1771 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1774 +#: src/lang.c:1777 msgid "Use slrnface to show ''X-Face:''s" msgstr "" -#: src/lang.c:1775 +#: src/lang.c:1778 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:1783 +#: src/lang.c:1786 msgid "Use ANSI color" msgstr "" -#: src/lang.c:1784 +#: src/lang.c:1787 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:1789 +#: src/lang.c:1792 msgid "Standard foreground color" msgstr "" -#: src/lang.c:1790 +#: src/lang.c:1793 msgid "# Standard foreground color\n" msgstr "" -#: src/lang.c:1795 +#: src/lang.c:1798 msgid "Standard background color" msgstr "" -#: src/lang.c:1796 +#: src/lang.c:1799 msgid "# Standard-Background-Color\n" msgstr "" -#: src/lang.c:1801 +#: src/lang.c:1804 msgid "Color for inverse text (background)" msgstr "" -#: src/lang.c:1802 +#: src/lang.c:1805 msgid "# Color of background for inverse text\n" msgstr "" -#: src/lang.c:1807 +#: src/lang.c:1810 msgid "Color for inverse text (foreground)" msgstr "" -#: src/lang.c:1808 +#: src/lang.c:1811 msgid "# Color of foreground for inverse text\n" msgstr "" -#: src/lang.c:1813 +#: src/lang.c:1816 msgid "Color of text lines" msgstr "" -#: src/lang.c:1814 +#: src/lang.c:1817 msgid "# Color of text-lines\n" msgstr "" -#: src/lang.c:1819 +#: src/lang.c:1822 msgid "Color of mini help menu" msgstr "" -#: src/lang.c:1820 +#: src/lang.c:1823 msgid "# Color of mini help menu\n" msgstr "" -#: src/lang.c:1825 +#: src/lang.c:1828 msgid "Color of help text" msgstr "" -#: src/lang.c:1826 +#: src/lang.c:1829 msgid "# Color of help pages\n" msgstr "" -#: src/lang.c:1831 +#: src/lang.c:1834 msgid "Color of status messages" msgstr "" -#: src/lang.c:1832 +#: src/lang.c:1835 msgid "# Color of messages in last line\n" msgstr "" -#: src/lang.c:1837 +#: src/lang.c:1840 msgid "Color of quoted lines" msgstr "" -#: src/lang.c:1838 +#: src/lang.c:1841 msgid "# Color of quote-lines\n" msgstr "" -#: src/lang.c:1843 +#: src/lang.c:1846 msgid "Color of twice quoted line" msgstr "" -#: src/lang.c:1844 +#: src/lang.c:1847 msgid "# Color of twice quoted lines\n" msgstr "" -#: src/lang.c:1849 +#: src/lang.c:1852 msgid "Color of =>3 times quoted line" msgstr "" -#: src/lang.c:1850 +#: src/lang.c:1853 msgid "# Color of >=3 times quoted lines\n" msgstr "" -#: src/lang.c:1855 +#: src/lang.c:1858 msgid "Color of article header lines" msgstr "" -#: src/lang.c:1856 +#: src/lang.c:1859 msgid "# Color of header-lines\n" msgstr "" -#: src/lang.c:1861 +#: src/lang.c:1864 msgid "Color of actual news header fields" msgstr "" -#: src/lang.c:1862 +#: src/lang.c:1865 msgid "# Color of actual news header fields\n" msgstr "" -#: src/lang.c:1867 +#: src/lang.c:1870 msgid "Color of article subject lines" msgstr "" -#: src/lang.c:1868 +#: src/lang.c:1871 msgid "# Color of article subject\n" msgstr "" -#: src/lang.c:1873 +#: src/lang.c:1876 msgid "Color of response counter" msgstr "" -#: src/lang.c:1874 +#: src/lang.c:1877 msgid "# Color of response counter\n" msgstr "" -#: src/lang.c:1879 +#: src/lang.c:1882 msgid "Color of sender (From:)" msgstr "" -#: src/lang.c:1880 +#: src/lang.c:1883 msgid "# Color of sender (From:)\n" msgstr "" -#: src/lang.c:1885 +#: src/lang.c:1888 msgid "Color of help/mail sign" msgstr "" -#: src/lang.c:1886 +#: src/lang.c:1889 msgid "# Color of Help/Mail-Sign\n" msgstr "" -#: src/lang.c:1891 +#: src/lang.c:1894 msgid "Color of signatures" msgstr "" -#: src/lang.c:1892 +#: src/lang.c:1895 msgid "# Color of signature\n" msgstr "" -#: src/lang.c:1897 +#: src/lang.c:1900 msgid "Color of highlighted URLs" msgstr "" -#: src/lang.c:1898 +#: src/lang.c:1901 msgid "# Color of highlighted URLs\n" msgstr "" -#: src/lang.c:1903 +#: src/lang.c:1906 msgid "Color of highlighting with *stars*" msgstr "" -#: src/lang.c:1904 +#: src/lang.c:1907 msgid "" "# Color of word highlighting. There are four possibilities\n" "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" msgstr "" -#: src/lang.c:1910 +#: src/lang.c:1913 msgid "Color of highlighting with _dash_" msgstr "" -#: src/lang.c:1916 +#: src/lang.c:1919 msgid "Color of highlighting with /slash/" msgstr "" -#: src/lang.c:1922 +#: src/lang.c:1925 msgid "Color of highlighting with -stroke-" msgstr "" -#: src/lang.c:1929 +#: src/lang.c:1932 msgid "Attr. of highlighting with *stars*" msgstr "" -#: src/lang.c:1930 +#: src/lang.c:1933 msgid "" "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" @@ -5149,95 +5154,95 @@ msgid "" "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1943 msgid "Attr. of highlighting with _dash_" msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1949 msgid "Attr. of highlighting with /slash/" msgstr "" -#: src/lang.c:1952 +#: src/lang.c:1955 msgid "Attr. of highlighting with -stroke-" msgstr "" -#: src/lang.c:1958 +#: src/lang.c:1961 msgid "URL highlighting in message body" msgstr "" -#: src/lang.c:1959 +#: src/lang.c:1962 msgid "# Enable URL highlighting?\n" msgstr "" -#: src/lang.c:1964 +#: src/lang.c:1967 msgid "Word highlighting in message body" msgstr "" -#: src/lang.c:1965 +#: src/lang.c:1968 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1970 +#: src/lang.c:1973 msgid "What to display instead of mark" msgstr "" -#: src/lang.c:1971 +#: src/lang.c:1974 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:1977 +#: src/lang.c:1980 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1978 +#: src/lang.c:1981 msgid "Page line wrap column" msgstr "" -#: src/lang.c:1979 +#: src/lang.c:1982 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1984 +#: src/lang.c:1987 msgid "Wrap around threads on next unread" msgstr "" -#: src/lang.c:1985 +#: src/lang.c:1988 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1989 +#: src/lang.c:1992 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1990 +#: src/lang.c:1993 msgid "Mail address (and fullname)" msgstr "" -#: src/lang.c:1991 +#: src/lang.c:1994 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:1996 +#: src/lang.c:1999 msgid "Show empty Followup-To in editor" msgstr "" -#: src/lang.c:1997 +#: src/lang.c:2000 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:2001 +#: src/lang.c:2004 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:2002 +#: src/lang.c:2005 msgid "Create signature from path/command" msgstr "" -#: src/lang.c:2003 +#: src/lang.c:2006 msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" "# default_sigfile=file appends file as signature\n" @@ -5246,50 +5251,50 @@ msgid "" "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:2010 +#: src/lang.c:2013 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:2011 +#: src/lang.c:2014 msgid "Prepend signature with \"-- \"" msgstr "" -#: src/lang.c:2012 +#: src/lang.c:2015 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:2016 +#: src/lang.c:2019 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:2017 +#: src/lang.c:2020 msgid "Add signature when reposting" msgstr "" -#: src/lang.c:2018 +#: src/lang.c:2021 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:2022 +#: src/lang.c:2025 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:2023 +#: src/lang.c:2026 msgid "Characters used as quote-marks" msgstr "" -#: src/lang.c:2024 +#: src/lang.c:2027 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:2030 +#: src/lang.c:2033 msgid "Quoting behavior" msgstr "" -#: src/lang.c:2031 +#: src/lang.c:2034 msgid "" "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" @@ -5302,52 +5307,52 @@ msgid "" "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2043 src/lang.c:2051 src/lang.c:2057 +#: src/lang.c:2046 src/lang.c:2054 src/lang.c:2060 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2044 +#: src/lang.c:2047 msgid "Quote line when following up" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2048 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:2052 +#: src/lang.c:2055 msgid "Quote line when cross-posting" msgstr "" -#: src/lang.c:2058 +#: src/lang.c:2061 msgid "Quote line when mailing" msgstr "" -#: src/lang.c:2063 +#: src/lang.c:2066 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2064 +#: src/lang.c:2067 msgid "Insert 'User-Agent:'-header" msgstr "" -#: src/lang.c:2065 +#: src/lang.c:2068 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2069 +#: src/lang.c:2073 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2070 +#: src/lang.c:2074 msgid "MM_CHARSET" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2075 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -5357,27 +5362,27 @@ msgid "" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2082 +#: src/lang.c:2085 msgid "MM_NETWORK_CHARSET" msgstr "" -#: src/lang.c:2083 +#: src/lang.c:2086 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2089 +#: src/lang.c:2092 msgid "Mailbox format" msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2093 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2095 +#: src/lang.c:2098 msgid "MIME encoding in news messages" msgstr "" -#: src/lang.c:2096 +#: src/lang.c:2099 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" @@ -5386,15 +5391,15 @@ msgid "" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2104 src/lang.c:2125 +#: src/lang.c:2107 src/lang.c:2128 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2105 +#: src/lang.c:2108 msgid "Use 8bit characters in news headers" msgstr "" -#: src/lang.c:2106 +#: src/lang.c:2109 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -5402,28 +5407,28 @@ msgid "" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" -#: src/lang.c:2113 +#: src/lang.c:2116 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2114 +#: src/lang.c:2117 msgid "View post-processed files" msgstr "" -#: src/lang.c:2115 +#: src/lang.c:2118 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2120 +#: src/lang.c:2123 msgid "MIME encoding in mail messages" msgstr "" -#: src/lang.c:2126 +#: src/lang.c:2129 msgid "Use 8bit characters in mail headers" msgstr "" -#: src/lang.c:2127 +#: src/lang.c:2130 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -5434,278 +5439,278 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2137 +#: src/lang.c:2140 msgid "Strip blanks from ends of lines" msgstr "" -#: src/lang.c:2138 +#: src/lang.c:2141 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2143 +#: src/lang.c:2146 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2144 +#: src/lang.c:2147 msgid "Transliteration" msgstr "" -#: src/lang.c:2145 +#: src/lang.c:2148 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:2152 +#: src/lang.c:2155 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2153 +#: src/lang.c:2156 msgid "Send you a cc automatically" msgstr "" -#: src/lang.c:2154 +#: src/lang.c:2157 msgid "" "# If ON automatically put your name in the Cc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2158 +#: src/lang.c:2161 msgid "" "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2159 +#: src/lang.c:2162 msgid "Send you a blind cc automatically" msgstr "" -#: src/lang.c:2160 +#: src/lang.c:2163 msgid "" "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2164 +#: src/lang.c:2167 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2165 +#: src/lang.c:2168 msgid "Spamtrap warning address parts" msgstr "" -#: src/lang.c:2166 +#: src/lang.c:2169 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:2171 +#: src/lang.c:2174 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2172 +#: src/lang.c:2175 msgid "No. of days a filter entry is valid" msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2176 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2177 +#: src/lang.c:2180 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2178 +#: src/lang.c:2181 msgid "Add posted articles to filter" msgstr "" -#: src/lang.c:2179 +#: src/lang.c:2182 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2183 +#: src/lang.c:2186 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2184 +#: src/lang.c:2187 msgid "Mail directory" msgstr "" -#: src/lang.c:2185 +#: src/lang.c:2188 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2190 +#: src/lang.c:2193 msgid "Save articles in batch mode (-S)" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2194 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:2196 +#: src/lang.c:2199 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2197 +#: src/lang.c:2200 msgid "Directory to save arts/threads in" msgstr "" -#: src/lang.c:2198 +#: src/lang.c:2201 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2202 +#: src/lang.c:2205 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" -#: src/lang.c:2203 +#: src/lang.c:2206 msgid "Use Archive-name: header for save" msgstr "" -#: src/lang.c:2204 +#: src/lang.c:2207 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:2209 +#: src/lang.c:2212 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2210 +#: src/lang.c:2213 msgid "Mark saved articles/threads as read" msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2214 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2215 +#: src/lang.c:2218 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2216 +#: src/lang.c:2219 msgid "Post process saved articles" msgstr "" -#: src/lang.c:2217 +#: src/lang.c:2220 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:2223 +#: src/lang.c:2226 msgid "Process only unread articles" msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2227 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" -#: src/lang.c:2229 +#: src/lang.c:2232 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2230 +#: src/lang.c:2233 msgid "Print all headers when printing" msgstr "" -#: src/lang.c:2231 +#: src/lang.c:2234 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2235 +#: src/lang.c:2238 msgid "" "The printer program with options that is to be used to print " "articles/threads." msgstr "" -#: src/lang.c:2236 +#: src/lang.c:2239 msgid "Printer program with options" msgstr "" -#: src/lang.c:2237 +#: src/lang.c:2240 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2243 +#: src/lang.c:2246 msgid "Force redraw after certain commands" msgstr "" -#: src/lang.c:2244 +#: src/lang.c:2247 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2248 +#: src/lang.c:2251 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2249 +#: src/lang.c:2252 msgid "Start editor with line offset" msgstr "" -#: src/lang.c:2250 +#: src/lang.c:2253 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:2255 +#: src/lang.c:2258 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2256 +#: src/lang.c:2259 msgid "Invocation of your editor" msgstr "" -#: src/lang.c:2257 +#: src/lang.c:2260 msgid "" "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2262 +#: src/lang.c:2265 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2263 +#: src/lang.c:2266 msgid "External inews" msgstr "" -#: src/lang.c:2264 +#: src/lang.c:2267 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:2268 +#: src/lang.c:2271 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2269 +#: src/lang.c:2272 msgid "Invocation of your mail command" msgstr "" -#: src/lang.c:2270 +#: src/lang.c:2273 msgid "" "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename\n" @@ -5713,11 +5718,11 @@ msgid "" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" msgstr "" -#: src/lang.c:2278 +#: src/lang.c:2281 msgid "Use interactive mail reader" msgstr "" -#: src/lang.c:2279 +#: src/lang.c:2282 msgid "" "# Interactive mailreader:\n" "# 0 = no interactive mailreader\n" @@ -5725,136 +5730,136 @@ msgid "" "# 2 = use interactive mailreader without headers in file\n" msgstr "" -#: src/lang.c:2287 +#: src/lang.c:2290 msgid "Remove ~/.article after posting" msgstr "" -#: src/lang.c:2288 +#: src/lang.c:2291 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2292 +#: src/lang.c:2295 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2293 +#: src/lang.c:2296 msgid "Filename for posted articles" msgstr "" -#: src/lang.c:2294 +#: src/lang.c:2297 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:2299 +#: src/lang.c:2302 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2303 msgid "Keep failed arts in ~/dead.articles" msgstr "" -#: src/lang.c:2301 +#: src/lang.c:2304 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2305 +#: src/lang.c:2308 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2306 +#: src/lang.c:2309 msgid "No unsubscribed groups in newsrc" msgstr "" -#: src/lang.c:2307 +#: src/lang.c:2310 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2312 +#: src/lang.c:2315 msgid "Remove bogus groups from newsrc" msgstr "" -#: src/lang.c:2313 +#: src/lang.c:2316 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:2317 +#: src/lang.c:2320 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2318 +#: src/lang.c:2321 msgid "Interval in secs to reread active" msgstr "" -#: src/lang.c:2319 +#: src/lang.c:2322 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2324 +#: src/lang.c:2327 msgid "Reconnect to server automatically" msgstr "" -#: src/lang.c:2325 +#: src/lang.c:2328 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2329 +#: src/lang.c:2332 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2330 +#: src/lang.c:2333 msgid "Cache NNTP overview files locally" msgstr "" -#: src/lang.c:2331 +#: src/lang.c:2334 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" -#: src/lang.c:2335 +#: src/lang.c:2338 msgid "Enter format string. sets, cancels." msgstr "" -#: src/lang.c:2336 +#: src/lang.c:2339 msgid "Format string for display of dates" msgstr "" -#: src/lang.c:2337 +#: src/lang.c:2340 msgid "# Format string for date representation\n" msgstr "" -#: src/lang.c:2343 +#: src/lang.c:2346 msgid "Unicode normalization form" msgstr "" -#: src/lang.c:2344 +#: src/lang.c:2347 msgid "" "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" -#: src/lang.c:2351 +#: src/lang.c:2354 msgid "Render BiDi" msgstr "" -#: src/lang.c:2352 +#: src/lang.c:2355 msgid "# If ON, bi-directional text is rendered by tin\n" msgstr "" -#: src/main.c:590 +#: src/misc.c:3711 #, c-format -msgid "Version: %s release %s (\"%s\") %s %s" +msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/main.c:593 +#: src/misc.c:3714 #, c-format -msgid "Version: %s release %s (\"%s\")" +msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" #: src/newsrc.c:432 @@ -5887,7 +5892,7 @@ msgstr "" msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1951 +#: src/post.c:1962 #, c-format msgid "Posting: %.*s ..." msgstr "" @@ -5928,19 +5933,19 @@ msgid "" "\n" msgstr "" -#: src/save.c:967 +#: src/save.c:974 msgid "bytes" msgstr "" -#: src/select.c:351 +#: src/select.c:352 msgid "unread" msgstr "" -#: src/select.c:351 +#: src/select.c:352 msgid "all" msgstr "" -#: src/select.c:529 src/select.c:531 +#: src/select.c:530 src/select.c:532 msgid " R" msgstr "" diff -Nurp tin-1.7.5/src/Makefile.in tin-1.7.6/src/Makefile.in --- tin-1.7.5/src/Makefile.in 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/Makefile.in 2004-09-06 10:58:27.000000000 +0200 @@ -1,7 +1,7 @@ # Source Makefile for tin # - for configuration options read the ../doc/INSTALL file. # -# Updated: 2004-01-28 +# Updated: 2004-09-06 # # Copyright (c) 1995-2004 Thomas E. Dickey # All rights reserved. @@ -170,6 +170,7 @@ CFILES = \ $(SRCDIR)/newsrc.c \ $(SRCDIR)/nntplib.c \ $(SRCDIR)/nrctbl.c \ + $(SRCDIR)/options_menu.c \ $(SRCDIR)/page.c \ $(SRCDIR)/parsdate.y \ $(SRCDIR)/pgp.c \ @@ -244,6 +245,7 @@ OFILES = @ALLOCA@ $(EXTRAOBJS) \ $(OBJDIR)/newsrc$o \ $(OBJDIR)/nntplib$o \ $(OBJDIR)/nrctbl$o \ + $(OBJDIR)/options_menu$o \ $(OBJDIR)/page$o \ $(OBJDIR)/parsdate$o \ $(OBJDIR)/pgp$o \ @@ -488,8 +490,6 @@ $(OBJDIR)/auth$o : $(SRCDIR)/auth.c $(T $(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) \ @@ -538,7 +538,8 @@ $(OBJDIR)/memory$o : $(SRCDIR)/memory.c $(OBJDIR)/mimetypes$o : $(SRCDIR)/mimetypes.c $(TIN_DEP) $(OBJDIR)/misc$o : $(SRCDIR)/misc.c $(TIN_DEP) \ $(INCDIR)/policy.h \ - $(INCDIR)/rfc2046.h + $(INCDIR)/rfc2046.h \ + $(INCDIR)/version.h $(OBJDIR)/my_tmpfile$o : $(SRCDIR)/my_tmpfile.c $(TIN_DEP) $(OBJDIR)/newsrc$o : $(SRCDIR)/newsrc.c $(TIN_DEP) \ $(INCDIR)/newsrc.h \ @@ -548,6 +549,9 @@ $(OBJDIR)/nntplib$o : $(SRCDIR)/nntplib $(OBJDIR)/nrctbl$o : $(SRCDIR)/nrctbl.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/version.h +$(OBJDIR)/options_menu$o : $(SRCDIR)/options_menu.c $(TIN_DEP) \ + tincfg.h \ + $(INCDIR)/menukeys.h $(OBJDIR)/page$o : $(SRCDIR)/page.c $(TIN_DEP) \ $(INCDIR)/menukeys.h \ $(INCDIR)/rfc2046.h diff -Nurp tin-1.7.5/src/active.c tin-1.7.6/src/active.c --- tin-1.7.5/src/active.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/active.c 2004-09-06 10:45:21.000000000 +0200 @@ -3,7 +3,7 @@ * Module : active.c * Author : I. Lea * Created : 1992-02-16 - * Updated : 2004-03-16 + * Updated : 2004-06-30 * Notes : * * Copyright (c) 1992-2004 Iain Lea @@ -141,8 +141,8 @@ active_add( const char *moderated) { /* name - pre-initialised when group is made */ - ptr->aliasedto = ((moderated[0] == '=') ? my_strdup(moderated + 1) : (char *) 0); - ptr->description = (char *) 0; + ptr->aliasedto = ((moderated[0] == '=') ? my_strdup(moderated + 1) : NULL); + ptr->description = NULL; /* spool - see below */ ptr->moderated = moderated[0]; ptr->count = count; @@ -460,7 +460,7 @@ static void read_active_file( void) { - FILE *fp = NULL; + FILE *fp; char *ptr; char moderated[PATH_LEN]; long count = -1L, min = 1L, max = 0L; @@ -546,7 +546,7 @@ void read_news_active_file( void) { - FILE *fp = NULL; + FILE *fp; /* * Ignore -n if no .newsrc can be found or .newsrc is empty @@ -851,7 +851,7 @@ load_newnews_info( */ if (!num_newnews) { for (i = 0; i < max_newnews; i++) { - newnews[i].host = (char *) 0; + newnews[i].host = NULL; newnews[i].time = (time_t) 0; } } diff -Nurp tin-1.7.5/src/art.c tin-1.7.6/src/art.c --- tin-1.7.5/src/art.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/art.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : art.c * Author : I.Lea & R.Skrenta * Created : 1991-04-01 - * Updated : 2004-05-27 + * Updated : 2004-08-16 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -64,16 +64,21 @@ static char *print_date(time_t secs); static char *print_from(struct t_article *article); static int artnum_comp(t_comptype p1, t_comptype p2); static int base_comp(t_comptype p1, t_comptype p2); -static int date_comp(t_comptype p1, t_comptype p2); -static int from_comp(t_comptype p1, t_comptype p2); +static int date_comp_asc(t_comptype p1, t_comptype p2); +static int date_comp_desc(t_comptype p1, t_comptype p2); +static int from_comp_asc(t_comptype p1, t_comptype p2); +static int from_comp_desc(t_comptype p1, t_comptype p2); static int global_get_multiparts(int aindex, MultiPartInfo **malloc_and_setme_info); static int global_look_for_multipart_info(int aindex, MultiPartInfo *setme, char start, char stop, int *offset); -static int lines_comp(t_comptype p1, t_comptype p2); +static int lines_comp_asc(t_comptype p1, t_comptype p2); +static int lines_comp_desc(t_comptype p1, t_comptype p2); static int read_art_headers(struct t_group *group, int total, long top); static int read_overview(struct t_group *group, long min, long max, long *top, t_bool local); -static int score_comp(t_comptype p1, t_comptype p2); +static int score_comp_asc(t_comptype p1, t_comptype p2); +static int score_comp_desc(t_comptype p1, t_comptype p2); static int score_comp_base(t_comptype p1, t_comptype p2); -static int subj_comp(t_comptype p1, t_comptype p2); +static int subj_comp_asc(t_comptype p1, t_comptype p2); +static int subj_comp_desc(t_comptype p1, t_comptype p2); static int valid_artnum(long art); static long find_first_unread(struct t_group *group); static long setup_hard_base(struct t_group *group); @@ -976,13 +981,16 @@ make_threads( /* Should never happen if tree is built properly */ if (arts[i].refptr == 0) { +#ifdef DEBUG my_fprintf(stderr, "\nError : art->refptr is NULL\n"); my_fprintf(stderr, "Artnum : %ld\n", arts[i].artnum); my_fprintf(stderr, "Subject: %s\n", arts[i].subject); my_fprintf(stderr, "From : %s\n", arts[i].from); + assert(arts[i].refptr != 0); +#else + continue; +#endif /* DEBUG */ } - assert(arts[i].refptr != 0); - arts[i].refptr->article = i; } } @@ -1031,24 +1039,34 @@ eval_sort_arts_func( return artnum_comp; case SORT_ARTICLES_BY_SUBJ_DESCEND: + return subj_comp_desc; + case SORT_ARTICLES_BY_SUBJ_ASCEND: - return subj_comp; + return subj_comp_asc; case SORT_ARTICLES_BY_FROM_DESCEND: + return from_comp_desc; + case SORT_ARTICLES_BY_FROM_ASCEND: - return from_comp; + return from_comp_asc; case SORT_ARTICLES_BY_DATE_DESCEND: + return date_comp_desc; + case SORT_ARTICLES_BY_DATE_ASCEND: - return date_comp; + return date_comp_asc; case SORT_ARTICLES_BY_SCORE_DESCEND: + return score_comp_desc; + case SORT_ARTICLES_BY_SCORE_ASCEND: - return score_comp; + return score_comp_asc; case SORT_ARTICLES_BY_LINES_DESCEND: + return lines_comp_desc; + case SORT_ARTICLES_BY_LINES_ASCEND: - return lines_comp; + return lines_comp_asc; default: break; @@ -1162,9 +1180,9 @@ parse_headers( if (!got_from) { if ((hdr = parse_header(ptr + 1, "rom", FALSE, FALSE))) { h->gnksa_code = parse_from(hdr, art_from_addr, art_full_name); - h->from = hash_str(art_from_addr); + h->from = hash_str(buffer_to_ascii(art_from_addr)); if (*art_full_name) - h->name = hash_str(eat_tab(rfc1522_decode(art_full_name))); + h->name = hash_str(eat_tab(convert_to_printable(rfc1522_decode(art_full_name)))); got_from = TRUE; } } @@ -1210,7 +1228,7 @@ parse_headers( case 'S': /* Subject: mandatory */ if (!h->subject) { if ((hdr = parse_header(ptr + 1, "ubject", FALSE, FALSE))) { - strncpy(art_trunc_subj, eat_re(eat_tab(rfc1522_decode(hdr)), FALSE), sizeof(art_trunc_subj) - 1); + strncpy(art_trunc_subj, eat_re(eat_tab(convert_to_printable(rfc1522_decode(hdr))), FALSE), sizeof(art_trunc_subj) - 1); h->subject = hash_str(art_trunc_subj); } } @@ -1367,16 +1385,15 @@ read_overview( for (count = 1; (ptr = tin_strtok(NULL, "\t")) != NULL; count++) { switch (count) { case 1: /* Subject */ - /* buffer_to_ascii() is correct but might confuse too many ppl. */ - art->subject = hash_str(eat_re(eat_tab(rfc1522_decode(/*buffer_to_ascii(*/ptr/*)*/)), FALSE)); + art->subject = hash_str(eat_re(eat_tab(convert_to_printable(rfc1522_decode(ptr))), FALSE)); break; case 2: /* From */ art->gnksa_code = parse_from(ptr, art_from_addr, art_full_name); - art->from = hash_str(art_from_addr); + art->from = hash_str(buffer_to_ascii(art_from_addr)); if (*art_full_name) - art->name = hash_str(eat_tab(rfc1522_decode(buffer_to_ascii(art_full_name)))); + art->name = hash_str(eat_tab(convert_to_printable(rfc1522_decode(art_full_name)))); break; case 3: /* Date */ @@ -1769,6 +1786,13 @@ do_update( */ for (i = 0; i < selmenu.max; i++) { group = &active[my_group[i]]; + /* + * FIXME: workaround to get a valid CURR_GROUP + * it also points to the currently processed group so that + * the correct attributes are used + * The correct fix is to get rid of CURR_GROUP + */ + selmenu.curr = i; if (group->bogus || !group->subscribed) continue; @@ -1821,8 +1845,11 @@ artnum_comp( } +/* + * return result of strcmp (reversed for descending) + */ static int -subj_comp( +subj_comp_asc( t_comptype p1, t_comptype p2) { @@ -1830,19 +1857,15 @@ subj_comp( const struct t_article *s1 = (const struct t_article *) p1; const struct t_article *s2 = (const struct t_article *) p2; - /* - * return result of strcmp(reversed for descending) - */ - return (CURR_GROUP.attribute->sort_art_type == SORT_ARTICLES_BY_SUBJ_ASCEND - ? (retval = strcasecmp(s1->subject, s2->subject)) - ? retval : ((s1->date - s2->date) > 0) ? 1 : -1 - : (retval = strcasecmp(s2->subject, s1->subject)) - ? retval : ((s1->date - s2->date) > 0) ? 1 : -1); + if ((retval = strcasecmp(s1->subject, s2->subject))) /* != 0 */ + return retval; + + return s1->date - s2->date > 0 ? 1 : -1; } static int -from_comp( +subj_comp_desc( t_comptype p1, t_comptype p2) { @@ -1850,14 +1873,45 @@ from_comp( const struct t_article *s1 = (const struct t_article *) p1; const struct t_article *s2 = (const struct t_article *) p2; - /* - * return result of strcmp(reversed for descending) - */ - return (CURR_GROUP.attribute->sort_art_type == SORT_ARTICLES_BY_FROM_ASCEND - ? (retval = strcasecmp(s1->from, s2->from)) - ? retval : ((s1->date - s2->date) > 0) ? 1 : -1 - : (retval = strcasecmp(s2->from, s1->from)) - ? retval : ((s1->date - s2->date) > 0) ? 1 : -1); + if ((retval = strcasecmp(s2->subject, s1->subject))) /* != 0 */ + return retval; + + return s1->date - s2->date > 0 ? 1 : -1; +} + + +/* + * return result of strcmp (reversed for descending) + */ +static int +from_comp_asc( + t_comptype p1, + t_comptype p2) +{ + int retval; + const struct t_article *s1 = (const struct t_article *) p1; + const struct t_article *s2 = (const struct t_article *) p2; + + if ((retval = strcasecmp(s1->from, s2->from))) /* != 0 */ + return retval; + + return s1->date - s2->date > 0 ? 1 : -1; +} + + +static int +from_comp_desc( + t_comptype p1, + t_comptype p2) +{ + int retval; + const struct t_article *s1 = (const struct t_article *) p1; + const struct t_article *s2 = (const struct t_article *) p2; + + if ((retval = strcasecmp(s2->from, s1->from))) /* != 0 */ + return retval; + + return s1->date - s2->date > 0 ? 1 : -1; } @@ -1871,38 +1925,49 @@ from_comp( * is reversed. */ static int -date_comp( +date_comp_asc( t_comptype p1, t_comptype p2) { const struct t_article *s1 = (const struct t_article *) p1; const struct t_article *s2 = (const struct t_article *) p2; - if (CURR_GROUP.attribute->sort_art_type == SORT_ARTICLES_BY_DATE_ASCEND) { - /* - * s1->date less than s2->date - */ - if (s1->date < s2->date) - return -1; + /* + * s1->date less than s2->date + */ + if (s1->date < s2->date) + return -1; - /* - * s1->date greater than s2->date - */ - if (s1->date > s2->date) - return 1; - } else { - /* - * s2->date less than s1->date - */ - if (s2->date < s1->date) - return -1; + /* + * s1->date greater than s2->date + */ + if (s1->date > s2->date) + return 1; + + return 0; +} + + +static int +date_comp_desc( + t_comptype p1, + t_comptype p2) +{ + const struct t_article *s1 = (const struct t_article *) p1; + const struct t_article *s2 = (const struct t_article *) p2; + + /* + * s2->date less than s1->date + */ + if (s2->date < s1->date) + return -1; + + /* + * s2->date greater than s1->date + */ + if (s2->date > s1->date) + return 1; - /* - * s2->date greater than s1->date - */ - if (s2->date > s1->date) - return 1; - } return 0; } @@ -1911,26 +1976,37 @@ date_comp( * Same again, but for art[].score */ static int -score_comp( +score_comp_asc( t_comptype p1, t_comptype p2) { const struct t_article *s1 = (const struct t_article *) p1; const struct t_article *s2 = (const struct t_article *) p2; - if (CURR_GROUP.attribute->sort_art_type == SORT_ARTICLES_BY_SCORE_ASCEND) { - if (s1->score < s2->score) - return -1; + if (s1->score < s2->score) + return -1; - if (s1->score > s2->score) - return 1; - } else { - if (s2->score < s1->score) - return -1; + if (s1->score > s2->score) + return 1; + + return s1->date - s2->date > 0 ? 1 : -1; +} + + +static int +score_comp_desc( + t_comptype p1, + t_comptype p2) +{ + const struct t_article *s1 = (const struct t_article *) p1; + const struct t_article *s2 = (const struct t_article *) p2; + + if (s2->score < s1->score) + return -1; + + if (s2->score > s1->score) + return 1; - if (s2->score > s1->score) - return 1; - } return s1->date - s2->date > 0 ? 1 : -1; } @@ -1939,26 +2015,37 @@ score_comp( * Same again, but for art[].line_count */ static int -lines_comp( +lines_comp_asc( t_comptype p1, t_comptype p2) { const struct t_article *s1 = (const struct t_article *) p1; const struct t_article *s2 = (const struct t_article *) p2; - if (CURR_GROUP.attribute->sort_art_type == SORT_ARTICLES_BY_LINES_ASCEND) { - if (s1->line_count < s2->line_count) - return -1; + if (s1->line_count < s2->line_count) + return -1; - if (s1->line_count > s2->line_count) - return 1; - } else { - if (s2->line_count < s1->line_count) - return -1; + if (s1->line_count > s2->line_count) + return 1; + + return s1->date - s2->date > 0 ? 1 : -1; +} + + +static int +lines_comp_desc( + t_comptype p1, + t_comptype p2) +{ + const struct t_article *s1 = (const struct t_article *) p1; + const struct t_article *s2 = (const struct t_article *) p2; + + if (s2->line_count < s1->line_count) + return -1; + + if (s2->line_count > s1->line_count) + return 1; - if (s2->line_count > s1->line_count) - return 1; - } return s1->date - s2->date > 0 ? 1 : -1; } diff -Nurp tin-1.7.5/src/attrib.c tin-1.7.6/src/attrib.c --- tin-1.7.5/src/attrib.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/attrib.c 2004-08-20 10:30:49.000000000 +0200 @@ -80,7 +80,7 @@ enum { ATTRIB_MAILING_LIST, ATTRIB_X_HEADERS, ATTRIB_X_BODY, - ATTRIB_AUTO_SAVE_MSG, + ATTRIB_AUTO_SAVE_MSG, /* TODO: what is this? dublicate of ATTRIB_AUTO_SAVE? */ ATTRIB_X_COMMENT_TO, ATTRIB_FCC, ATTRIB_NEWS_QUOTE, @@ -128,25 +128,25 @@ set_default_attributes( attributes->global = FALSE; /* global/group specific */ attributes->maildir = tinrc.maildir; attributes->savedir = tinrc.savedir; - attributes->savefile = (char *) 0; + attributes->savefile = NULL; attributes->sigfile = tinrc.sigfile; - attributes->organization = (*default_organization ? default_organization : (char *) 0); - attributes->followup_to = (char *) 0; - attributes->mailing_list = (char *) 0; - attributes->x_headers = (char *) 0; - attributes->x_body = (char *) 0; + attributes->organization = (*default_organization ? default_organization : NULL); + attributes->followup_to = NULL; + attributes->mailing_list = NULL; + attributes->x_headers = NULL; + attributes->x_body = NULL; attributes->from = tinrc.mail_address; attributes->news_quote_format = tinrc.news_quote_format; attributes->quote_chars = tinrc.quote_chars; attributes->mime_types_to_save = my_strdup("*/*"); #ifdef HAVE_ISPELL - attributes->ispell = (char *) 0; + attributes->ispell = NULL; #endif /* HAVE_ISPELL */ - attributes->quick_kill_scope = (tinrc.default_filter_kill_global ? my_strdup("*") : (char *) 0); + attributes->quick_kill_scope = (tinrc.default_filter_kill_global ? my_strdup("*") : NULL); attributes->quick_kill_header = tinrc.default_filter_kill_header; attributes->quick_kill_case = tinrc.default_filter_kill_case; attributes->quick_kill_expire = tinrc.default_filter_kill_expire; - attributes->quick_select_scope = (tinrc.default_filter_select_global ? my_strdup("*") : (char *) 0); + attributes->quick_select_scope = (tinrc.default_filter_select_global ? my_strdup("*") : NULL); attributes->quick_select_header = tinrc.default_filter_select_header; attributes->quick_select_case = tinrc.default_filter_select_case; attributes->quick_select_expire = tinrc.default_filter_select_expire; @@ -164,10 +164,10 @@ set_default_attributes( attributes->x_comment_to = FALSE; attributes->tex2iso_conv = tinrc.tex2iso_conv; attributes->mime_forward = FALSE; - attributes->fcc = (char *) 0; + attributes->fcc = NULL; #ifdef CHARSET_CONVERSION attributes->mm_network_charset = tinrc.mm_network_charset; - attributes->undeclared_charset = (char *) 0; + attributes->undeclared_charset = NULL; #endif /* CHARSET_CONVERSION */ } @@ -400,8 +400,11 @@ set_attrib( { struct t_group *group; - if (scope == NULL || *scope == '\0') /* No active scope set yet */ + if (scope == NULL || *scope == '\0') { /* No active scope set yet */ + /* TODO: include full line in error-message */ + error_message("attribute with no scope: %s", data); return; + } #if 0 fprintf(stderr, "set_attrib #%d %s %s(%d)\n", type, scope, data, (int) *data); #endif /* 0 */ @@ -414,6 +417,7 @@ set_attrib( do_set_attrib(group, type, data); } else { int i; + /* TODO: Can we get out of doing this per group for .global case */ for_each_group(i) { group = &active[i]; diff -Nurp tin-1.7.5/src/auth.c tin-1.7.6/src/auth.c --- tin-1.7.5/src/auth.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/auth.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : auth.c * Author : Dirk Nimmich * Created : 1997-04-05 - * Updated : 2003-05-09 + * Updated : 2004-06-30 * Notes : Routines to authenticate to a news server via NNTP. * DON'T USE get_respcode() THROUGHOUT THIS CODE. * @@ -152,7 +152,7 @@ read_newsauth_file( char *ptr; char line[PATH_LEN]; int found = 0; - int fd = -1; + int fd; struct stat statbuf; joinpath(line, homedir, ".newsauth"); @@ -387,7 +387,7 @@ authinfo_original( */ authpass = strncpy(authpassword, getpass(_(txt_auth_pass)), sizeof(authpassword) - 1); # else - authpass = strncpy(authpassword, tin_getline(_(txt_auth_pass), FALSE, (char *) 0, PATH_LEN, TRUE, HIST_NONE), sizeof(authpassword) - 1); + authpass = strncpy(authpassword, tin_getline(_(txt_auth_pass), FALSE, NULL, PATH_LEN, TRUE, HIST_NONE), sizeof(authpassword) - 1); # endif /* 0 */ #endif /* USE_CURSES */ diff -Nurp tin-1.7.5/src/charset.c tin-1.7.6/src/charset.c --- tin-1.7.5/src/charset.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/charset.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : charset.c * Author : M. Kuhn, T. Burmester * Created : 1993-12-10 - * Updated : 2004-06-07 + * Updated : 2004-07-21 * Notes : ISO to ascii charset conversion routines * * Copyright (c) 1993-2004 Markus Kuhn @@ -255,7 +255,7 @@ convert_tex2iso( char *from, char *to) { - const char * tex_to[TEX_SUBST]; + const char *tex_to[TEX_SUBST]; int i; size_t spaces = 0; /* spaces to add */ size_t len, col = 0; /* length of from, col counter */ @@ -381,6 +381,9 @@ convert_to_printable( wchar_t *wbuffer; size_t len = strlen(buf) + 1; + if (IS_LOCAL_CHARSET("UTF-8")) + utf8_valid(buf); + if ((wbuffer = char2wchar_t(buf)) != NULL) { wconvert_to_printable(wbuffer); @@ -435,7 +438,7 @@ wconvert_to_printable( * sometimes fails to propper convert (wchar_t) 0 to (wint_t) 0 * and thus loop termination fails. */ -void +char * convert_body2printable( char *buf) { @@ -451,8 +454,7 @@ convert_body2printable( } if ((buffer = wchar_t2char(wbuffer)) != NULL) { strncpy(buf, buffer, len); - buffer[len - 1] = '\0'; - + buf[len - 1] = '\0'; free(buffer); } free(wbuffer); @@ -465,4 +467,5 @@ convert_body2printable( *c = '?'; } #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + return buf; } diff -Nurp tin-1.7.5/src/config.c tin-1.7.6/src/config.c --- tin-1.7.5/src/config.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/config.c 2004-09-05 16:02:45.000000000 +0200 @@ -3,7 +3,7 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-06-06 + * Updated : 2004-09-05 * Notes : Configuration file routines * * Copyright (c) 1991-2004 Iain Lea @@ -41,15 +41,9 @@ #ifndef VERSION_H # include "version.h" #endif /* !VERSION_H */ -#ifndef TINTBL_H -# include "tincfg.h" -#endif /* !TINTBL_H */ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ -#ifndef MENUKEYS_H -# include "menukeys.h" -#endif /* !MENUKEYS_H */ #ifndef TNNTP_H # include "tnntp.h" #endif /* TNNTP_H */ @@ -57,26 +51,12 @@ /* * local prototypes */ -static int get_option_num(int act_option); -static int set_option_num(int option); -static t_bool OptionOnPage(int option); static t_bool match_item(char *line, const char *pat, char *dst, size_t dstlen); static t_bool rc_update(FILE *fp); -static void RepaintOption(int option); -static void check_score_defaults(void); -static void highlight_option(int option); -static void print_any_option(int act_option); -static void print_option(enum option_enum the_option); -static void redraw_screen(int option); -static void show_config_page(void); -static void unhighlight_option(int option); static void write_server_config(void); #ifdef HAVE_COLOR static t_bool match_color(char *line, const char *pat, int *dst, int max); #endif /* HAVE_COLOR */ -#ifdef USE_CURSES - static void DoScroll(int jump); -#endif /* USE_CURSES */ #define DASH_TO_SPACE(mark) ((char) (mark == '_' ? ' ' : mark)) @@ -1388,1117 +1368,6 @@ write_config_file( } -static int first_option_on_screen; -static int actual_top_option = 0; - -#define option_lines_per_page (cLINES - INDEX_TOP - 3) -#define TopOfPage(option) option_lines_per_page \ - * ((option) / option_lines_per_page) -#define OptionInPage(option) ((option) - first_option_on_screen) -#define OptionIndex(option) (OptionInPage(option) % option_lines_per_page) - - -int -option_row( - int option) -{ - return (INDEX_TOP + OptionIndex(option)); -} - - -static int -get_option_num( - int act_option) -{ - int result = 0; - - if (option_table[act_option].var_type != OPT_TITLE) { - while (act_option >= 0) { - if (option_table[act_option--].var_type != OPT_TITLE) - ++result; - } - } - return result; -} - - -static int -set_option_num( - int option) -{ - int result = 0; - - while (option >= 0 && result < LAST_OPT) { - while (result < LAST_OPT && option_table[result].var_type == OPT_TITLE) - result++; - if (result < LAST_OPT) { - if (--option < 0) - break; - ++result; - } - } - return result; -} - - -char * -fmt_option_prompt( - char *dst, - size_t len, - t_bool editing, - int option) -{ - char *buf; - int num = get_option_num(option); - size_t option_width = MAX(35, cCOLS / 2 - 9); -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t *wbuf, *wbuf2; - - /* convert the option text to wchar_t */ - wbuf = char2wchar_t(_(option_table[option].txt->opt)); -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - - if (num) { -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (wbuf != NULL) { - wbuf2 = my_malloc(sizeof(wchar_t) * (option_width + 1)); - wstrunc(wbuf, wbuf2, option_width + 1, option_width); - - if ((buf = wchar_t2char(wbuf2)) == NULL) { - /* conversion failed, truncate original string */ - buf = my_malloc(option_width + 1); - strunc(_(option_table[option].txt->opt), buf, option_width + 1, option_width); - snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, option_width, option_width, buf); - } else { - snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, - strlen(buf) + option_width - wcswidth(wbuf2, option_width + 1), - strlen(buf) + option_width - wcswidth(wbuf2, option_width + 1), buf); - } - free(wbuf2); - } else -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - { - /* truncate original string */ - buf = my_malloc(option_width + 1); - strunc(_(option_table[option].txt->opt), buf, option_width + 1, option_width); - snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, option_width, option_width, buf); - } - } else { -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (wbuf != NULL) { - wbuf2 = my_malloc(sizeof(wchar_t) * (cCOLS - 3 + 1)); - wstrunc(wbuf, wbuf2, cCOLS - 3 + 1, cCOLS - 3); - if ((buf = wchar_t2char(wbuf2)) == NULL) { - /* conversion failed, truncate original string */ - buf = my_malloc(cCOLS - 3 + 1); - strunc(_(option_table[option].txt->opt), buf, cCOLS - 3 + 1, cCOLS - 3); - } - free(wbuf2); - } else -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - { - /* truncate original string */ - buf = my_malloc(cCOLS - 3 + 1); - strunc(_(option_table[option].txt->opt), buf, cCOLS - 3 + 1, cCOLS - 3); - } - snprintf(dst, len, " %s", buf); - } - -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - FreeIfNeeded(wbuf); -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - FreeIfNeeded(buf); - return dst; -} - - -static void -print_any_option( - int act_option) -{ - constext **list; - char temp[LEN], *ptr, *ptr2; - int row = option_row(act_option); - size_t len = sizeof(temp) - 1; - - MoveCursor(row, 0); - - ptr = fmt_option_prompt(temp, len, FALSE, act_option); - ptr += strlen(temp); - len -= strlen(temp); - - switch (option_table[act_option].var_type) { - case OPT_ON_OFF: - /* tailing space to overwrite any left over F from OFF */ - snprintf(ptr, len, "%s ", print_boolean(*OPT_ON_OFF_list[option_table[act_option].var_index])); - break; - - case OPT_LIST: - list = option_table[act_option].opt_list; - ptr2 = my_strdup(list[*(option_table[act_option].variable) + ((strcasecmp(_(list[0]), _(txt_default)) == 0) ? 1 : 0)]); - snprintf(ptr, len, "%s", _(ptr2)); - free(ptr2); - break; - - case OPT_STRING: - snprintf(ptr, len, "%s", OPT_STRING_list[option_table[act_option].var_index]); - break; - - case OPT_NUM: - snprintf(ptr, len, "%d", *(option_table[act_option].variable)); - break; - - case OPT_CHAR: - snprintf(ptr, len, "%c", *OPT_CHAR_list[option_table[act_option].var_index]); - break; - - default: - break; - } -#ifdef USE_CURSES - my_printf("%.*s", cCOLS - 1, temp); - { - int y, x; - - getyx(stdscr, y, x); - if (x < cCOLS) - clrtoeol(); - } -#else - my_printf("%.*s", cCOLS - 1, temp); - /* draw_arrow_mark() will read this back for repainting */ - strncpy(screen[row - INDEX_TOP].col, temp, cCOLS); -#endif /* USE_CURSES */ -} - - -static void -print_option( - enum option_enum the_option) -{ - print_any_option((int) the_option); -} - - -static t_bool -OptionOnPage( - int option) -{ - if ((option >= first_option_on_screen) && (option < first_option_on_screen + option_lines_per_page)) - return TRUE; - return FALSE; -} - - -static void -RepaintOption( - int option) -{ - if (OptionOnPage(option)) - print_any_option(option); -} - - -#ifdef USE_CURSES -static void -DoScroll( - int jump) -{ - MoveCursor(INDEX_TOP, 0); - SetScrollRegion(INDEX_TOP, INDEX_TOP + option_lines_per_page - 1); - ScrollScreen(jump); - SetScrollRegion(0, LINES - 1); -} -#endif /* USE_CURSES */ - - -static void -highlight_option( - int option) -{ - if (!OptionOnPage(option)) { -#ifdef USE_CURSES - if (option > 0 && OptionOnPage(option - 1)) { - DoScroll(1); - first_option_on_screen++; - } else if (option < LAST_OPT && OptionOnPage(option + 1)) { - DoScroll(-1); - first_option_on_screen--; - } else -#endif /* USE_CURSES */ - { - first_option_on_screen = TopOfPage(option); - ClearScreen(); - } - } - - refresh_config_page(option); - draw_arrow_mark(option_row(option)); - info_message("%s", _(option_table[option].txt->opt)); -} - - -static void -unhighlight_option( - int option) -{ - /* Astonishing hack */ - t_menu *savemenu = currmenu; - t_menu cfgmenu = { 0, 1, 0, 0, NULL, NULL }; - - currmenu = &cfgmenu; - currmenu->curr = option_row(option) - INDEX_TOP; - erase_arrow(); - currmenu = savemenu; - clear_message(); -} - - -/* - * Refresh the config page which holds the actual option. If act_option is - * smaller zero fall back on the last given option (first option if there was - * no last option) and refresh the screen. - */ -void -refresh_config_page( - int act_option) -{ - static int last_option = 0; - t_bool force_redraw = FALSE; - - signal_context = cConfig; - - if (act_option < 0) { - force_redraw = TRUE; - act_option = last_option; - ClearScreen(); - } - - if ((first_option_on_screen != actual_top_option) || force_redraw) { - show_config_page(); - actual_top_option = first_option_on_screen; - } - last_option = act_option; -} - - -static void -redraw_screen( - int option) -{ - my_retouch(); - set_xclick_off(); - ClearScreen(); - show_config_page(); - highlight_option(option); -} - - -/* - * options menu so that the user can dynamically change parameters - * - * TODO: - why do we use ret_code when we never modify it? what about calling - * code which checks the return value? - * - when we change something we need to update the related attributes - * as well (see line 2009). - */ -int -change_config_file( - struct t_group *group) -{ - int ch = 0; - int option, old_option; - int ret_code = NO_FILTERING; - int mime_encoding = MIME_ENCODING_7BIT; - t_bool change_option = FALSE; - - actual_top_option = -1; - option = 1; - - ClearScreen(); - set_xclick_off(); - forever { - highlight_option(option); - stow_cursor(); - ch = ReadCh(); - - /* - * convert arrow key codes to "normal" codes - */ - switch (ch) { - case ESC: /* common arrow keys */ -# ifdef HAVE_KEY_PREFIX - case KEY_PREFIX: -# endif /* HAVE_KEY_PREFIX */ - switch (get_arrow_key(ch)) { - case KEYMAP_UP: - ch = map_to_local(iKeyUp, &menukeymap.config_change); - break; - - case KEYMAP_DOWN: - ch = map_to_local(iKeyDown, &menukeymap.config_change); - break; - - case KEYMAP_HOME: - ch = map_to_local(iKeyFirstPage, &menukeymap.config_change); - break; - - case KEYMAP_END: - ch = map_to_local(iKeyLastPage, &menukeymap.config_change); - break; - - case KEYMAP_PAGE_UP: - ch = map_to_local(iKeyPageUp, &menukeymap.config_change); - break; - - case KEYMAP_PAGE_DOWN: - ch = map_to_local(iKeyPageDown, &menukeymap.config_change); - break; - - default: - break; - } /* switch (get_arrow_key()) */ - break; - - default: - break; - } /* switch (ch) */ - - switch (map_to_default(ch, &menukeymap.config_change)) { - case iKeyQuit: - write_config_file(local_config_file); - /* FALLTHROUGH */ - case iKeyConfigNoSave: - clear_note_area(); - return ret_code; - - case iKeyUp: - case iKeyUp2: - unhighlight_option(option); - if (!get_option_num(--option)) /* skip over titles */ - option--; - if (option < 0) - option = LAST_OPT; - highlight_option(option); - break; - - case iKeyDown: - case iKeyDown2: - unhighlight_option(option); - if (!get_option_num(++option)) /* skip over titles */ - option++; - if (option > LAST_OPT) - option = 1; - highlight_option(option); - break; - - case iKeyFirstPage: - case iKeyConfigFirstPage2: - unhighlight_option(option); - option = 1; - highlight_option(option); - break; - - case iKeyLastPage: - case iKeyConfigLastPage2: - unhighlight_option(option); - option = LAST_OPT; - highlight_option(option); - break; - - case iKeyPageUp: - case iKeyPageUp2: - case iKeyPageUp3: - unhighlight_option(option); - if (OptionInPage(option)) { - option = first_option_on_screen; - } else if (!first_option_on_screen) { - option = LAST_OPT; - first_option_on_screen = TopOfPage(option); - ClearScreen(); - show_config_page(); - } else if ((option -= option_lines_per_page) < 0) { - option = 1; - first_option_on_screen = 0; - } else { - first_option_on_screen -= (tinrc.scroll_lines == -2) ? option_lines_per_page / 2 : option_lines_per_page; - ClearScreen(); - show_config_page(); - } - highlight_option(option); - break; - - case iKeyPageDown: - case iKeyPageDown2: - case iKeyPageDown3: - unhighlight_option(option); - first_option_on_screen += (tinrc.scroll_lines == -2) ? option_lines_per_page / 2 : option_lines_per_page; - if (first_option_on_screen > LAST_OPT) - first_option_on_screen = 0; - - option = first_option_on_screen; - ClearScreen(); - show_config_page(); - highlight_option(option); - break; - - case '1': case '2': case '3': case '4': case '5': - case '6': case '7': case '8': case '9': - unhighlight_option(option); - old_option = option; - option = prompt_num(ch, _(txt_enter_option_num)) - 1; - option = set_option_num(option); - if (option < 0 || option > LAST_OPT) { - option = old_option; - break; - } - highlight_option(option); - break; - - case iKeySearchSubjF: - case iKeySearchSubjB: - case iKeySearchRepeat: - if (ch == iKeySearchRepeat && i_key_search_last != iKeySearchSubjF && i_key_search_last != iKeySearchSubjB) - break; - - old_option = option; - option = search_config((ch == iKeySearchSubjF), (ch == iKeySearchRepeat), option, LAST_OPT); - if (option != old_option) { - unhighlight_option(old_option); - highlight_option(option); - } - break; - - case iKeyConfigSelect: - case iKeyConfigSelect2: - change_option = TRUE; - break; - - case iKeyRedrawScr: /* redraw screen */ - redraw_screen(option); - break; - - default: - break; - } /* switch (ch) */ - - if (change_option) { - switch (option_table[option].var_type) { - case OPT_ON_OFF: - switch (option) { - case OPT_ADD_POSTED_TO_FILTER: - case OPT_ADVERTISING: - case OPT_ALTERNATIVE_HANDLING: - case OPT_ASK_FOR_METAMAIL: - case OPT_AUTO_BCC: - case OPT_AUTO_CC: - case OPT_AUTO_LIST_THREAD: - case OPT_AUTO_RECONNECT: - case OPT_AUTO_SAVE: - case OPT_BATCH_SAVE: - case OPT_CACHE_OVERVIEW_FILES: - case OPT_CATCHUP_READ_GROUPS: - case OPT_FORCE_SCREEN_REDRAW: - case OPT_GROUP_CATCHUP_ON_EXIT: - case OPT_KEEP_DEAD_ARTICLES: - case OPT_MARK_IGNORE_TAGS: - case OPT_MARK_SAVED_READ: - case OPT_PGDN_GOTO_NEXT: - case OPT_POS_FIRST_UNREAD: - case OPT_POST_PROCESS_VIEW: - case OPT_PRINT_HEADER: - case OPT_PROCESS_ONLY_UNREAD: - case OPT_PROMPT_FOLLOWUPTO: - case OPT_SHOW_ONLY_UNREAD_GROUPS: - case OPT_SHOW_SIGNATURES: - case OPT_SIGDASHES: - case OPT_SIGNATURE_REPOST: - case OPT_SPACE_GOTO_NEXT_UNREAD: - case OPT_START_EDITOR_OFFSET: - case OPT_STRIP_BLANKS: - case OPT_STRIP_NEWSRC: - case OPT_TAB_GOTO_NEXT_UNREAD: - case OPT_TEX2ISO_CONV: - case OPT_THREAD_CATCHUP_ON_EXIT: -#if defined(HAVE_ICONV_OPEN_TRANSLIT) && defined(CHARSET_CONVERSION) - case OPT_TRANSLIT: -#endif /* HAVE_ICONV_OPEN_TRANSLIT && CHARSET_CONVERSION */ - case OPT_UNLINK_ARTICLE: - case OPT_URL_HIGHLIGHT: -#ifdef HAVE_KEYPAD - case OPT_USE_KEYPAD: -#endif /* HAVE_KEYPAD */ - case OPT_USE_MOUSE: - case OPT_WRAP_ON_NEXT_UNREAD: - prompt_option_on_off(option); - break; - - /* show mini help menu */ - case OPT_BEGINNER_LEVEL: - if (prompt_option_on_off(option)) - set_noteslines(cLINES); - break; - - /* show all arts or just new/unread arts */ - case OPT_SHOW_ONLY_UNREAD_ARTS: - if (prompt_option_on_off(option) && group != NULL) { - make_threads(group, TRUE); - pos_first_unread_thread(); - } - break; - - /* draw -> / highlighted bar */ - case OPT_DRAW_ARROW: - prompt_option_on_off(option); - unhighlight_option(option); - if (!tinrc.draw_arrow && !tinrc.inverse_okay) { - tinrc.inverse_okay = TRUE; - RepaintOption(OPT_INVERSE_OKAY); - } - break; - - /* draw inversed screen header lines */ - /* draw inversed group/article/option line if draw_arrow is OFF */ - case OPT_INVERSE_OKAY: - prompt_option_on_off(option); - unhighlight_option(option); - if (!tinrc.draw_arrow && !tinrc.inverse_okay) { - tinrc.draw_arrow = TRUE; /* we don't want to navigate blindly */ - RepaintOption(OPT_DRAW_ARROW); - } - break; - - case OPT_MAIL_8BIT_HEADER: - prompt_option_on_off(option); - if (strcasecmp(txt_mime_encodings[tinrc.mail_mime_encoding], txt_8bit)) { - tinrc.mail_8bit_header = FALSE; - print_option(OPT_MAIL_8BIT_HEADER); - } - break; - - case OPT_POST_8BIT_HEADER: - prompt_option_on_off(option); - /* if post_mime_encoding != 8bit, post_8bit_header is disabled */ - if (strcasecmp(txt_mime_encodings[tinrc.post_mime_encoding], txt_8bit)) { - tinrc.post_8bit_header = FALSE; - print_option(OPT_POST_8BIT_HEADER); - } - break; - - /* show newsgroup description text next to newsgroups */ - case OPT_SHOW_DESCRIPTION: - prompt_option_on_off(option); - show_description = tinrc.show_description; - if (show_description) /* force reread of newgroups file */ - read_descriptions(FALSE); - break; - -#ifdef HAVE_COLOR - /* use ANSI color */ - case OPT_USE_COLOR: - prompt_option_on_off(option); -# ifdef USE_CURSES - if (!has_colors()) - use_color = FALSE; - else -# endif /* USE_CURSES */ - use_color = tinrc.use_color; - break; -#endif /* HAVE_COLOR */ - -#ifdef XFACE_ABLE - /* use slrnface */ - case OPT_USE_SLRNFACE: - if (prompt_option_on_off(option)) { - if (!tinrc.use_slrnface) - slrnface_stop(); - else - slrnface_start(); - } - break; -#endif /* XFACE_ABLE */ - - /* word_highlight */ - case OPT_WORD_HIGHLIGHT: - prompt_option_on_off(option); - word_highlight = tinrc.word_highlight; - break; - -#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) - case OPT_RENDER_BIDI: - prompt_option_on_off(option); - break; -#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ - - default: - break; - } /* switch (option) */ - break; - - case OPT_LIST: - switch (option) { -#ifdef HAVE_COLOR - case OPT_COL_BACK: - case OPT_COL_FROM: - case OPT_COL_HEAD: - case OPT_COL_HELP: - case OPT_COL_INVERS_BG: - case OPT_COL_INVERS_FG: - case OPT_COL_MESSAGE: - case OPT_COL_MINIHELP: - case OPT_COL_NEWSHEADERS: - case OPT_COL_NORMAL: - case OPT_COL_QUOTE: - case OPT_COL_QUOTE2: - case OPT_COL_QUOTE3: - case OPT_COL_RESPONSE: - case OPT_COL_SIGNATURE: - case OPT_COL_SUBJECT: - case OPT_COL_TEXT: - case OPT_COL_TITLE: - case OPT_COL_MARKSTAR: - case OPT_COL_MARKDASH: - case OPT_COL_MARKSLASH: - case OPT_COL_MARKSTROKE: - case OPT_COL_URLS: -#endif /* HAVE_COLOR */ - case OPT_HIDE_UUE: - case OPT_INTERACTIVE_MAILER: - case OPT_WORD_H_DISPLAY_MARKS: - case OPT_MONO_MARKSTAR: - case OPT_MONO_MARKDASH: - case OPT_MONO_MARKSLASH: - case OPT_MONO_MARKSTROKE: - case OPT_CONFIRM_CHOICE: - case OPT_KILL_LEVEL: - case OPT_MAILBOX_FORMAT: - case OPT_SHOW_INFO: - case OPT_SORT_ARTICLE_TYPE: - case OPT_STRIP_BOGUS: -#ifdef HAVE_UNICODE_NORMALIZATION - case OPT_NORMALIZATION_FORM: -#endif /* HAVE_UNICODE_NORMALIZATION */ - case OPT_QUOTE_STYLE: - case OPT_WILDCARD: - prompt_option_list(option); - break; - - case OPT_THREAD_ARTICLES: - /* - * If the threading strategy has changed, fix things - * so that rethreading will occur - */ - if (prompt_option_list(option) && group != NULL) { - int n, old_base_art = base[grpmenu.curr]; - - group->attribute->thread_arts = tinrc.thread_articles; - make_threads(group, TRUE); - /* in non-empty groups update cursor position */ - if (grpmenu.max > 0) { - if ((n = which_thread(old_base_art)) >= 0) - grpmenu.curr = n; - } - } - clear_message(); - break; - - case OPT_SORT_THREADS_TYPE: - /* - * If the sorting strategy of threads has changed, fix things - * so that resorting will occur - */ - if (prompt_option_list(option) && group != NULL) { - group->attribute->sort_threads_type = tinrc.sort_threads_type; - make_threads(group, TRUE); - } - clear_message(); - break; - - case OPT_THREAD_SCORE: - /* - * If the scoring of a thread has changed, - * resort base[] - */ - if (prompt_option_list(option) && group != NULL) - find_base(group); - clear_message(); - break; - - case OPT_POST_PROCESS: - prompt_option_list(option); - glob_attributes.post_proc_type = tinrc.post_process; - if (group != NULL) - group->attribute->post_proc_type = tinrc.post_process; - break; - - case OPT_SHOW_AUTHOR: - prompt_option_list(option); - if (group != NULL) - group->attribute->show_author = tinrc.show_author; - break; - - case OPT_MAIL_MIME_ENCODING: - case OPT_POST_MIME_ENCODING: - prompt_option_list(option); - mime_encoding = *(option_table[option].variable); - /* do not use 8 bit headers if mime encoding is not 8bit */ - if (strcasecmp(txt_mime_encodings[mime_encoding], txt_8bit)) { - if (option == (int) OPT_POST_MIME_ENCODING) { - tinrc.post_8bit_header = FALSE; - RepaintOption(OPT_POST_8BIT_HEADER); - } else { - tinrc.mail_8bit_header = FALSE; - RepaintOption(OPT_MAIL_8BIT_HEADER); - } - } - break; - -#ifdef CHARSET_CONVERSION - case OPT_MM_NETWORK_CHARSET: - if (prompt_option_list(option)) { - glob_attributes.mm_network_charset = tinrc.mm_network_charset; - if (group) - group->attribute->mm_network_charset = tinrc.mm_network_charset; -# ifdef NO_LOCALE - strcpy(tinrc.mm_local_charset, txt_mime_charsets[tinrc.mm_network_charset]); -# endif /* NO_LOCALE */ - } - /* - * check if we have selected a 7bit charset, otherwise - * update encoding - * we always do this (even if we did not change the - * charset) to fixup flaws in the tinrc - once we do - * the same while reading the tinrc this can go into - * the != original_list_value case. - */ - { - int i; - t_bool change; - - if (!strcasecmp(txt_mime_encodings[tinrc.post_mime_encoding], txt_7bit)) { - change = TRUE; - for (i = 0; *txt_mime_7bit_charsets[i]; i++) { - if (!strcasecmp(txt_mime_charsets[tinrc.mm_network_charset], txt_mime_7bit_charsets[i])) { - change = FALSE; - break; - } - } - if (change) { - tinrc.post_mime_encoding = MIME_ENCODING_8BIT; - RepaintOption(OPT_POST_MIME_ENCODING); - } - } else { /* and vice versa, if we have a 7bit chaset but a !7bit encoding, fix that */ - for (i = 0; *txt_mime_7bit_charsets[i]; i++) { - if (!strcasecmp(txt_mime_charsets[tinrc.mm_network_charset], txt_mime_7bit_charsets[i])) { - tinrc.mail_mime_encoding = tinrc.post_mime_encoding = MIME_ENCODING_7BIT; - tinrc.mail_8bit_header = tinrc.post_8bit_header = FALSE; - RepaintOption(OPT_POST_MIME_ENCODING); - RepaintOption(OPT_MAIL_MIME_ENCODING); - RepaintOption(OPT_POST_8BIT_HEADER); - break; - } - } - } - - if (!strcasecmp(txt_mime_encodings[tinrc.mail_mime_encoding], txt_7bit)) { - change = TRUE; - for (i = 0; *txt_mime_7bit_charsets[i]; i++) { - if (!strcasecmp(txt_mime_charsets[tinrc.mm_network_charset], txt_mime_7bit_charsets[i])) { - change = FALSE; - break; - } - } - if (change) { - tinrc.mail_mime_encoding = MIME_ENCODING_QP; - RepaintOption(OPT_MAIL_MIME_ENCODING); - } - } else { /* and vice versa, if we have a 7bit chaset but a !7bit encoding, fix that */ - for (i = 0; *txt_mime_7bit_charsets[i]; i++) { - if (!strcasecmp(txt_mime_charsets[tinrc.mm_network_charset], txt_mime_7bit_charsets[i])) { - tinrc.mail_mime_encoding = tinrc.post_mime_encoding = MIME_ENCODING_7BIT; - tinrc.mail_8bit_header = tinrc.post_8bit_header = FALSE; - RepaintOption(OPT_POST_MIME_ENCODING); - RepaintOption(OPT_MAIL_MIME_ENCODING); - RepaintOption(OPT_POST_8BIT_HEADER); - break; - } - } - } - } - break; -#endif /* CHARSET_CONVERSION */ - - default: - break; - } /* switch (option) */ - break; - - case OPT_STRING: - switch (option) { - case OPT_EDITOR_FORMAT: - case OPT_INEWS_PROG: - case OPT_MAILER_FORMAT: - case OPT_MAIL_ADDRESS: - case OPT_MAIL_QUOTE_FORMAT: - case OPT_METAMAIL_PROG: -#ifndef CHARSET_CONVERSION - case OPT_MM_CHARSET: -#endif /* !CHARSET_CONVERSION */ - case OPT_NEWS_QUOTE_FORMAT: - case OPT_QUOTE_CHARS: - case OPT_SPAMTRAP_WARNING_ADDRESSES: - case OPT_URL_HANDLER: - case OPT_XPOST_QUOTE_FORMAT: - prompt_option_string(option); - break; - - case OPT_NEWS_HEADERS_TO_DISPLAY: - prompt_option_string(option); - if (news_headers_to_display_array) - FreeIfNeeded(*news_headers_to_display_array); - FreeIfNeeded(news_headers_to_display_array); - news_headers_to_display_array = ulBuildArgv(tinrc.news_headers_to_display, &num_headers_to_display); - break; - - case OPT_NEWS_HEADERS_TO_NOT_DISPLAY: - prompt_option_string(option); - if (news_headers_to_not_display_array) - FreeIfNeeded(*news_headers_to_not_display_array); - FreeIfNeeded(news_headers_to_not_display_array); - news_headers_to_not_display_array = ulBuildArgv(tinrc.news_headers_to_not_display, &num_headers_to_not_display); - break; - -#ifndef DISABLE_PRINTING - case OPT_PRINTER: -#endif /* !DISABLE_PRINTING */ - case OPT_MAILDIR: - case OPT_SAVEDIR: - case OPT_SIGFILE: - case OPT_POSTED_ARTICLES_FILE: - if (prompt_option_string(option)) { - char buf[PATH_LEN]; - - strfpath(tinrc.posted_articles_file, buf, sizeof(buf), &CURR_GROUP); - STRCPY(tinrc.posted_articles_file, buf); - } - break; - -#ifdef HAVE_COLOR - case OPT_QUOTE_REGEX: - prompt_option_string(option); - FreeIfNeeded(quote_regex.re); - FreeIfNeeded(quote_regex.extra); - if (!strlen(tinrc.quote_regex)) - STRCPY(tinrc.quote_regex, DEFAULT_QUOTE_REGEX); - compile_regex(tinrc.quote_regex, "e_regex, PCRE_CASELESS); - break; - - case OPT_QUOTE_REGEX2: - prompt_option_string(option); - FreeIfNeeded(quote_regex2.re); - FreeIfNeeded(quote_regex2.extra); - if (!strlen(tinrc.quote_regex2)) - STRCPY(tinrc.quote_regex2, DEFAULT_QUOTE_REGEX2); - compile_regex(tinrc.quote_regex2, "e_regex2, PCRE_CASELESS); - break; - - case OPT_QUOTE_REGEX3: - prompt_option_string(option); - FreeIfNeeded(quote_regex3.re); - FreeIfNeeded(quote_regex3.extra); - if (!strlen(tinrc.quote_regex3)) - STRCPY(tinrc.quote_regex3, DEFAULT_QUOTE_REGEX3); - compile_regex(tinrc.quote_regex3, "e_regex3, PCRE_CASELESS); - break; -#endif /* HAVE_COLOR */ - - case OPT_SLASHES_REGEX: - prompt_option_string(option); - FreeIfNeeded(slashes_regex.re); - FreeIfNeeded(slashes_regex.extra); - if (!strlen(tinrc.slashes_regex)) - STRCPY(tinrc.slashes_regex, DEFAULT_SLASHES_REGEX); - compile_regex(tinrc.slashes_regex, &slashes_regex, PCRE_CASELESS); - break; - - case OPT_STARS_REGEX: - prompt_option_string(option); - FreeIfNeeded(stars_regex.re); - FreeIfNeeded(stars_regex.extra); - if (!strlen(tinrc.stars_regex)) - STRCPY(tinrc.stars_regex, DEFAULT_STARS_REGEX); - compile_regex(tinrc.stars_regex, &stars_regex, PCRE_CASELESS); - break; - - case OPT_STROKES_REGEX: - prompt_option_string(option); - FreeIfNeeded(strokes_regex.re); - FreeIfNeeded(strokes_regex.extra); - if (!strlen(tinrc.strokes_regex)) - STRCPY(tinrc.strokes_regex, DEFAULT_STROKES_REGEX); - compile_regex(tinrc.strokes_regex, &strokes_regex, PCRE_CASELESS); - break; - - case OPT_UNDERSCORES_REGEX: - prompt_option_string(option); - FreeIfNeeded(underscores_regex.re); - FreeIfNeeded(underscores_regex.extra); - if (!strlen(tinrc.underscores_regex)) - STRCPY(tinrc.underscores_regex, DEFAULT_UNDERSCORES_REGEX); - compile_regex(tinrc.underscores_regex, &underscores_regex, PCRE_CASELESS); - break; - - case OPT_STRIP_RE_REGEX: - prompt_option_string(option); - FreeIfNeeded(strip_re_regex.re); - FreeIfNeeded(strip_re_regex.extra); - if (!strlen(tinrc.strip_re_regex)) - STRCPY(tinrc.strip_re_regex, DEFAULT_STRIP_RE_REGEX); - compile_regex(tinrc.strip_re_regex, &strip_re_regex, PCRE_ANCHORED); - break; - - case OPT_STRIP_WAS_REGEX: - prompt_option_string(option); - FreeIfNeeded(strip_was_regex.re); - FreeIfNeeded(strip_was_regex.extra); - if (!strlen(tinrc.strip_was_regex)) { -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (IS_LOCAL_CHARSET("UTF-8")) { -# if (defined(PCRE_MAJOR) && PCRE_MAJOR >= 4) - int i; - - pcre_config(PCRE_CONFIG_UTF8, &i); - if (i) - STRCPY(tinrc.strip_was_regex, DEFAULT_U8_STRIP_WAS_REGEX); - else -# endif /* PCRE_MAJOR && PCRE_MAJOR >=4 */ - STRCPY(tinrc.strip_was_regex, DEFAULT_STRIP_WAS_REGEX); - } else -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - STRCPY(tinrc.strip_was_regex, DEFAULT_STRIP_WAS_REGEX); - } - compile_regex(tinrc.strip_was_regex, &strip_was_regex, 0); - break; - - case OPT_DATE_FORMAT: - prompt_option_string(option); - if (!strlen(tinrc.date_format)) { - STRCPY(tinrc.date_format, DEFAULT_DATE_FORMAT); - } - break; - - default: - break; - } /* switch (option) */ - - break; - - case OPT_NUM: - switch (option) { - case OPT_GETART_LIMIT: - case OPT_SCROLL_LINES: - prompt_option_num(option); - break; - - case OPT_REREAD_ACTIVE_FILE_SECS: - prompt_option_num(option); - if (tinrc.reread_active_file_secs < 0) - tinrc.reread_active_file_secs = 0; - break; - - case OPT_RECENT_TIME: - prompt_option_num(option); - if (tinrc.recent_time < 0) - tinrc.recent_time = 0; - break; - - case OPT_GROUPNAME_MAX_LENGTH: - prompt_option_num(option); - if (tinrc.groupname_max_length < 0) - tinrc.groupname_max_length = 0; - break; - - case OPT_FILTER_DAYS: - prompt_option_num(option); - if (tinrc.filter_days <= 0) - tinrc.filter_days = 1; - break; - - case OPT_SCORE_LIMIT_KILL: - case OPT_SCORE_KILL: - case OPT_SCORE_LIMIT_SELECT: - case OPT_SCORE_SELECT: - prompt_option_num(option); - check_score_defaults(); - if (group != NULL) { - unfilter_articles(); - read_filter_file(filter_file); - if (filter_articles(group)) - make_threads(group, FALSE); - } - redraw_screen(option); - break; - - case OPT_WRAP_COLUMN: - prompt_option_num(option); - /* recook if in an article is open */ - if (pgart.raw) - resize_article(TRUE, &pgart); - break; - - default: - break; - } /* switch (option) */ - break; - - case OPT_CHAR: - switch (option) { - /* - * TODO: do DASH_TO_SPACE/SPACE_TO_DASH conversion here? - */ - case OPT_ART_MARKED_DELETED: - case OPT_ART_MARKED_INRANGE: - case OPT_ART_MARKED_RETURN: - case OPT_ART_MARKED_SELECTED: - case OPT_ART_MARKED_RECENT: - case OPT_ART_MARKED_UNREAD: - case OPT_ART_MARKED_READ: - case OPT_ART_MARKED_KILLED: - case OPT_ART_MARKED_READ_SELECTED: - prompt_option_char(option); - break; - - default: - break; - } /* switch (option) */ - break; - - default: - break; - } /* switch (option_table[option].var_type) */ - change_option = FALSE; - show_menu_help(txt_select_config_file_option); - RepaintOption(option); - } /* if (change_option) */ - } /* forever */ - /* NOTREACHED */ - return ret_code; -} - - -/* - * show_menu_help - */ -void -show_menu_help( - const char *help_message) -{ - MoveCursor(cLINES - 2, 0); - CleartoEOLN(); - center_line(cLINES - 2, FALSE, _(help_message)); -} - - t_bool match_boolean( char *line, @@ -2725,33 +1594,6 @@ quote_space_to_dash( /* - * display current configuration page - */ -static void -show_config_page( - void) -{ - int i, lines_to_print = option_lines_per_page; - - center_line(0, TRUE, _(txt_options_menu)); - - /* - * on last page, there need not be option_lines_per_page options - */ - if (first_option_on_screen + option_lines_per_page > LAST_OPT) - lines_to_print = LAST_OPT + 1 - first_option_on_screen; - - for (i = 0; i < lines_to_print; i++) - print_any_option(first_option_on_screen + i); - CleartoEOS(); - - show_menu_help(txt_select_config_file_option); - my_flush(); - stow_cursor(); -} - - -/* * Written by: Brad Viviano and Scott Powers (bcv & swp) * * Takes a 1d string and turns it into a 2d array of strings. @@ -2813,21 +1655,6 @@ ulBuildArgv( /* - * Check if score_kill is <= score_limit_kill and if score_select >= score_limit_select - */ -static void -check_score_defaults( - void) -{ - if (tinrc.score_kill > tinrc.score_limit_kill) - tinrc.score_kill = tinrc.score_limit_kill; - - if (tinrc.score_select < tinrc.score_limit_select) - tinrc.score_select = tinrc.score_limit_select; -} - - -/* * auto update tinrc */ static t_bool diff -Nurp tin-1.7.5/src/cook.c tin-1.7.6/src/cook.c --- tin-1.7.5/src/cook.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/cook.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : cook.c * Author : J. Faultless * Created : 2000-03-08 - * Updated : 2004-05-27 + * Updated : 2004-07-22 * Notes : Split from page.c * * Copyright (c) 2000-2004 Jason Faultless @@ -997,11 +997,13 @@ cook_article( } if (header_wanted(line)) { /* Put cooked data */ + int i = LEN; + char *l = my_strdup(convert_body2printable(rfc1522_decode(line))); /* FIXME: don't decode addr-part of From:/Cc:/ etc.pp. */ + header_put = TRUE; - /* - * FIXME: don't decode addr-part of From:/Cc:/ etc.pp. - */ - put_cooked(LEN, wrap_lines, C_HEADER, "%s\n", rfc1522_decode(buffer_to_ascii(line))); + expand_ctrl_chars(&l, &i, tabs); + put_cooked(LEN, wrap_lines, C_HEADER, "%s", l); + free(l); } } diff -Nurp tin-1.7.5/src/curses.c tin-1.7.6/src/curses.c --- tin-1.7.5/src/curses.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/curses.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : curses.c * Author : D. Taylor & I. Lea * Created : 1986-01-01 - * Updated : 2004-06-07 + * Updated : 2004-07-20 * Notes : This is a screen management library borrowed with permission * from the Elm mail system. This library was hacked to provide * what tin needs. @@ -153,12 +153,11 @@ struct termio _raw_tty, _original_tty; # define USE_SGTTY 0 #endif /* !USE_SGTTY */ -#ifndef USE_TERMIO -# define USE_TERMIO 0 -#endif /* !USE_TERMIO */ - #ifndef USE_POSIX_TERMIOS # define USE_POSIX_TERMIOS 0 +# ifndef USE_TERMIO +# define USE_TERMIO 0 +# endif /* !USE_TERMIO */ #endif /* !USE_POSIX_TERMIOS */ static char *_clearscreen, *_moveto, *_cleartoeoln, *_cleartoeos, diff -Nurp tin-1.7.5/src/envarg.c tin-1.7.6/src/envarg.c --- tin-1.7.5/src/envarg.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/envarg.c 2004-08-20 10:30:49.000000000 +0200 @@ -125,7 +125,7 @@ envargs( /* * finally, add a NULL after the last arg, like UNIX */ - *argv = (char *) 0; + *argv = NULL; /* * save the values and return diff -Nurp tin-1.7.5/src/filter.c tin-1.7.6/src/filter.c --- tin-1.7.5/src/filter.c 2004-08-20 10:35:11.000000000 +0200 +++ tin-1.7.6/src/filter.c 2004-09-04 16:10:19.000000000 +0200 @@ -3,7 +3,7 @@ * Module : filter.c * Author : I. Lea * Created : 1992-12-28 - * Updated : 2004-06-07 + * Updated : 2004-09-04 * Notes : Filter articles. Kill & auto selection are supported. * * Copyright (c) 1991-2004 Iain Lea @@ -89,7 +89,7 @@ struct t_filters glob_filter = { 0, 0, ( /* * Local prototypes */ -static int get_choice(int x, const char *help, const char *prompt, const char *opt1, const char *opt2, const char *opt3, const char *opt4, const char *opt5); +static int get_choice(int x, const char *help, const char *prompt, char *list[], int list_size); static int set_filter_scope(struct t_group *group); static struct t_filter_comment *add_filter_comment(struct t_filter_comment *ptr, char *text); static struct t_filter_comment *free_filter_comment(struct t_filter_comment *ptr); @@ -230,19 +230,19 @@ set_filter( { if (ptr != NULL) { ptr->comment = (struct t_filter_comment *) 0; - ptr->scope = (char *) 0; + ptr->scope = NULL; ptr->inscope = TRUE; ptr->icase = FALSE; ptr->fullref = FILTER_MSGID; - ptr->subj = (char *) 0; - ptr->from = (char *) 0; - ptr->msgid = (char *) 0; + ptr->subj = NULL; + ptr->from = NULL; + ptr->msgid = NULL; ptr->lines_cmp = FILTER_LINES_NO; ptr->lines_num = 0; ptr->gnksa_cmp = FILTER_LINES_NO; ptr->gnksa_num = 0; ptr->score = 0; - ptr->xref = (char *) 0; + ptr->xref = NULL; ptr->time = (time_t) 0; ptr->next = (struct t_filter *) 0; } @@ -812,54 +812,69 @@ get_choice( int x, const char *help, const char *prompt, - const char *opt1, - const char *opt2, - const char *opt3, - const char *opt4, - const char *opt5) -{ - const char *argv[5]; - int ch, n = 0, i = 0; - - if (opt1) - argv[n++] = opt1; - if (opt2) - argv[n++] = opt2; - if (opt3) - argv[n++] = opt3; - if (opt4) - argv[n++] = opt4; - if (opt5) - argv[n++] = opt5; - assert(n > 0); + char *list[], + int list_size) +{ + int ch, y, i = 0; +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + wchar_t *wbuf; +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ if (help) show_menu_help(help); - do { - int y; -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t *wbuf; + if (list == NULL || list_size < 1) + return -1; - if ((wbuf = char2wchar_t(prompt)) != NULL) { - wconvert_to_printable(wbuf); - y = wcswidth(wbuf, wcslen(wbuf) + 1); - if (y == -1) /* something went wrong, use wcslen() as fallback */ - y = wcslen(wbuf); +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + if ((wbuf = char2wchar_t(prompt)) != NULL) { + wconvert_to_printable(wbuf); + if ((y = wcswidth(wbuf, wcslen(wbuf) + 1)) == -1) /* something went wrong, use wcslen() as fallback */ + y = wcslen(wbuf); - free(wbuf); - } else + free(wbuf); + } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - y = (int) strlen(prompt); + y = (int) strlen(prompt); + do { MoveCursor(x, y); - my_fputs(argv[i], stdout); + my_fputs(list[i], stdout); my_flush(); CleartoEOLN(); - if ((ch = ReadCh()) != ' ') - continue; - if (++i == n) - i = 0; + ch = ReadCh(); + switch (ch) { + case ' ': + i++; + i %= list_size; + break; + + case ESC: /* (ESC) common arrow keys */ +# ifdef HAVE_KEY_PREFIX + case KEY_PREFIX: +# endif /* HAVE_KEY_PREFIX */ + switch (get_arrow_key(ch)) { + case KEYMAP_UP: + i--; + if (i < 0) + i = list_size - 1; + ch = ' '; /* don't exit the while loop yet */ + break; + + case KEYMAP_DOWN: + i++; + i %= list_size; + ch = ' '; /* don't exit the while loop yet */ + break; + + default: + break; + } + break; + + default: + break; + } } while (ch != '\n' && ch != '\r' && ch != iKeyAbort); /* TODO: replace hardcoded keynames */ if (ch == iKeyAbort) @@ -940,14 +955,10 @@ fmt_filter_menu_prompt( { char *buf; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - size_t wsize; wchar_t *wbuf, *wbuf2; if ((wbuf = char2wchar_t(text)) != NULL) { - wsize = wcslen(wbuf) + 1; - /* make sure there is enough space for padding with ' ' */ - wbuf2 = my_malloc(sizeof(wchar_t) * (wsize + len)); - wcspart(wbuf2, wbuf, len, wsize + len, TRUE); + wbuf2 = wcspart(wbuf, len, TRUE); if ((buf = wchar_t2char(wbuf2)) == NULL) { /* conversion failed, truncate original string */ buf = my_malloc(len + 1); @@ -985,8 +996,8 @@ filter_menu( const char *ptr_filter_help_scope; const char *ptr_filter_quit_edit_save; char *ptr; + char **list; char comment_line[LEN]; - char argv[4][PATH_LEN]; char buf[LEN]; char keyedit[MAXKEYLEN], keyquit[MAXKEYLEN], keysave[MAXKEYLEN]; char text_time[PATH_LEN]; @@ -1087,13 +1098,17 @@ filter_menu( } if (*rule.text) { + list = my_malloc(sizeof(char *) * 5); + list[0] = (char *) _(txt_subj_line_only_case); + list[1] = (char *) _(txt_subj_line_only); + list[2] = (char *) _(txt_from_line_only_case); + list[3] = (char *) _(txt_from_line_only); + list[4] = (char *) _(txt_msgid_line_only); + i = get_choice(INDEX_TOP + 3, _(txt_help_filter_text_type), - _(txt_filter_text_type), - _(txt_subj_line_only_case), - _(txt_subj_line_only), - _(txt_from_line_only_case), - _(txt_from_line_only), - _(txt_msgid_line_only)); + _(txt_filter_text_type), list, 5); + free(list); + if (i == -1) { rule.comment = free_filter_comment(rule.comment); return FALSE; @@ -1126,7 +1141,12 @@ filter_menu( /* * Subject: */ - i = get_choice(INDEX_TOP + 5, _(txt_help_filter_subj), text_subj, _(txt_yes), _(txt_no), (char *) 0, (char *) 0, (char *) 0); + list = my_malloc(sizeof(char *) * 2); + list[0] = (char *) _(txt_yes); + list[1] = (char *) _(txt_no); + i = get_choice(INDEX_TOP + 5, _(txt_help_filter_subj), text_subj, list, 2); + free(list); + if (i == -1) { rule.comment = free_filter_comment(rule.comment); return FALSE; @@ -1136,7 +1156,17 @@ filter_menu( /* * From: */ - i = get_choice(INDEX_TOP + 6, _(txt_help_filter_from), text_from, (rule.subj_ok ? _(txt_no) : _(txt_yes)), (rule.subj_ok ? _(txt_yes) : _(txt_no)), (char *) 0, (char *) 0, (char *) 0); + list = my_malloc(sizeof(char *) * 2); + if (rule.subj_ok) { + list[0] = (char *) _(txt_no); + list[1] = (char *) _(txt_yes); + } else { + list[0] = (char *) _(txt_yes); + list[1] = (char *) _(txt_no); + } + i = get_choice(INDEX_TOP + 6, _(txt_help_filter_from), text_from, list, 2); + free(list); + if (i == -1) { rule.comment = free_filter_comment(rule.comment); return FALSE; @@ -1146,10 +1176,20 @@ filter_menu( /* * Message-ID: */ - if (rule.subj_ok || rule.from_ok) - i = get_choice(INDEX_TOP + 7, _(txt_help_filter_msgid), text_msgid, _(txt_no), _(txt_full), _(txt_last), _(txt_only), (char *) 0); - else - i = get_choice(INDEX_TOP + 7, _(txt_help_filter_msgid), text_msgid, _(txt_full), _(txt_last), _(txt_only), _(txt_no), (char *) 0); + list = my_malloc(sizeof(char *) * 4); + if (rule.subj_ok || rule.from_ok) { + list[0] = (char *) _(txt_no); + list[1] = (char *) _(txt_full); + list[2] = (char *) _(txt_last); + list[3] = (char *) _(txt_only); + } else { + list[0] = (char *) _(txt_full); + list[1] = (char *) _(txt_last); + list[2] = (char *) _(txt_only); + list[3] = (char *) _(txt_no); + } + i = get_choice(INDEX_TOP + 7, _(txt_help_filter_msgid), text_msgid, list, 4); + free(list); if (i == -1) { rule.comment = free_filter_comment(rule.comment); @@ -1266,8 +1306,13 @@ filter_menu( */ snprintf(double_time, sizeof(double_time), "2x %s", text_time); snprintf(quat_time, sizeof(double_time), "4x %s", text_time); - i = get_choice(INDEX_TOP + 11, _(txt_help_filter_time), ptr_filter_time, - _(txt_unlimited_time), text_time, double_time, quat_time, (char *) 0); + list = my_malloc(sizeof(char *) * 4); + list[0] = (char *) _(txt_unlimited_time); + list[1] = text_time; + list[2] = double_time; + list[3] = quat_time; + i = get_choice(INDEX_TOP + 11, _(txt_help_filter_time), ptr_filter_time, list, 4); + free(list); if (i == -1) { rule.comment = free_filter_comment(rule.comment); @@ -1280,41 +1325,33 @@ filter_menu( * Scope */ if (*rule.text || rule.subj_ok || rule.from_ok || rule.msgid_ok || rule.lines_ok) { - strcpy(argv[0], group->name); - strcpy(argv[1], _(txt_all_groups)); - strcpy(argv[2], group->name); - ptr = strrchr(argv[2], '.'); - if (ptr != NULL) { - ptr++; - *(ptr++) = '*'; - *ptr = '\0'; - strcpy(argv[3], argv[2]); - argv[3][strlen(argv[3]) - 2] = '\0'; - ptr = strrchr(argv[3], '.'); - if (ptr != NULL) { - ptr++; - *(ptr++) = '*'; - *ptr = '\0'; - } else - argv[3][0] = '\0'; - - } else - argv[2][0] = '\0'; + int j = 0; - i = get_choice(INDEX_TOP + 13, ptr_filter_help_scope, - ptr_filter_scope, - (argv[0][0] ? argv[0] : (char *) 0), - (argv[1][0] ? argv[1] : (char *) 0), - (argv[2][0] ? argv[2] : (char *) 0), - (argv[3][0] ? argv[3] : (char *) 0), - (char *) 0); + list = my_malloc(sizeof(char *) * 2); /* at least 2 scopes */ + list[j++] = my_strdup(group->name); + list[j] = my_strdup(list[j - 1]); + while ((ptr = strrchr(list[j], '.')) != NULL) { + *(++ptr) = '*'; + *(++ptr) = '\0'; + j++; + list = my_realloc(list, sizeof(char *) * (j + 1)); /* one element more */ + list[j] = my_strdup(list[j - 1]); + list[j][strlen(list[j]) - 2] = '\0'; + } + free(list[j]); /* this copy isn't needed anymore */ + list[j] = (char *) _(txt_all_groups); + + if ((i = get_choice(INDEX_TOP + 13, ptr_filter_help_scope, ptr_filter_scope, list, j + 1)) > 0) + strncpy(rule.scope, i == j ? "*" : list[i], sizeof(rule.scope)); + + for(j--; j >= 0; j--) + free(list[j]); + free(list); if (i == -1) { rule.comment = free_filter_comment(rule.comment); return FALSE; } - - strcpy(rule.scope, ((i == 1) ? "*" : argv[i])); } else { rule.comment = free_filter_comment(rule.comment); return FALSE; @@ -1543,16 +1580,16 @@ add_filter_rule( ptr[i].inscope = TRUE; ptr[i].fullref = FILTER_MSGID; ptr[i].comment = (struct t_filter_comment *) 0; - ptr[i].scope = (char *) 0; - ptr[i].subj = (char *) 0; - ptr[i].from = (char *) 0; - ptr[i].msgid = (char *) 0; + ptr[i].scope = NULL; + ptr[i].subj = NULL; + ptr[i].from = NULL; + ptr[i].msgid = NULL; ptr[i].lines_cmp = rule->lines_cmp; ptr[i].lines_num = rule->lines_num; ptr[i].gnksa_cmp = FILTER_LINES_NO; ptr[i].gnksa_num = 0; ptr[i].score = rule->score; - ptr[i].xref = (char *) 0; + ptr[i].xref = NULL; if (rule->comment != NULL) ptr[i].comment = copy_filter_comment(rule->comment, ptr[i].comment); @@ -1791,14 +1828,7 @@ filter_articles( * Filter on Subject: line */ if (ptr[j].subj != NULL) { - 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])) { + switch (test_regex(arts[i].subject, ptr[j].subj, ptr[j].icase, ®ex_cache_subj[j])) { case 1: SET_FILTER(group, i, j); break; @@ -1810,7 +1840,6 @@ filter_articles( default: break; } - free(tmp); } /* @@ -1822,11 +1851,6 @@ filter_articles( else strcpy(buf, arts[i].from); -#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); @@ -1890,9 +1914,9 @@ filter_articles( break; } - x = test_regex(myrefs, ptr[j].msgid, FALSE, ®ex_cache_msgid[j]); - if (x == 0) /* no match */ + if ((x = test_regex(myrefs, ptr[j].msgid, FALSE, ®ex_cache_msgid[j])) == 0) /* no match */ x = test_regex(mymsgid, ptr[j].msgid, FALSE, ®ex_cache_msgid[j]); + switch (x) { case 1: SET_FILTER(group, i, j); diff -Nurp tin-1.7.5/src/getline.c tin-1.7.6/src/getline.c --- tin-1.7.5/src/getline.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/getline.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : getline.c * Author : Chris Thewalt & Iain Lea * Created : 1991-11-09 - * Updated : 2004-03-14 + * Updated : 2004-07-02 * 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 @@ -135,12 +135,12 @@ tin_getline( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (str != NULL) { - wchar_t wbuf[LEN]; + wchar_t *wbuf; - if (mbstowcs(wbuf, str, ARRAY_SIZE(wbuf) - 1) != (size_t) -1) { - wbuf[ARRAY_SIZE(wbuf) - 1] = (wchar_t) '\0'; + if ((wbuf = char2wchar_t(str)) != NULL) { for (i = 0; wbuf[i]; i++) gl_addwchar(wbuf[i]); + free(wbuf); } } @@ -228,7 +228,7 @@ tin_getline( default: input_context = cNone; - return (char *) 0; + return NULL; } break; @@ -684,17 +684,8 @@ hist_add( return; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - { - int size = wcstombs(NULL, gl_buf, 0); - - tmp = my_malloc(size + 1); - if (wcstombs(tmp, gl_buf, size) == (size_t) -1) { - /* conversion failed */ - free(tmp); - return; - } else - tmp[size] = '\0'; - } + if ((tmp = wchar_t2char(gl_buf)) == NULL) + return; #else tmp = my_strdup(gl_buf); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ diff -Nurp tin-1.7.5/src/group.c tin-1.7.6/src/group.c --- tin-1.7.5/src/group.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/group.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : group.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-03-16 + * Updated : 2004-07-19 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -45,14 +45,6 @@ # include "menukeys.h" #endif /* !MENUKEYS_H */ -#define INDEX2SNUM(i) ((i) % NOTESLINES) -#ifdef USE_CURSES -# define INDEX2LNUM(i) (INDEX_TOP + INDEX2SNUM(i)) -#endif /* USE_CURSES */ - -/* 3+1+3; width(art_mark) + space + width(unread count) */ -#define MAGIC 7 - /* * Globally accessible pointer to currently active group * Any functionality accessed from group level or below can use this pointer. @@ -92,13 +84,11 @@ static void show_tagged_lines( void) { - int i; + int i, j; for (i = grpmenu.first; i < grpmenu.last; ++i) { - if ((i != grpmenu.curr) && line_is_tagged(base[i])) { - build_sline(i); - draw_line(i, MAGIC); - } + if ((i != grpmenu.curr) && (j = line_is_tagged(base[i]))) + mark_screen(i, MARK_OFFSET - 2, tin_ltoa(j, 3)); } } @@ -611,8 +601,16 @@ group_page( arts[ii].tagged = ++num_of_tagged_arts; } } - build_sline(grpmenu.curr); - draw_line(grpmenu.curr, MAGIC); + if ((ii = line_is_tagged(n))) + mark_screen(grpmenu.curr, MARK_OFFSET - 2, tin_ltoa(ii, 3)); + else { + char mark[] = { '\0', '\0' }; + + stat_thread(grpmenu.curr, &sbuf); + mark[0] = sbuf.art_mark; + mark_screen(grpmenu.curr, MARK_OFFSET - 2, " "); /* clear space used by tag numbering */ + mark_screen(grpmenu.curr, MARK_OFFSET, mark); + } if (tagged) show_tagged_lines(); @@ -697,7 +695,6 @@ group_page( show_group_title(TRUE); build_sline(grpmenu.curr); - draw_line(grpmenu.curr, MAGIC); draw_subject_arrow(); info_message(_(txt_marked_as_unread), ptr); } @@ -730,7 +727,6 @@ group_page( show_group_title(TRUE); build_sline(grpmenu.curr); - draw_line(grpmenu.curr, MAGIC); draw_subject_arrow(); info_message(_(txt_marked_as_unread), ptr); } @@ -755,13 +751,15 @@ group_page( ++n; } assert(n > 0); - build_sline(grpmenu.curr); - draw_line(grpmenu.curr, MAGIC); + { + char mark[] = { '\0', '\0' }; - info_message(flag - ? _(txt_thread_marked_as_selected) - : _(txt_thread_marked_as_deselected)); + stat_thread(grpmenu.curr, &sbuf); + mark[0] = sbuf.art_mark; + mark_screen(grpmenu.curr, MARK_OFFSET, mark); + } + info_message(flag ? _(txt_thread_marked_as_selected) : _(txt_thread_marked_as_deselected)); show_group_title(TRUE); if (grpmenu.curr + 1 < grpmenu.max) { @@ -817,7 +815,6 @@ group_page( for_each_art_in_thread(i, n) arts[i].selected = TRUE; - build_sline(n); flag = TRUE; } if (flag) { @@ -909,10 +906,8 @@ show_group_page( if (tinrc.draw_arrow) CleartoEOS(); - for (i = grpmenu.first; i < grpmenu.last; ++i) { + for (i = grpmenu.first; i < grpmenu.last; ++i) build_sline(i); - draw_line(i, 0); - } CleartoEOS(); show_mini_help(GROUP_LEVEL); @@ -931,11 +926,21 @@ static void update_group_page( void) { - int i; + int i, j; + char mark[] = { '\0', '\0' }; + struct t_art_stat sbuf; for (i = grpmenu.first; i < grpmenu.last; ++i) { - build_sline(i); - draw_line(i, MAGIC); + if ((j = line_is_tagged(base[i]))) + mark_screen(i, MARK_OFFSET - 2, tin_ltoa(j, 3)); + else { + stat_thread(i, &sbuf); + mark[0] = sbuf.art_mark; + mark_screen(i, MARK_OFFSET - 2, " "); /* clear space used by tag numbering */ + mark_screen(i, MARK_OFFSET, mark); + if (sbuf.art_mark == tinrc.art_marked_selected) + draw_mark_selected(i); + } } if (grpmenu.max <= 0) @@ -1058,13 +1063,12 @@ pos_first_unread_thread( void mark_screen( - int level, /* Always SELECT_LEVEL - TODO: move to select.c or use this everywhere */ int screen_row, int screen_col, const char *value) { if (tinrc.draw_arrow) { - MoveCursor(INDEX_TOP + screen_row, screen_col); + MoveCursor(INDEX2LNUM(screen_row), screen_col); my_fputs(value, stdout); stow_cursor(); my_flush(); @@ -1072,17 +1076,16 @@ mark_screen( #ifdef USE_CURSES int y, x; getyx(stdscr, y, x); - mvaddstr(INDEX_TOP + screen_row, screen_col, value); + mvaddstr(INDEX2LNUM(screen_row), screen_col, value); MoveCursor(y, x); #else int i; for (i = 0; value[i] != '\0'; i++) - screen[screen_row].col[screen_col + i] = value[i]; + screen[INDEX2SNUM(screen_row)].col[screen_col + i] = value[i]; + MoveCursor(INDEX2LNUM(screen_row), screen_col); + my_fputs(value, stdout); #endif /* USE_CURSES */ - if (level == SELECT_LEVEL) - draw_group_arrow(); - else - draw_subject_arrow(); + currmenu->draw_arrow(); } } @@ -1116,12 +1119,10 @@ build_multipart_header( /* * Build subject line given an index into base[]. * - * WARNING: the routine is tightly coupled with draw_line() in the sense - * that draw_line() expects build_sline() to place the article mark - * (ART_MARK_READ, ART_MARK_SELECTED, etc) at MARK_OFFSET in the - * screen[].col. - * So, if you change the format used in this routine, be sure to check - * that the value of MARK_OFFSET (tin.h) is still correct. + * WARNING: some other code expects to find the article mark (ART_MARK_READ, + * ART_MARK_SELECTED, etc) at MARK_OFFSET from beginning of the line. + * So, if you change the format used in this routine, be sure to check that + * the value of MARK_OFFSET (tin.h) is still correct. * Yes, this is somewhat kludgy. */ static void @@ -1143,8 +1144,8 @@ build_sline( size_t len; wchar_t format[32]; wchar_t wbuffer[LEN]; - wchar_t tmp_subj[256], tmp_subj2[256]; - wchar_t tmp_from[HEADER_LEN], tmp_from2[HEADER_LEN]; + wchar_t *tmp_subj = NULL, *tmp_subj2; + wchar_t *tmp_from = NULL, *tmp_from2; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ /* set len_from and len_subj */ @@ -1261,26 +1262,20 @@ 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 */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - mbstowcs(tmp_subj2, arts_sub, ARRAY_SIZE(tmp_subj2) - 1); - mbstowcs(tmp_from2, from, ARRAY_SIZE(tmp_from2) - 1); - tmp_subj2[ARRAY_SIZE(tmp_subj2) - 1] = (wchar_t) '\0'; - tmp_from2[ARRAY_SIZE(tmp_from2) - 1] = (wchar_t) '\0'; - /* format subject and from */ - wcspart(tmp_subj, tmp_subj2, len_subj - 12, ARRAY_SIZE(tmp_subj), TRUE); - wcspart(tmp_from, tmp_from2, len_from, ARRAY_SIZE(tmp_from), TRUE); + if ((tmp_subj2 = char2wchar_t(arts_sub)) != NULL) { + tmp_subj = wcspart(tmp_subj2, len_subj - 12, TRUE); + free(tmp_subj2); + } + if ((tmp_from2 = char2wchar_t(from)) != NULL) { + tmp_from = wcspart(tmp_from2, len_from, TRUE); + free(tmp_from2); + } if (curr_group->attribute->show_info == SHOW_INFO_SCORE || curr_group->attribute->show_info == SHOW_INFO_BOTH) { mbstowcs(format, " %s %s %s%6d %-ls%s%-ls", ARRAY_SIZE(format) - 1); @@ -1294,6 +1289,9 @@ build_sline( spaces, tmp_from); } + FreeIfNeeded(tmp_subj); + FreeIfNeeded(tmp_from); + if ((len = wcstombs(buffer, wbuffer, cCOLS * MB_CUR_MAX)) == (size_t) -1) len = 0; buffer[len] = '\0'; @@ -1312,15 +1310,18 @@ build_sline( spaces, len_from, len_from, from); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ -#ifdef USE_CURSES /* * protect display from non-displayable characters (e.g., form-feed) * and write line. */ WriteLine(INDEX2LNUM(i), convert_to_printable(buffer)); +#ifdef USE_CURSES free(buffer); #endif /* USE_CURSES */ + if (sbuf.art_mark == tinrc.art_marked_selected) + draw_mark_selected(i); + MoveCursor(INDEX2LNUM(i) + 1, 0); } @@ -1700,10 +1701,8 @@ mark_thd_read( */ if (range_active || ch == iKeyMarkReadTag) show_group_page(); - else { + else build_sline(grpmenu.curr); - draw_line(grpmenu.curr, MAGIC); - } /* * Move cursor to next unread diff -Nurp tin-1.7.5/src/hashstr.c tin-1.7.6/src/hashstr.c --- tin-1.7.5/src/hashstr.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/hashstr.c 2004-08-20 10:30:49.000000000 +0200 @@ -68,7 +68,7 @@ hash_str( struct t_hashnode **p; /* used to descend the spillover structs */ if (s == NULL) - return (char *) 0; + return NULL; h = 0; while (*t) { diff -Nurp tin-1.7.5/src/header.c tin-1.7.6/src/header.c --- tin-1.7.5/src/header.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/header.c 2004-08-20 10:30:49.000000000 +0200 @@ -372,9 +372,9 @@ build_sender( strcat(sender, ptr); strcat(sender, ">"); } else - return (char *) 0; + return NULL; } else - return (char *) 0; + return NULL; return sender; } diff -Nurp tin-1.7.5/src/init.c tin-1.7.6/src/init.c --- tin-1.7.5/src/init.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/init.c 2004-08-20 11:55:11.000000000 +0200 @@ -3,7 +3,7 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-06-06 + * Updated : 2004-08-20 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -510,14 +510,19 @@ init_selfinfo( domain_name[0] = '\0'; -#if defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) - if (uname(&system_info) < 0) { +#ifdef HAVE_SYS_UTSNAME_H +# ifdef HAVE_UNAME + if (!uname(&system_info)) + ; + else +# endif /* HAVE_UNAME */ + { strcpy(system_info.sysname, "unknown"); *system_info.machine = '\0'; *system_info.release = '\0'; *system_info.nodename = '\0'; } -#endif /* HAVE_SYS_UTSNAME_H && HAVE_UNAME */ +#endif /* HAVE_SYS_UTSNAME_H */ #ifdef DOMAIN_NAME if ((cptr = get_domain_name()) != NULL) @@ -527,7 +532,7 @@ init_selfinfo( #ifdef HAVE_GETHOSTBYNAME if (domain_name[0] == '\0') { cptr = get_fqdn(get_host_name()); - if (cptr != (char *) 0) + if (cptr != NULL) strcpy(domain_name, cptr); } #endif /* HAVE_GETHOSTBYNAME */ @@ -608,7 +613,7 @@ init_selfinfo( newsrc[0] = '\0'; snprintf(page_header, sizeof(page_header), "%s %s release %s (\"%s\") [%s%s]", - tin_progname, VERSION, RELEASEDATE, RELEASENAME, OSNAME, + PRODUCT, VERSION, RELEASEDATE, RELEASENAME, OSNAME, (iso2asc_supported >= 0 ? " ISO2ASC" : "")); snprintf(cvers, sizeof(cvers), txt_copyright_notice, page_header); diff -Nurp tin-1.7.5/src/lang.c tin-1.7.6/src/lang.c --- tin-1.7.5/src/lang.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/lang.c 2004-09-03 17:31:14.000000000 +0200 @@ -3,7 +3,7 @@ * Module : lang.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-06-06 + * Updated : 2004-09-03 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -606,6 +606,9 @@ constext txt_reading_news_active_file[] constext txt_reading_news_newsrc_file[] = N_("Reading groups from newsrc file... "); constext txt_reading_newsgroups_file[] = N_("Reading newsgroups file... "); constext txt_reading_newsrc[] = N_("Reading newsrc file..."); +#ifdef HAVE_GETTIMEOFDAY + constext txt_remaining[] = N_("(%d:%02d remaining)"); +#endif /* HAVE_GETTIMEOFDAY */ constext txt_remove_bogus[] = N_("Bogus group %s removed."); constext txt_rename_error[] = N_("Error: rename %s to %s"); constext txt_reply_to_author[] = N_("Reply to author..."); @@ -2065,6 +2068,7 @@ struct opttxt txt_advertising = { N_("# If ON include advertising User-Agent: header\n") }; +#ifndef CHARSET_CONVERSION struct opttxt txt_mm_charset = { N_("Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set."), N_("MM_CHARSET"), @@ -2075,14 +2079,13 @@ struct opttxt txt_mm_charset = { # If MIME_STRICT_CHARSET is defined at compile-time, charset other than\n\ # mm_charset is considered not displayable and represented as '?'.\n") }; - -#ifdef CHARSET_CONVERSION +#else struct opttxt txt_mm_network_charset = { N_(" toggles, sets, cancels."), N_("MM_NETWORK_CHARSET"), N_("# Charset used for MIME (Content-Type) header in postings.\n") }; -#endif /* CHARSET_CONVERSION */ +#endif /* !CHARSET_CONVERSION */ struct opttxt txt_mailbox_format = { N_(" toggles, sets, cancels."), diff -Nurp tin-1.7.5/src/mail.c tin-1.7.6/src/mail.c --- tin-1.7.5/src/mail.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/mail.c 2004-08-20 10:30:49.000000000 +0200 @@ -141,8 +141,8 @@ read_mail_active_file( strfpath(my_spooldir, buf2, sizeof(buf2) - 1, ptr); ptr->spooldir = my_strdup(buf2); group_get_art_info(ptr->spooldir, buf, GROUP_TYPE_MAIL, &ptr->count, &ptr->xmax, &ptr->xmin); - ptr->aliasedto = (char *) 0; - ptr->description = (char *) 0; + ptr->aliasedto = NULL; + ptr->description = NULL; ptr->moderated = 'y'; ptr->type = GROUP_TYPE_MAIL; ptr->inrange = FALSE; @@ -337,7 +337,7 @@ read_groups_descriptions( FILE *fp_save) { char *p, *q, *ptr; - char *groupname = (char *) 0; + char *groupname = NULL; int count = 0; size_t space = 0; struct t_group *group; diff -Nurp tin-1.7.5/src/main.c tin-1.7.6/src/main.c --- tin-1.7.5/src/main.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/main.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : main.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-01-12 + * Updated : 2004-07-14 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -586,230 +586,7 @@ read_cmd_line_options( break; case 'V': -#if defined(__DATE__) && defined(__TIME__) - error_message(_("Version: %s release %s (\"%s\") %s %s"), - VERSION, RELEASEDATE, RELEASENAME, __DATE__, __TIME__); -#else - error_message(_("Version: %s release %s (\"%s\")"), - VERSION, RELEASEDATE, RELEASENAME); -#endif /* __DATE__ && __TIME__ */ -/* - * FIXME: make the rest below a function (i.e. to fill a struct), so we - * can also use it inside post.c:mail_bug_report() - */ -#ifdef SYSTEM_NAME - error_message("Platform:"); - error_message("\tOS-Name = \"%s\"", SYSTEM_NAME); -#endif /* SYSTEM_NAME */ -#ifdef TIN_CC - error_message("Compiler:"); - error_message("\tCC = \"%s\"", TIN_CC); -# ifdef TIN_CFLAGS - error_message("\tCFLAGS = \"%s\"", TIN_CFLAGS); -# endif /* TIN_CFLAGS */ -# ifdef TIN_CPP - error_message("\tCPP = \"%s\"", TIN_CPP); -# endif /* TIN_CPP */ -# ifdef TIN_CPPFLAGS - error_message("\tCPPFLAGS = \"%s\"", TIN_CPPFLAGS); -# endif /* TIN_CPPFLAGS */ -#endif /* TIN_CC */ - -#ifdef TIN_LD - error_message("Linker and Libraries:"); - error_message("\tLD = \"%s\"", TIN_LD); -# ifdef TIN_LDFLAGS - error_message("\tLDFLAGS = \"%s\"", TIN_LDFLAGS); -# endif /* TIN_LDFLAGS */ - -# ifdef TIN_LIBS - error_message("\tLIBS = \"%s\"", TIN_LIBS); -# endif /* TIN_LIBS */ -#endif /* TIN_LD */ - - error_message("Characteristics:"); - error_message("\t" -/* TODO: complete list and do some useful grouping */ -#ifdef NNTP_ONLY - "+NNTP_ONLY " -#else -# ifdef NNTP_ABLE - "+NNTP_ABLE " -# else - "-NNTP_ABLE " -# endif /* NNTP_ABLE */ -#endif /* NNTP_ONLY */ -#ifdef NO_POSTING - "+NO_POSTING " -#else - "-NO_POSTING " -#endif /* NO_POSTING */ -#ifdef BROKEN_LISTGROUP - "+BROKEN_LISTGROUP " -#else - "-BROKEN_LISTGROUP " -#endif /* BROKEN_LISTGROUP */ -#ifdef XHDR_XREF - "+XHDR_XREF" -#else - "-XHDR_XREF" -#endif /* XHDR_XREF */ - "\n\t" -#ifdef HAVE_FASCIST_NEWSADMIN - "+HAVE_FASCIST_NEWSADMIN " -#else - "-HAVE_FASCIST_NEWSADMIN " -#endif /* HAVE_FASCIST_NEWSADMIN */ -#ifdef ENABLE_IPV6 - "+ENABLE_IPV6 " -#else - "-ENABLE_IPV6 " -#endif /* ENABLE_IPV6 */ -#ifdef HAVE_COREFILE - "+HAVE_COREFILE" -#else - "-HAVE_COREFILE" -#endif /* HAVE_COREFILE */ - "\n\t" -#ifdef NO_SHELL_ESCAPE - "+NO_SHELL_ESCAPE " -#else - "-NO_SHELL_ESCAPE " -#endif /* NO_SHELL_ESCAPE */ -#ifdef DISABLE_PRINTING - "+DISABLE_PRINTING " -#else - "-DISABLE_PRINTING " -#endif /* DISABLE_PRINTING */ -#ifdef DONT_HAVE_PIPING - "+DONT_HAVE_PIPING " -#else - "-DONT_HAVE_PIPING " -#endif /* DONT_HAVE_PIPING */ -#ifdef NO_ETIQUETTE - "+NO_ETIQUETTE" -#else - "-NO_ETIQUETTE" -#endif /* NO_ETIQUETTE */ - "\n\t" -#ifdef HAVE_LONG_FILE_NAMES - "+HAVE_LONG_FILE_NAMES " -#else - "-HAVE_LONG_FILE_NAMES " -#endif /* HAVE_LONG_FILE_NAMES */ -#ifdef APPEND_PID - "+APPEND_PID " -#else - "-APPEND_PID " -#endif /* APPEND_PID */ -#ifdef HAVE_MH_MAIL_HANDLING - "+HAVE_MH_MAIL_HANDLING" -#else - "-HAVE_MH_MAIL_HANDLING" -#endif /* HAVE_MH_MAIL_HANDLING */ - "\n\t" -#ifdef HAVE_ISPELL - "+HAVE_ISPELL " -#else - "-HAVE_ISPELL " -#endif /* HAVE_ISPELL */ -#ifdef HAVE_METAMAIL - "+HAVE_METAMAIL " -#else - "-HAVE_METAMAIL " -#endif /* HAVE_METAMAIL */ -#ifdef HAVE_SUM - "+HAVE_SUM" -#else - "-HAVE_SUM" -#endif /* HAVE_SUM */ - "\n\t" -#ifdef HAVE_COLOR - "+HAVE_COLOR " -#else - "-HAVE_COLOR " -#endif /* HAVE_COLOR */ -#ifdef HAVE_PGP - "+HAVE_PGP " -#else - "-HAVE_PGP " -#endif /* HAVE_PGP */ -#ifdef HAVE_PGPK - "+HAVE_PGPK " -#else - "-HAVE_PGPK " -#endif /* HAVE_PGPK */ -#ifdef HAVE_GPG - "+HAVE_GPG" -#else - "-HAVE_GPG" -#endif /* HAVE_GPG */ - "\n\t" -#ifdef MIME_BREAK_LONG_LINES - "+MIME_BREAK_LONG_LINES " -#else - "-MIME_BREAK_LONG_LINES " -#endif /* MIME_BREAK_LONG_LINES */ -#ifdef MIME_STRICT_CHARSET - "+MIME_STRICT_CHARSET " -#else - "-MIME_STRICT_CHARSET " -#endif /* MIME_STRICT_CHARSET */ -#ifdef CHARSET_CONVERSION - "+CHARSET_CONVERSION" -#else - "-CHARSET_CONVERSION" -#endif /* CHARSET_CONVERSION */ - "\n\t" -#ifdef MULTIBYTE_ABLE - "+MULTIBYTE_ABLE " -#else - "-MULTIBYTE_ABLE " -#endif /* MULTIBYTE_ABLE */ -#ifdef NO_LOCALE - "+NO_LOCALE" -#else - "-NO_LOCALE" -#endif /* NO_LOCALE */ - "\n\t" -#ifdef USE_CANLOCK - "+USE_CANLOCK " -#else - "-USE_CANLOCK " -#endif /* USE_CANLOCK */ -#ifdef EVIL_INSIDE - "+EVIL_INSIDE " -#else - "-EVIL_INSIDE " -#endif /* EVIL_INSIDE */ -#ifdef FORGERY - "+FORGERY " -#else - "-FORGERY " -#endif /* FORGERY */ -#ifdef TINC_DNS - "+TINC_DNS " -#else - "-TINC_DNS " -#endif /* TINC_DNS */ -#ifdef ENFORCE_RFC1034 - "+ENFORCE_RFC1034" -#else - "-ENFORCE_RFC1034" -#endif /* ENFORCE_RFC1034 */ - ); - error_message("\t" -#ifdef REQUIRE_BRACKETS_IN_DOMAIN_LITERAL - "+REQUIRE_BRACKETS_IN_DOMAIN_LITERAL " -#else - "-REQUIRE_BRACKETS_IN_DOMAIN_LITERAL " -#endif /* REQUIRE_BRACKETS_IN_DOMAIN_LITERAL */ -#ifdef FOLLOW_USEFOR_DRAFT - "+FOLLOW_USEFOR_DRAFT" -#else - "-FOLLOW_USEFOR_DRAFT" -#endif /* FOLLOW_USEFOR_DRAFT */ - ); + tin_version_info(stderr); exit(EXIT_SUCCESS); /* keep lint quiet: */ /* FALLTHROUGH */ diff -Nurp tin-1.7.5/src/misc.c tin-1.7.6/src/misc.c --- tin-1.7.5/src/misc.c 2004-08-20 10:35:12.000000000 +0200 +++ tin-1.7.6/src/misc.c 2004-08-20 10:51:50.000000000 +0200 @@ -3,7 +3,7 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-06-07 + * Updated : 2004-08-20 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -38,6 +38,9 @@ #ifndef TIN_H # include "tin.h" #endif /* !TIN_H */ +#ifndef VERSION_H +# include "version.h" +#endif /* !VERSION_H */ #ifndef TCURSES_H # include "tcurses.h" #endif /* !TCURSES_H */ @@ -805,16 +808,21 @@ invoke_cmd( need_resize = cYes; /* Flag a redraw */ } -#ifdef VMS - success = (ret != 0); +#ifdef IGNORE_SYSTEM_STATUS + return TRUE; #else - success = (ret == 0); -#endif /* VMS */ + +# ifdef VMS + success = (ret != 0); +# else + success = (ret == 0); +# endif /* VMS */ if (!success || system_status != 0) error_message(_(txt_command_failed), nam); return success; +#endif /* IGNORE_SYSTEM_STATUS */ } @@ -839,7 +847,6 @@ draw_percent_mark( snprintf(buf, sizeof(buf), "%s(%d%%) [%ld/%ld]", _(txt_more), (int) (cur_num * 100 / max_num), cur_num, max_num); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if ((wbuf = char2wchar_t(buf)) != NULL) { - wconvert_to_printable(wbuf); len = wcswidth(wbuf, wcslen(wbuf) + 1); free(wbuf); } else @@ -3528,7 +3535,7 @@ strip_line( } -#if defined(CHARSET_CONVERSION) || defined(HAVE_UNICODE_NORMALIZATION) +#if defined(CHARSET_CONVERSION) || (defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)) /* * 'check' a given UTF-8 strig and '?'-out illegal sequences * TODO: is this check complete? @@ -3664,7 +3671,7 @@ utf8_valid( } return line; } -#endif /* CHARSET_CONVERSION || HAVE_UNICODE_NORMALIZATION */ +#endif /* CHARSET_CONVERSION || (MULTIBYTE_ABLE && !NO_LOCALE) */ char *idna_decode( @@ -3694,6 +3701,259 @@ char *idna_decode( } +int +tin_version_info( + FILE *fp) +{ + int wlines = 0; /* written lines */ + +#if defined(__DATE__) && defined(__TIME__) + fprintf(fp, _("Version: %s %s release %s (\"%s\") %s %s\n"), + PRODUCT, VERSION, RELEASEDATE, RELEASENAME, __DATE__, __TIME__); +#else + fprintf(fp, _("Version: %s %s release %s (\"%s\")\n"), + PRODUCT, VERSION, RELEASEDATE, RELEASENAME); +#endif /* __DATE__ && __TIME__ */ + wlines++; + +#ifdef SYSTEM_NAME + fprintf(fp, "Platform:\n"); + fprintf(fp, "\tOS-Name = \"%s\"\n", SYSTEM_NAME); + wlines += 2; +#endif /* SYSTEM_NAME */ + +#ifdef TIN_CC + fprintf(fp, "Compiler:\n"); + fprintf(fp, "\tCC = \"%s\"\n", TIN_CC); + wlines += 2; +# ifdef TIN_CFLAGS + fprintf(fp, "\tCFLAGS = \"%s\"\n", TIN_CFLAGS); + wlines++; +# endif /* TIN_CFLAGS */ +# ifdef TIN_CPP + fprintf(fp, "\tCPP = \"%s\"\n", TIN_CPP); + wlines++; +# endif /* TIN_CPP */ +# ifdef TIN_CPPFLAGS + fprintf(fp, "\tCPPFLAGS = \"%s\"\n", TIN_CPPFLAGS); + wlines++; +# endif /* TIN_CPPFLAGS */ +#endif /* TIN_CC */ + +#ifdef TIN_LD + fprintf(fp, "Linker and Libraries:\n"); + fprintf(fp, "\tLD = \"%s\"\n", TIN_LD); + wlines += 2; +# ifdef TIN_LDFLAGS + fprintf(fp, "\tLDFLAGS = \"%s\"\n", TIN_LDFLAGS); + wlines++; +# endif /* TIN_LDFLAGS */ +# ifdef TIN_LIBS + fprintf(fp, "\tLIBS = \"%s\"\n", TIN_LIBS); + wlines++; +# endif /* TIN_LIBS */ +#endif /* TIN_LD */ + + fprintf(fp, "Characteristics:\n\t" +/* TODO: complete list and do some useful grouping */ +#ifdef NNTP_ONLY + "+NNTP_ONLY " +#else +# ifdef NNTP_ABLE + "+NNTP_ABLE " +# else + "-NNTP_ABLE " +# endif /* NNTP_ABLE */ +#endif /* NNTP_ONLY */ +#ifdef NO_POSTING + "+NO_POSTING " +#else + "-NO_POSTING " +#endif /* NO_POSTING */ +#ifdef BROKEN_LISTGROUP + "+BROKEN_LISTGROUP " +#else + "-BROKEN_LISTGROUP " +#endif /* BROKEN_LISTGROUP */ +#ifdef XHDR_XREF + "+XHDR_XREF" +#else + "-XHDR_XREF" +#endif /* XHDR_XREF */ + "\n\t" +#ifdef HAVE_FASCIST_NEWSADMIN + "+HAVE_FASCIST_NEWSADMIN " +#else + "-HAVE_FASCIST_NEWSADMIN " +#endif /* HAVE_FASCIST_NEWSADMIN */ +#ifdef ENABLE_IPV6 + "+ENABLE_IPV6 " +#else + "-ENABLE_IPV6 " +#endif /* ENABLE_IPV6 */ +#ifdef HAVE_COREFILE + "+HAVE_COREFILE" +#else + "-HAVE_COREFILE" +#endif /* HAVE_COREFILE */ + "\n\t" +#ifdef NO_SHELL_ESCAPE + "+NO_SHELL_ESCAPE " +#else + "-NO_SHELL_ESCAPE " +#endif /* NO_SHELL_ESCAPE */ +#ifdef DISABLE_PRINTING + "+DISABLE_PRINTING " +#else + "-DISABLE_PRINTING " +#endif /* DISABLE_PRINTING */ +#ifdef DONT_HAVE_PIPING + "+DONT_HAVE_PIPING " +#else + "-DONT_HAVE_PIPING " +#endif /* DONT_HAVE_PIPING */ +#ifdef NO_ETIQUETTE + "+NO_ETIQUETTE" +#else + "-NO_ETIQUETTE" +#endif /* NO_ETIQUETTE */ + "\n\t" +#ifdef HAVE_LONG_FILE_NAMES + "+HAVE_LONG_FILE_NAMES " +#else + "-HAVE_LONG_FILE_NAMES " +#endif /* HAVE_LONG_FILE_NAMES */ +#ifdef APPEND_PID + "+APPEND_PID " +#else + "-APPEND_PID " +#endif /* APPEND_PID */ +#ifdef HAVE_MH_MAIL_HANDLING + "+HAVE_MH_MAIL_HANDLING" +#else + "-HAVE_MH_MAIL_HANDLING" +#endif /* HAVE_MH_MAIL_HANDLING */ + "\n\t" +#ifdef HAVE_ISPELL + "+HAVE_ISPELL " +#else + "-HAVE_ISPELL " +#endif /* HAVE_ISPELL */ +#ifdef HAVE_METAMAIL + "+HAVE_METAMAIL " +#else + "-HAVE_METAMAIL " +#endif /* HAVE_METAMAIL */ +#ifdef HAVE_SUM + "+HAVE_SUM" +#else + "-HAVE_SUM" +#endif /* HAVE_SUM */ + "\n\t" +#ifdef HAVE_COLOR + "+HAVE_COLOR " +#else + "-HAVE_COLOR " +#endif /* HAVE_COLOR */ +#ifdef HAVE_PGP + "+HAVE_PGP " +#else + "-HAVE_PGP " +#endif /* HAVE_PGP */ +#ifdef HAVE_PGPK + "+HAVE_PGPK " +#else + "-HAVE_PGPK " +#endif /* HAVE_PGPK */ +#ifdef HAVE_GPG + "+HAVE_GPG" +#else + "-HAVE_GPG" +#endif /* HAVE_GPG */ + "\n\t" +#ifdef MIME_BREAK_LONG_LINES + "+MIME_BREAK_LONG_LINES " +#else + "-MIME_BREAK_LONG_LINES " +#endif /* MIME_BREAK_LONG_LINES */ +#ifdef MIME_STRICT_CHARSET + "+MIME_STRICT_CHARSET " +#else + "-MIME_STRICT_CHARSET " +#endif /* MIME_STRICT_CHARSET */ +#ifdef CHARSET_CONVERSION + "+CHARSET_CONVERSION" +#else + "-CHARSET_CONVERSION" +#endif /* CHARSET_CONVERSION */ + "\n\t" +#ifdef MULTIBYTE_ABLE + "+MULTIBYTE_ABLE " +#else + "-MULTIBYTE_ABLE " +#endif /* MULTIBYTE_ABLE */ +#ifdef NO_LOCALE + "+NO_LOCALE" +#else + "-NO_LOCALE" +#endif /* NO_LOCALE */ + "\n\t" +#ifdef USE_CANLOCK + "+USE_CANLOCK " +#else + "-USE_CANLOCK " +#endif /* USE_CANLOCK */ +#ifdef EVIL_INSIDE + "+EVIL_INSIDE " +#else + "-EVIL_INSIDE " +#endif /* EVIL_INSIDE */ +#ifdef FORGERY + "+FORGERY " +#else + "-FORGERY " +#endif /* FORGERY */ +#ifdef TINC_DNS + "+TINC_DNS " +#else + "-TINC_DNS " +#endif /* TINC_DNS */ +#ifdef ENFORCE_RFC1034 + "+ENFORCE_RFC1034" +#else + "-ENFORCE_RFC1034" +#endif /* ENFORCE_RFC1034 */ + "\n\t" +#ifdef REQUIRE_BRACKETS_IN_DOMAIN_LITERAL + "+REQUIRE_BRACKETS_IN_DOMAIN_LITERAL " +#else + "-REQUIRE_BRACKETS_IN_DOMAIN_LITERAL " +#endif /* REQUIRE_BRACKETS_IN_DOMAIN_LITERAL */ +#ifdef FOLLOW_USEFOR_DRAFT + "+FOLLOW_USEFOR_DRAFT" +#else + "-FOLLOW_USEFOR_DRAFT" +#endif /* FOLLOW_USEFOR_DRAFT */ + "\n"); + wlines += 11; + + fflush(fp); + return wlines; +} + + +void +draw_mark_selected( + int i) +{ + MoveCursor(INDEX2LNUM(i), MARK_OFFSET); + StartInverse(); /* ToggleInverse() doesn't work correct with ncurses4.x */ + my_fputc(tinrc.art_marked_selected, stdout); + EndInverse(); /* ToggleInverse() doesn't work correct with ncurses4.x */ + return; +} + + #if 0 /* * Stat a mail/news article to see if it still exists diff -Nurp tin-1.7.5/src/my_tmpfile.c tin-1.7.6/src/my_tmpfile.c --- tin-1.7.5/src/my_tmpfile.c 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/my_tmpfile.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : my_tmpfile.c * Author : Urs Janssen * Created : 2001-03-11 - * Updated : 2001-04-23 + * Updated : 2004-06-30 * Notes : * * Copyright (c) 2001-2004 Urs Janssen @@ -65,7 +65,8 @@ my_tmpfile( if (filename != NULL && name_size > 0) { if (!need_name) { - FILE *fp = (FILE *) 0; + FILE *fp; + if ((fp = tmpfile()) != NULL) fd = fileno(fp); #ifdef DEBUG diff -Nurp tin-1.7.5/src/nntplib.c tin-1.7.6/src/nntplib.c --- tin-1.7.5/src/nntplib.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/nntplib.c 2004-08-20 10:30:49.000000000 +0200 @@ -155,7 +155,7 @@ getserverbyfile( } if (file == NULL) - return (char *) 0; + return NULL; if ((fp = fopen(file, "r")) != NULL) { @@ -191,7 +191,7 @@ getserverbyfile( # endif /* NNTP_DEFAULT_SERVER */ #endif /* NNTP_ABLE */ - return (char *) 0; /* No entry */ + return NULL; /* No entry */ } @@ -403,7 +403,7 @@ get_tcp_socket( t_free((char *) callptr, T_CALL); - if (ioctl(s, I_POP, (char *) 0) < 0) { + if (ioctl(s, I_POP, NULL) < 0) { perror("I_POP(timod)"); t_close(s); return -EPROTO; diff -Nurp tin-1.7.5/src/options_menu.c tin-1.7.6/src/options_menu.c --- tin-1.7.5/src/options_menu.c 1970-01-01 01:00:00.000000000 +0100 +++ tin-1.7.6/src/options_menu.c 2004-09-05 16:19:25.000000000 +0200 @@ -0,0 +1,1427 @@ +/* + * Project : tin - a Usenet reader + * Module : options_menu.c + * Author : Michael Bienia + * Created : 2004-09-05 + * Updated : 2004-09-05 + * Notes : Split from config.c + * + * Copyright (c) 2004 Michael Bienia + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + +#ifndef TIN_H +# include "tin.h" +#endif /* !TIN_H */ +#ifndef TINTBL_H +# include "tincfg.h" +#endif /* !TINTBL_H */ +#ifndef TCURSES_H +# include "tcurses.h" +#endif /* !TCURSES_H */ +#ifndef MENUKEYS_H +# include "menukeys.h" +#endif /* !MENUKEYS_H */ + +#define option_lines_per_page (cLINES - INDEX_TOP - 3) + +static enum option_enum first_option_on_screen, last_option_on_screen; + +/* + * local prototypes + */ +static enum option_enum move_cursor(enum option_enum cur_option, t_bool down); +static enum option_enum next_option(enum option_enum option, t_bool incl_titles); +static enum option_enum prev_option(enum option_enum option, t_bool incl_titles); +static enum option_enum set_option_num(int num); +static int get_option_num(enum option_enum option); +static t_bool option_is_title(enum option_enum option); +static t_bool option_on_page(enum option_enum option); +static void highlight_option(enum option_enum option); +static void print_any_option(enum option_enum the_option); +static void redraw_screen(enum option_enum option); +static void repaint_option(enum option_enum option); +static void set_first_option_on_screen(enum option_enum last_option); +static void set_last_option_on_screen(enum option_enum first_option); +static void show_config_page(void); +static void unhighlight_option(enum option_enum option); +#ifdef USE_CURSES + static void do_scroll(int jump); +#endif /* USE_CURSES */ + + +/* + * returns the row on the screen of an option + * note: option should be on this page + */ +int +option_row( + int option) +{ + int i = 0; + int j = first_option_on_screen; + + while (j < option) { + if (option_is_visible(j)) + i++; + j++; + } + + return INDEX_TOP + i; +} + + +/* + * returns the number of an option + */ +static int +get_option_num( + enum option_enum option) +{ + enum option_enum i; + int result = 0; + + for (i = 0; i < option && result < LAST_OPT; i = next_option(i, FALSE)) + result++; + + return result; +} + + +/* + * returns the option with the given number + */ +static enum option_enum +set_option_num( + int num) +{ + enum option_enum result = 0; + + while (num > 0 && result < LAST_OPT) { + result = next_option(result, FALSE); + num--; + } + return result; +} + + +/* + * returns TRUE if an option is visible in the menu + */ +t_bool +option_is_visible( + int option) +{ + switch (option) { + case OPT_COL_BACK: + case OPT_COL_FROM: + case OPT_COL_HEAD: + case OPT_COL_HELP: + case OPT_COL_INVERS_BG: + case OPT_COL_INVERS_FG: + case OPT_COL_MESSAGE: + case OPT_COL_MINIHELP: + case OPT_COL_NEWSHEADERS: + case OPT_COL_NORMAL: + case OPT_COL_QUOTE: + case OPT_COL_QUOTE2: + case OPT_COL_QUOTE3: + case OPT_COL_RESPONSE: + case OPT_COL_SIGNATURE: + case OPT_COL_SUBJECT: + case OPT_COL_TEXT: + case OPT_COL_TITLE: + case OPT_COL_URLS: + return tinrc.use_color; + + case OPT_COL_MARKSTAR: + case OPT_COL_MARKDASH: + case OPT_COL_MARKSLASH: + case OPT_COL_MARKSTROKE: + return tinrc.word_highlight && tinrc.use_color; + + case OPT_WORD_H_DISPLAY_MARKS: + case OPT_MONO_MARKSTAR: + case OPT_MONO_MARKDASH: + case OPT_MONO_MARKSLASH: + case OPT_MONO_MARKSTROKE: + return tinrc.word_highlight; + + default: + return TRUE; + } +} + + +/* + * returns TRUE if option is OPT_TITLE else FALSE + */ +static t_bool +option_is_title( + enum option_enum option) +{ + return option_table[option].var_type == OPT_TITLE; +} + + +/* + * returns TRUE if option is on the current page else FALSE + */ +static t_bool +option_on_page( + enum option_enum option) +{ + return ((option >= first_option_on_screen) && (option <= last_option_on_screen)); +} + + +char * +fmt_option_prompt( + char *dst, + size_t len, + t_bool editing, + int option) +{ + char *buf; + size_t option_width = MAX(35, cCOLS / 2 - 9); +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + wchar_t *wbuf, *wbuf2; + + /* convert the option text to wchar_t */ + wbuf = char2wchar_t(_(option_table[option].txt->opt)); +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + + if (!option_is_title(option)) { + int num = get_option_num(option); +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + if (wbuf != NULL) { + wbuf2 = my_malloc(sizeof(wchar_t) * (option_width + 1)); + wstrunc(wbuf, wbuf2, option_width + 1, option_width); + + if ((buf = wchar_t2char(wbuf2)) == NULL) { + /* conversion failed, truncate original string */ + buf = my_malloc(option_width + 1); + strunc(_(option_table[option].txt->opt), buf, option_width + 1, option_width); + snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, (int) option_width, (int) option_width, buf); + } else { + snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, + (int) (strlen(buf) + option_width - wcswidth(wbuf2, option_width + 1)), + (int) (strlen(buf) + option_width - wcswidth(wbuf2, option_width + 1)), buf); + } + free(wbuf2); + } else +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + { + /* truncate original string */ + buf = my_malloc(option_width + 1); + strunc(_(option_table[option].txt->opt), buf, option_width + 1, option_width); + snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, (int) option_width, (int) option_width, buf); + } + } else { +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + if (wbuf != NULL) { + wbuf2 = my_malloc(sizeof(wchar_t) * (cCOLS - 3 + 1)); + wstrunc(wbuf, wbuf2, cCOLS - 3 + 1, cCOLS - 3); + if ((buf = wchar_t2char(wbuf2)) == NULL) { + /* conversion failed, truncate original string */ + buf = my_malloc(cCOLS - 3 + 1); + strunc(_(option_table[option].txt->opt), buf, cCOLS - 3 + 1, cCOLS - 3); + } + free(wbuf2); + } else +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + { + /* truncate original string */ + buf = my_malloc(cCOLS - 3 + 1); + strunc(_(option_table[option].txt->opt), buf, cCOLS - 3 + 1, cCOLS - 3); + } + snprintf(dst, len, " %s", buf); + } + +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + FreeIfNeeded(wbuf); +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + FreeIfNeeded(buf); + return dst; +} + + +static void +print_any_option( + enum option_enum option) +{ + constext **list; + char temp[LEN], *ptr, *ptr2; + int row = option_row(option); + size_t len = sizeof(temp) - 1; + + MoveCursor(row, 0); + + ptr = fmt_option_prompt(temp, len, FALSE, option); + ptr += strlen(temp); + len -= strlen(temp); + + switch (option_table[option].var_type) { + case OPT_ON_OFF: + /* tailing space to overwrite any left over F from OFF */ + snprintf(ptr, len, "%s ", print_boolean(*OPT_ON_OFF_list[option_table[option].var_index])); + break; + + case OPT_LIST: + list = option_table[option].opt_list; + ptr2 = my_strdup(list[*(option_table[option].variable) + ((strcasecmp(_(list[0]), _(txt_default)) == 0) ? 1 : 0)]); + snprintf(ptr, len, "%s", _(ptr2)); + free(ptr2); + break; + + case OPT_STRING: + snprintf(ptr, len, "%s", OPT_STRING_list[option_table[option].var_index]); + break; + + case OPT_NUM: + snprintf(ptr, len, "%d", *(option_table[option].variable)); + break; + + case OPT_CHAR: + snprintf(ptr, len, "%c", *OPT_CHAR_list[option_table[option].var_index]); + break; + + default: + break; + } +#ifdef USE_CURSES + my_printf("%.*s", cCOLS - 1, temp); + { + int y, x; + + getyx(stdscr, y, x); + if (x < cCOLS) + clrtoeol(); + } +#else + my_printf("%.*s", cCOLS - 1, temp); + /* draw_arrow_mark() will read this back for repainting */ + strncpy(screen[row - INDEX_TOP].col, temp, cCOLS); +#endif /* USE_CURSES */ +} + +static void +repaint_option( + enum option_enum option) +{ + if (option_on_page(option)) + print_any_option(option); +} + + +#ifdef USE_CURSES +static void +do_scroll( + int jump) +{ + scrollok(stdscr, TRUE); + MoveCursor(INDEX_TOP, 0); + SetScrollRegion(INDEX_TOP, INDEX_TOP + option_lines_per_page - 1); + ScrollScreen(jump); + SetScrollRegion(0, LINES - 1); + scrollok(stdscr, FALSE); +} +#endif /* USE_CURSES */ + + +/* + * returns the option after moving 'move' positions up or down + * updates also first_option_on_screen and last_option_on screen accordingly + */ +static enum option_enum +move_cursor( + enum option_enum cur_option, + t_bool down) +{ + enum option_enum old_option = cur_option; + + if (down) { /* move down */ + do { + cur_option = next_option(cur_option, TRUE); + if (cur_option > last_option_on_screen) { + /* move the markers one option down */ + last_option_on_screen = cur_option; + first_option_on_screen = next_option(first_option_on_screen, TRUE); +#ifdef USE_CURSES + do_scroll(1); + print_any_option(cur_option); +#else + show_config_page(); +#endif /* USE_CURSES */ + } else if (cur_option < first_option_on_screen) { + /* wrap around: set to begin of option list */ + first_option_on_screen = cur_option; + set_last_option_on_screen(cur_option); + show_config_page(); + } + } while (option_is_title(cur_option) && old_option != cur_option); + } else { /* move up */ + do { + cur_option = prev_option(cur_option, TRUE); + if (cur_option < first_option_on_screen) { + /* move the markers one option up */ + first_option_on_screen = cur_option; + last_option_on_screen = prev_option(last_option_on_screen, TRUE); +#ifdef USE_CURSES + do_scroll(-1); + print_any_option(cur_option); +#else + show_config_page(); +#endif /* USE_CURSES */ + } else if (cur_option > last_option_on_screen) { + /* wrap around: set to end of option list */ + last_option_on_screen = cur_option; + set_first_option_on_screen(cur_option); + show_config_page(); + } + } while (option_is_title(cur_option) && old_option != cur_option); + } + return cur_option; +} + + +/* + * returns the next visible option + * if 'incl_titles' is TRUE titles are also returned else they are skipped + */ +static enum option_enum +next_option( + enum option_enum option, + t_bool incl_titles) +{ + do { + option++; + if (option > LAST_OPT) + option = 0; + } while (!(option_is_visible(option) && (incl_titles || !option_is_title(option)))); + + return option; +} + + +/* + * returns the previous visible option + * if 'incl_titles' is TRUE titles are also returned else they are skipped + */ +static enum option_enum +prev_option( + enum option_enum option, + t_bool incl_titles) +{ + do { + if (option == 0) + option = LAST_OPT; + else + option--; + } while (!(option_is_visible(option) && (incl_titles || !option_is_title(option)))); + + return option; +} + + +/* + * set first_option_on_screen in such way that 'last_option' will be + * the last option on the screen + */ +static void +set_first_option_on_screen( + enum option_enum last_option) +{ + int i; + + first_option_on_screen = last_option; + for (i = 1; i < option_lines_per_page && first_option_on_screen > 0; i++) + first_option_on_screen = prev_option(first_option_on_screen, TRUE); + + /* + * make sure that the first page is used completely + */ + if (first_option_on_screen == 0) + set_last_option_on_screen(0); +} + + +/* + * set last_option_on_screen in such way that 'first_option' will be + * the first option on the screen + */ +static void +set_last_option_on_screen( + enum option_enum first_option) +{ + int i; + + last_option_on_screen = first_option; + /* + * on last page, there need not be option_lines_per_page options + */ + for (i = 1; i < option_lines_per_page && last_option_on_screen < LAST_OPT; i++) + last_option_on_screen = next_option(last_option_on_screen, TRUE); +} + + +static void +highlight_option( + enum option_enum option) +{ + refresh_config_page(option); /* to keep refresh_config_page():last_option up-to-date */ + draw_arrow_mark(option_row(option)); + info_message("%s", _(option_table[option].txt->opt)); +} + + +static void +unhighlight_option( + enum option_enum option) +{ + /* Astonishing hack */ + t_menu *savemenu = currmenu; + t_menu cfgmenu = { 0, 1, 0, 0, NULL, NULL }; + + currmenu = &cfgmenu; + currmenu->curr = option_row(option) - INDEX_TOP; + erase_arrow(); + currmenu = savemenu; + clear_message(); +} + + +/* + * Refresh the config page which holds the actual option. If act_option is + * smaller zero fall back on the last given option (first option if there was + * no last option) and refresh the screen. + */ +void +refresh_config_page( + int act_option) +{ + static int last_option = 0; + t_bool force_redraw = FALSE; + + if (act_option < 0) { + /* called by signal handler */ + force_redraw = TRUE; + act_option = last_option; + set_last_option_on_screen(first_option_on_screen); /* terminal size may have changed */ + if (!option_on_page(last_option)) { + last_option_on_screen = last_option; + set_first_option_on_screen(last_option); + } + redraw_screen(last_option); + } + last_option = act_option; +} + + +static void +redraw_screen( + enum option_enum option) +{ + my_retouch(); + set_xclick_off(); + show_config_page(); + highlight_option(option); +} + + +/* + * show_menu_help + */ +void +show_menu_help( + const char *help_message) +{ + MoveCursor(cLINES - 2, 0); + CleartoEOLN(); + center_line(cLINES - 2, FALSE, _(help_message)); +} + + +/* + * display current configuration page + */ +static void +show_config_page( + void) +{ + enum option_enum i; + + ClearScreen(); + center_line(0, TRUE, _(txt_options_menu)); + + for (i = first_option_on_screen; i <= last_option_on_screen; i++) { + while(!option_is_visible(i)) + i++; + if (i > LAST_OPT) + break; + print_any_option(i); + } + CleartoEOS(); + + show_menu_help(txt_select_config_file_option); + my_flush(); + stow_cursor(); +} + + +/* + * Check if score_kill is <= score_limit_kill and if score_select >= score_limit_select + */ +void +check_score_defaults( + void) +{ + if (tinrc.score_kill > tinrc.score_limit_kill) + tinrc.score_kill = tinrc.score_limit_kill; + + if (tinrc.score_select < tinrc.score_limit_select) + tinrc.score_select = tinrc.score_limit_select; +} + + +/* + * options menu so that the user can dynamically change parameters + * + * TODO: - why do we use ret_code when we never modify it? what about calling + * code which checks the return value? + * - when we change something we need to update the related attributes + * as well (see line 2009). + */ +int +change_config_file( + struct t_group *group) +{ + enum option_enum option, old_option; + int ch = 1; + int ret_code = NO_FILTERING; + int mime_encoding = MIME_ENCODING_7BIT; + t_bool change_option = FALSE; + + signal_context = cConfig; + + option = 1; + first_option_on_screen = 0; + set_last_option_on_screen(0); + + redraw_screen(option); + forever { + ch = ReadCh(); + + /* + * convert arrow key codes to "normal" codes + */ + switch (ch) { + case ESC: /* common arrow keys */ +# ifdef HAVE_KEY_PREFIX + case KEY_PREFIX: +# endif /* HAVE_KEY_PREFIX */ + switch (get_arrow_key(ch)) { + case KEYMAP_UP: + ch = map_to_local(iKeyUp, &menukeymap.config_change); + break; + + case KEYMAP_DOWN: + ch = map_to_local(iKeyDown, &menukeymap.config_change); + break; + + case KEYMAP_HOME: + ch = map_to_local(iKeyFirstPage, &menukeymap.config_change); + break; + + case KEYMAP_END: + ch = map_to_local(iKeyLastPage, &menukeymap.config_change); + break; + + case KEYMAP_PAGE_UP: + ch = map_to_local(iKeyPageUp, &menukeymap.config_change); + break; + + case KEYMAP_PAGE_DOWN: + ch = map_to_local(iKeyPageDown, &menukeymap.config_change); + break; + + default: + break; + } /* switch (get_arrow_key()) */ + break; + + default: + break; + } /* switch (ch) */ + + switch (map_to_default(ch, &menukeymap.config_change)) { + case iKeyQuit: + write_config_file(local_config_file); + /* FALLTHROUGH */ + case iKeyConfigNoSave: + clear_note_area(); + return ret_code; + + case iKeyUp: + case iKeyUp2: + unhighlight_option(option); + option = move_cursor(option, FALSE); + highlight_option(option); + break; + + case iKeyDown: + case iKeyDown2: + unhighlight_option(option); + option = move_cursor(option, TRUE); + highlight_option(option); + break; + + case iKeyFirstPage: + case iKeyConfigFirstPage2: + unhighlight_option(option); + option = 1; + first_option_on_screen = 0; + set_last_option_on_screen(0); + redraw_screen(option); + /* highlight_option(option); is already done by redraw_screen() */ + break; + + case iKeyLastPage: + case iKeyConfigLastPage2: + unhighlight_option(option); + option = LAST_OPT; + last_option_on_screen = LAST_OPT; + set_first_option_on_screen(LAST_OPT); + redraw_screen(option); + /* highlight_option(option); is already done by redraw_screen() */ + break; + + case iKeyPageUp: + case iKeyPageUp2: + case iKeyPageUp3: + unhighlight_option(option); + if (option != first_option_on_screen && !(option_is_title(first_option_on_screen) && option == next_option(first_option_on_screen, FALSE))) { + option = first_option_on_screen; + if (option_is_title(option)) + option = next_option(option, FALSE); + highlight_option(option); + break; + } else if (tinrc.scroll_lines == -2 && first_option_on_screen != 0) { + int i = option_lines_per_page / 2; + + for (; i > 0; i--) { + last_option_on_screen = prev_option(last_option_on_screen, TRUE); + if (last_option_on_screen == LAST_OPT) /* end on wrap around */ + break; + } + } else + last_option_on_screen = prev_option(first_option_on_screen, TRUE); + + set_first_option_on_screen(last_option_on_screen); + option = first_option_on_screen; + if (option_is_title(option)) + option = next_option(option, FALSE); + redraw_screen(option); + /* highlight_option(option); is already done by redraw_screen() */ + break; + + case iKeyPageDown: + case iKeyPageDown2: + case iKeyPageDown3: + unhighlight_option(option); + if (tinrc.scroll_lines == -2 ) { + int i = option_lines_per_page / 2; + + for (; i > 0; i--) { + first_option_on_screen = next_option(first_option_on_screen, TRUE); + if (first_option_on_screen == 0) /* end on wrap_around */ + break; + } + } else + first_option_on_screen = next_option(last_option_on_screen, TRUE); + + set_last_option_on_screen(first_option_on_screen); + option = first_option_on_screen; + if (option_is_title(option)) + option = next_option(option, FALSE); + + redraw_screen(option); + /* highlight_option(option); is already done by redraw_screen() */ + break; + + case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': + unhighlight_option(option); + option = set_option_num(prompt_num(ch, _(txt_enter_option_num))); + if (!option_on_page(option)) { + first_option_on_screen = option; + set_last_option_on_screen(option); + redraw_screen(option); + } else + highlight_option(option); + break; + + case iKeySearchSubjF: + case iKeySearchSubjB: + case iKeySearchRepeat: + if (ch == iKeySearchRepeat && i_key_search_last != iKeySearchSubjF && i_key_search_last != iKeySearchSubjB) + break; + + old_option = option; + option = search_config((ch == iKeySearchSubjF), (ch == iKeySearchRepeat), option, LAST_OPT); + if (option != old_option) { + unhighlight_option(old_option); + if (!option_on_page(option)) { + first_option_on_screen = option; + set_last_option_on_screen(option); + redraw_screen(option); + } else + highlight_option(option); + } + break; + + case iKeyConfigSelect: + case iKeyConfigSelect2: + change_option = TRUE; + break; + + case iKeyRedrawScr: /* redraw screen */ + redraw_screen(option); + break; + + default: + break; + } /* switch (ch) */ + + if (change_option) { + switch (option_table[option].var_type) { + case OPT_ON_OFF: + switch (option) { + case OPT_ADD_POSTED_TO_FILTER: + case OPT_ADVERTISING: + case OPT_ALTERNATIVE_HANDLING: + case OPT_ASK_FOR_METAMAIL: + case OPT_AUTO_BCC: + case OPT_AUTO_CC: + case OPT_AUTO_LIST_THREAD: + case OPT_AUTO_RECONNECT: + case OPT_AUTO_SAVE: + case OPT_BATCH_SAVE: + case OPT_CACHE_OVERVIEW_FILES: + case OPT_CATCHUP_READ_GROUPS: + case OPT_FORCE_SCREEN_REDRAW: + case OPT_GROUP_CATCHUP_ON_EXIT: + case OPT_KEEP_DEAD_ARTICLES: + case OPT_MARK_IGNORE_TAGS: + case OPT_MARK_SAVED_READ: + case OPT_PGDN_GOTO_NEXT: + case OPT_POS_FIRST_UNREAD: + case OPT_POST_PROCESS_VIEW: + case OPT_PRINT_HEADER: + case OPT_PROCESS_ONLY_UNREAD: + case OPT_PROMPT_FOLLOWUPTO: + case OPT_SHOW_ONLY_UNREAD_GROUPS: + case OPT_SHOW_SIGNATURES: + case OPT_SIGDASHES: + case OPT_SIGNATURE_REPOST: + case OPT_SPACE_GOTO_NEXT_UNREAD: + case OPT_START_EDITOR_OFFSET: + case OPT_STRIP_BLANKS: + case OPT_STRIP_NEWSRC: + case OPT_TAB_GOTO_NEXT_UNREAD: + case OPT_TEX2ISO_CONV: + case OPT_THREAD_CATCHUP_ON_EXIT: +#if defined(HAVE_ICONV_OPEN_TRANSLIT) && defined(CHARSET_CONVERSION) + case OPT_TRANSLIT: +#endif /* HAVE_ICONV_OPEN_TRANSLIT && CHARSET_CONVERSION */ + case OPT_UNLINK_ARTICLE: + case OPT_URL_HIGHLIGHT: +#ifdef HAVE_KEYPAD + case OPT_USE_KEYPAD: +#endif /* HAVE_KEYPAD */ + case OPT_USE_MOUSE: + case OPT_WRAP_ON_NEXT_UNREAD: + prompt_option_on_off(option); + break; + + /* show mini help menu */ + case OPT_BEGINNER_LEVEL: + if (prompt_option_on_off(option)) + set_noteslines(cLINES); + break; + + /* show all arts or just new/unread arts */ + case OPT_SHOW_ONLY_UNREAD_ARTS: + if (prompt_option_on_off(option) && group != NULL) { + make_threads(group, TRUE); + pos_first_unread_thread(); + } + break; + + /* draw -> / highlighted bar */ + case OPT_DRAW_ARROW: + prompt_option_on_off(option); + unhighlight_option(option); + if (!tinrc.draw_arrow && !tinrc.inverse_okay) { + tinrc.inverse_okay = TRUE; + repaint_option(OPT_INVERSE_OKAY); + } + break; + + /* draw inversed screen header lines */ + /* draw inversed group/article/option line if draw_arrow is OFF */ + case OPT_INVERSE_OKAY: + prompt_option_on_off(option); + unhighlight_option(option); + if (!tinrc.draw_arrow && !tinrc.inverse_okay) { + tinrc.draw_arrow = TRUE; /* we don't want to navigate blindly */ + repaint_option(OPT_DRAW_ARROW); + } + break; + + case OPT_MAIL_8BIT_HEADER: + prompt_option_on_off(option); + if (strcasecmp(txt_mime_encodings[tinrc.mail_mime_encoding], txt_8bit)) { + tinrc.mail_8bit_header = FALSE; + print_any_option(OPT_MAIL_8BIT_HEADER); + } + break; + + case OPT_POST_8BIT_HEADER: + prompt_option_on_off(option); + /* if post_mime_encoding != 8bit, post_8bit_header is disabled */ + if (strcasecmp(txt_mime_encodings[tinrc.post_mime_encoding], txt_8bit)) { + tinrc.post_8bit_header = FALSE; + print_any_option(OPT_POST_8BIT_HEADER); + } + break; + + /* show newsgroup description text next to newsgroups */ + case OPT_SHOW_DESCRIPTION: + prompt_option_on_off(option); + show_description = tinrc.show_description; + if (show_description) /* force reread of newgroups file */ + read_descriptions(FALSE); + break; + +#ifdef HAVE_COLOR + /* use ANSI color */ + case OPT_USE_COLOR: + prompt_option_on_off(option); +# ifdef USE_CURSES + if (!has_colors()) + use_color = FALSE; + else +# endif /* USE_CURSES */ + use_color = tinrc.use_color; + set_last_option_on_screen(first_option_on_screen); + redraw_screen(option); + break; +#endif /* HAVE_COLOR */ + +#ifdef XFACE_ABLE + /* use slrnface */ + case OPT_USE_SLRNFACE: + if (prompt_option_on_off(option)) { + if (!tinrc.use_slrnface) + slrnface_stop(); + else + slrnface_start(); + } + break; +#endif /* XFACE_ABLE */ + + /* word_highlight */ + case OPT_WORD_HIGHLIGHT: + prompt_option_on_off(option); + word_highlight = tinrc.word_highlight; + set_last_option_on_screen(first_option_on_screen); + redraw_screen(option); + break; + +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + case OPT_RENDER_BIDI: + prompt_option_on_off(option); + break; +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ + + default: + break; + } /* switch (option) */ + break; + + case OPT_LIST: + switch (option) { +#ifdef HAVE_COLOR + case OPT_COL_BACK: + case OPT_COL_FROM: + case OPT_COL_HEAD: + case OPT_COL_HELP: + case OPT_COL_INVERS_BG: + case OPT_COL_INVERS_FG: + case OPT_COL_MESSAGE: + case OPT_COL_MINIHELP: + case OPT_COL_NEWSHEADERS: + case OPT_COL_NORMAL: + case OPT_COL_QUOTE: + case OPT_COL_QUOTE2: + case OPT_COL_QUOTE3: + case OPT_COL_RESPONSE: + case OPT_COL_SIGNATURE: + case OPT_COL_SUBJECT: + case OPT_COL_TEXT: + case OPT_COL_TITLE: + case OPT_COL_MARKSTAR: + case OPT_COL_MARKDASH: + case OPT_COL_MARKSLASH: + case OPT_COL_MARKSTROKE: + case OPT_COL_URLS: +#endif /* HAVE_COLOR */ + case OPT_HIDE_UUE: + case OPT_INTERACTIVE_MAILER: + case OPT_WORD_H_DISPLAY_MARKS: + case OPT_MONO_MARKSTAR: + case OPT_MONO_MARKDASH: + case OPT_MONO_MARKSLASH: + case OPT_MONO_MARKSTROKE: + case OPT_CONFIRM_CHOICE: + case OPT_KILL_LEVEL: + case OPT_MAILBOX_FORMAT: + case OPT_SHOW_INFO: + case OPT_SORT_ARTICLE_TYPE: + case OPT_STRIP_BOGUS: +#ifdef HAVE_UNICODE_NORMALIZATION + case OPT_NORMALIZATION_FORM: +#endif /* HAVE_UNICODE_NORMALIZATION */ + case OPT_QUOTE_STYLE: + case OPT_WILDCARD: + prompt_option_list(option); + break; + + case OPT_THREAD_ARTICLES: + /* + * If the threading strategy has changed, fix things + * so that rethreading will occur + */ + if (prompt_option_list(option) && group != NULL) { + int n, old_base_art = base[grpmenu.curr]; + + group->attribute->thread_arts = tinrc.thread_articles; + make_threads(group, TRUE); + /* in non-empty groups update cursor position */ + if (grpmenu.max > 0) { + if ((n = which_thread(old_base_art)) >= 0) + grpmenu.curr = n; + } + } + clear_message(); + break; + + case OPT_SORT_THREADS_TYPE: + /* + * If the sorting strategy of threads has changed, fix things + * so that resorting will occur + */ + if (prompt_option_list(option) && group != NULL) { + group->attribute->sort_threads_type = tinrc.sort_threads_type; + make_threads(group, TRUE); + } + clear_message(); + break; + + case OPT_THREAD_SCORE: + /* + * If the scoring of a thread has changed, + * resort base[] + */ + if (prompt_option_list(option) && group != NULL) + find_base(group); + clear_message(); + break; + + case OPT_POST_PROCESS: + prompt_option_list(option); + glob_attributes.post_proc_type = tinrc.post_process; + if (group != NULL) + group->attribute->post_proc_type = tinrc.post_process; + break; + + case OPT_SHOW_AUTHOR: + prompt_option_list(option); + if (group != NULL) + group->attribute->show_author = tinrc.show_author; + break; + + case OPT_MAIL_MIME_ENCODING: + case OPT_POST_MIME_ENCODING: + prompt_option_list(option); + mime_encoding = *(option_table[option].variable); + /* do not use 8 bit headers if mime encoding is not 8bit */ + if (strcasecmp(txt_mime_encodings[mime_encoding], txt_8bit)) { + if (option == (int) OPT_POST_MIME_ENCODING) { + tinrc.post_8bit_header = FALSE; + repaint_option(OPT_POST_8BIT_HEADER); + } else { + tinrc.mail_8bit_header = FALSE; + repaint_option(OPT_MAIL_8BIT_HEADER); + } + } + break; + +#ifdef CHARSET_CONVERSION + case OPT_MM_NETWORK_CHARSET: + if (prompt_option_list(option)) { + glob_attributes.mm_network_charset = tinrc.mm_network_charset; + if (group) + group->attribute->mm_network_charset = tinrc.mm_network_charset; +# ifdef NO_LOCALE + strcpy(tinrc.mm_local_charset, txt_mime_charsets[tinrc.mm_network_charset]); +# endif /* NO_LOCALE */ + } + /* + * check if we have selected a 7bit charset, otherwise + * update encoding + * we always do this (even if we did not change the + * charset) to fixup flaws in the tinrc - once we do + * the same while reading the tinrc this can go into + * the != original_list_value case. + */ + { + int i; + t_bool change; + + if (!strcasecmp(txt_mime_encodings[tinrc.post_mime_encoding], txt_7bit)) { + change = TRUE; + for (i = 0; *txt_mime_7bit_charsets[i]; i++) { + if (!strcasecmp(txt_mime_charsets[tinrc.mm_network_charset], txt_mime_7bit_charsets[i])) { + change = FALSE; + break; + } + } + if (change) { + tinrc.post_mime_encoding = MIME_ENCODING_8BIT; + repaint_option(OPT_POST_MIME_ENCODING); + } + } else { /* and vice versa, if we have a 7bit chaset but a !7bit encoding, fix that */ + for (i = 0; *txt_mime_7bit_charsets[i]; i++) { + if (!strcasecmp(txt_mime_charsets[tinrc.mm_network_charset], txt_mime_7bit_charsets[i])) { + tinrc.mail_mime_encoding = tinrc.post_mime_encoding = MIME_ENCODING_7BIT; + tinrc.mail_8bit_header = tinrc.post_8bit_header = FALSE; + repaint_option(OPT_POST_MIME_ENCODING); + repaint_option(OPT_MAIL_MIME_ENCODING); + repaint_option(OPT_POST_8BIT_HEADER); + break; + } + } + } + + if (!strcasecmp(txt_mime_encodings[tinrc.mail_mime_encoding], txt_7bit)) { + change = TRUE; + for (i = 0; *txt_mime_7bit_charsets[i]; i++) { + if (!strcasecmp(txt_mime_charsets[tinrc.mm_network_charset], txt_mime_7bit_charsets[i])) { + change = FALSE; + break; + } + } + if (change) { + tinrc.mail_mime_encoding = MIME_ENCODING_QP; + repaint_option(OPT_MAIL_MIME_ENCODING); + } + } else { /* and vice versa, if we have a 7bit chaset but a !7bit encoding, fix that */ + for (i = 0; *txt_mime_7bit_charsets[i]; i++) { + if (!strcasecmp(txt_mime_charsets[tinrc.mm_network_charset], txt_mime_7bit_charsets[i])) { + tinrc.mail_mime_encoding = tinrc.post_mime_encoding = MIME_ENCODING_7BIT; + tinrc.mail_8bit_header = tinrc.post_8bit_header = FALSE; + repaint_option(OPT_POST_MIME_ENCODING); + repaint_option(OPT_MAIL_MIME_ENCODING); + repaint_option(OPT_POST_8BIT_HEADER); + break; + } + } + } + } + break; +#endif /* CHARSET_CONVERSION */ + + default: + break; + } /* switch (option) */ + break; + + case OPT_STRING: + switch (option) { + case OPT_EDITOR_FORMAT: + case OPT_INEWS_PROG: + case OPT_MAILER_FORMAT: + case OPT_MAIL_ADDRESS: + case OPT_MAIL_QUOTE_FORMAT: + case OPT_METAMAIL_PROG: +#ifndef CHARSET_CONVERSION + case OPT_MM_CHARSET: +#endif /* !CHARSET_CONVERSION */ + case OPT_NEWS_QUOTE_FORMAT: + case OPT_QUOTE_CHARS: + case OPT_SPAMTRAP_WARNING_ADDRESSES: + case OPT_URL_HANDLER: + case OPT_XPOST_QUOTE_FORMAT: + prompt_option_string(option); + break; + + case OPT_NEWS_HEADERS_TO_DISPLAY: + prompt_option_string(option); + if (news_headers_to_display_array) + FreeIfNeeded(*news_headers_to_display_array); + FreeIfNeeded(news_headers_to_display_array); + news_headers_to_display_array = ulBuildArgv(tinrc.news_headers_to_display, &num_headers_to_display); + break; + + case OPT_NEWS_HEADERS_TO_NOT_DISPLAY: + prompt_option_string(option); + if (news_headers_to_not_display_array) + FreeIfNeeded(*news_headers_to_not_display_array); + FreeIfNeeded(news_headers_to_not_display_array); + news_headers_to_not_display_array = ulBuildArgv(tinrc.news_headers_to_not_display, &num_headers_to_not_display); + break; + +#ifndef DISABLE_PRINTING + case OPT_PRINTER: +#endif /* !DISABLE_PRINTING */ + case OPT_MAILDIR: + case OPT_SAVEDIR: + case OPT_SIGFILE: + case OPT_POSTED_ARTICLES_FILE: + if (prompt_option_string(option)) { + char buf[PATH_LEN]; + + strfpath(tinrc.posted_articles_file, buf, sizeof(buf), &CURR_GROUP); + STRCPY(tinrc.posted_articles_file, buf); + } + break; + +#ifdef HAVE_COLOR + case OPT_QUOTE_REGEX: + prompt_option_string(option); + FreeIfNeeded(quote_regex.re); + FreeIfNeeded(quote_regex.extra); + if (!strlen(tinrc.quote_regex)) + STRCPY(tinrc.quote_regex, DEFAULT_QUOTE_REGEX); + compile_regex(tinrc.quote_regex, "e_regex, PCRE_CASELESS); + break; + + case OPT_QUOTE_REGEX2: + prompt_option_string(option); + FreeIfNeeded(quote_regex2.re); + FreeIfNeeded(quote_regex2.extra); + if (!strlen(tinrc.quote_regex2)) + STRCPY(tinrc.quote_regex2, DEFAULT_QUOTE_REGEX2); + compile_regex(tinrc.quote_regex2, "e_regex2, PCRE_CASELESS); + break; + + case OPT_QUOTE_REGEX3: + prompt_option_string(option); + FreeIfNeeded(quote_regex3.re); + FreeIfNeeded(quote_regex3.extra); + if (!strlen(tinrc.quote_regex3)) + STRCPY(tinrc.quote_regex3, DEFAULT_QUOTE_REGEX3); + compile_regex(tinrc.quote_regex3, "e_regex3, PCRE_CASELESS); + break; +#endif /* HAVE_COLOR */ + + case OPT_SLASHES_REGEX: + prompt_option_string(option); + FreeIfNeeded(slashes_regex.re); + FreeIfNeeded(slashes_regex.extra); + if (!strlen(tinrc.slashes_regex)) + STRCPY(tinrc.slashes_regex, DEFAULT_SLASHES_REGEX); + compile_regex(tinrc.slashes_regex, &slashes_regex, PCRE_CASELESS); + break; + + case OPT_STARS_REGEX: + prompt_option_string(option); + FreeIfNeeded(stars_regex.re); + FreeIfNeeded(stars_regex.extra); + if (!strlen(tinrc.stars_regex)) + STRCPY(tinrc.stars_regex, DEFAULT_STARS_REGEX); + compile_regex(tinrc.stars_regex, &stars_regex, PCRE_CASELESS); + break; + + case OPT_STROKES_REGEX: + prompt_option_string(option); + FreeIfNeeded(strokes_regex.re); + FreeIfNeeded(strokes_regex.extra); + if (!strlen(tinrc.strokes_regex)) + STRCPY(tinrc.strokes_regex, DEFAULT_STROKES_REGEX); + compile_regex(tinrc.strokes_regex, &strokes_regex, PCRE_CASELESS); + break; + + case OPT_UNDERSCORES_REGEX: + prompt_option_string(option); + FreeIfNeeded(underscores_regex.re); + FreeIfNeeded(underscores_regex.extra); + if (!strlen(tinrc.underscores_regex)) + STRCPY(tinrc.underscores_regex, DEFAULT_UNDERSCORES_REGEX); + compile_regex(tinrc.underscores_regex, &underscores_regex, PCRE_CASELESS); + break; + + case OPT_STRIP_RE_REGEX: + prompt_option_string(option); + FreeIfNeeded(strip_re_regex.re); + FreeIfNeeded(strip_re_regex.extra); + if (!strlen(tinrc.strip_re_regex)) + STRCPY(tinrc.strip_re_regex, DEFAULT_STRIP_RE_REGEX); + compile_regex(tinrc.strip_re_regex, &strip_re_regex, PCRE_ANCHORED); + break; + + case OPT_STRIP_WAS_REGEX: + prompt_option_string(option); + FreeIfNeeded(strip_was_regex.re); + FreeIfNeeded(strip_was_regex.extra); + if (!strlen(tinrc.strip_was_regex)) { +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + if (IS_LOCAL_CHARSET("UTF-8")) { +# if (defined(PCRE_MAJOR) && PCRE_MAJOR >= 4) + int i; + + pcre_config(PCRE_CONFIG_UTF8, &i); + if (i) + STRCPY(tinrc.strip_was_regex, DEFAULT_U8_STRIP_WAS_REGEX); + else +# endif /* PCRE_MAJOR && PCRE_MAJOR >= 4 */ + STRCPY(tinrc.strip_was_regex, DEFAULT_STRIP_WAS_REGEX); + } else +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + STRCPY(tinrc.strip_was_regex, DEFAULT_STRIP_WAS_REGEX); + } + compile_regex(tinrc.strip_was_regex, &strip_was_regex, 0); + break; + + case OPT_DATE_FORMAT: + prompt_option_string(option); + if (!strlen(tinrc.date_format)) { + STRCPY(tinrc.date_format, DEFAULT_DATE_FORMAT); + } + break; + + default: + break; + } /* switch (option) */ + + break; + + case OPT_NUM: + switch (option) { + case OPT_GETART_LIMIT: + case OPT_SCROLL_LINES: + prompt_option_num(option); + break; + + case OPT_REREAD_ACTIVE_FILE_SECS: + prompt_option_num(option); + if (tinrc.reread_active_file_secs < 0) + tinrc.reread_active_file_secs = 0; + break; + + case OPT_RECENT_TIME: + prompt_option_num(option); + if (tinrc.recent_time < 0) + tinrc.recent_time = 0; + break; + + case OPT_GROUPNAME_MAX_LENGTH: + prompt_option_num(option); + if (tinrc.groupname_max_length < 0) + tinrc.groupname_max_length = 0; + break; + + case OPT_FILTER_DAYS: + prompt_option_num(option); + if (tinrc.filter_days <= 0) + tinrc.filter_days = 1; + break; + + case OPT_SCORE_LIMIT_KILL: + case OPT_SCORE_KILL: + case OPT_SCORE_LIMIT_SELECT: + case OPT_SCORE_SELECT: + prompt_option_num(option); + check_score_defaults(); + if (group != NULL) { + unfilter_articles(); + read_filter_file(filter_file); + if (filter_articles(group)) + make_threads(group, FALSE); + } + redraw_screen(option); + break; + + case OPT_WRAP_COLUMN: + prompt_option_num(option); + /* recook if in an article is open */ + if (pgart.raw) + resize_article(TRUE, &pgart); + break; + + default: + break; + } /* switch (option) */ + break; + + case OPT_CHAR: + switch (option) { + /* + * TODO: do DASH_TO_SPACE/SPACE_TO_DASH conversion here? + */ + case OPT_ART_MARKED_DELETED: + case OPT_ART_MARKED_INRANGE: + case OPT_ART_MARKED_RETURN: + case OPT_ART_MARKED_SELECTED: + case OPT_ART_MARKED_RECENT: + case OPT_ART_MARKED_UNREAD: + case OPT_ART_MARKED_READ: + case OPT_ART_MARKED_KILLED: + case OPT_ART_MARKED_READ_SELECTED: + prompt_option_char(option); + break; + + default: + break; + } /* switch (option) */ + break; + + default: + break; + } /* switch (option_table[option].var_type) */ + change_option = FALSE; + show_menu_help(txt_select_config_file_option); + repaint_option(option); + highlight_option(option); + } /* if (change_option) */ + } /* forever */ + /* NOTREACHED */ + return ret_code; +} diff -Nurp tin-1.7.5/src/page.c tin-1.7.6/src/page.c --- tin-1.7.5/src/page.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/page.c 2004-08-20 10:30:49.000000000 +0200 @@ -1202,7 +1202,6 @@ draw_page( STRCPY(buf, (arts[this_resp].thread != -1) ? _(txt_next_resp) : _(txt_last_resp)); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if ((wbuf = char2wchar_t(buf)) != NULL) { - wconvert_to_printable(wbuf); len = wcswidth(wbuf, wcslen(wbuf) + 1); free(wbuf); } else @@ -1354,7 +1353,6 @@ draw_page_header( else wbuf[line_len - 1] = (wchar_t) '\0'; - wconvert_to_printable(wbuf); if ((i = wcswidth(wbuf, line_len)) < (int) len) len = i; @@ -1391,10 +1389,10 @@ draw_page_header( my_fputws(line, stdout); my_fputs(cCRLF, stdout); -#if 0 +# if 0 /* display a ruler for layout checking purposes */ my_fputs("....|....3....|....2....|....1....|....0....|....1....|....2....|....3....|....\n", stdout); -#endif /* 0 */ +# endif /* 0 */ /* * second line @@ -1429,7 +1427,7 @@ draw_page_header( /* tex2iso */ if (pgart.tex2iso) { - mbstowcs(wtmp, "TeX ", line_len); + mbstowcs(wtmp, "TeX ", line_len); /* TODO: -> lang.c */ len += wcswidth(wtmp, line_len); my_fputws(wtmp, stdout); } @@ -1442,13 +1440,10 @@ 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 wtmp[line_len - 1] = (wchar_t) '\0'; - wconvert_to_printable(wtmp); if (wcswidth(wtmp, line_len) > cCOLS - 2 * right_len - 3) wstrunc(wtmp, wbuf, line_len, cCOLS - 2 * right_len - 3); else @@ -1520,9 +1515,6 @@ 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); @@ -1533,7 +1525,6 @@ draw_page_header( if (mbstowcs(wbuf, buf, line_len) == (size_t) (-1)) wbuf[0] = (wchar_t) '\0'; - wconvert_to_printable(wbuf); if (wcswidth(line, line_len) + wcswidth(wbuf, line_len) >= cCOLS - 1) { wcsncat(line, wbuf, line_len - wcslen(line) - 1); @@ -1622,10 +1613,10 @@ draw_page_header( my_fputs(line, stdout); my_fputs(cCRLF, stdout); -#if 0 +# if 0 /* display a ruler for layout checking purposes */ my_fputs("....|....3....|....2....|....1....|....0....|....1....|....2....|....3....|....\n", stdout); -#endif /* 0 */ +# endif /* 0 */ /* * second line @@ -1653,7 +1644,7 @@ draw_page_header( /* tex2iso */ if (pgart.tex2iso) { - strcpy(buf, "TeX "); + strcpy(buf, "TeX "); /* TODO: -> lang.c */ len += strlen(buf); my_fputs(buf, stdout); } @@ -1667,7 +1658,6 @@ draw_page_header( strncpy(buf, (note_h->subj ? note_h->subj : arts[this_resp].subject), line_len); buf[line_len - 1] = '\0'; - convert_to_printable(buf); if ((int) strlen(buf) > cCOLS - 2 * right_len - 3) strunc(buf, line, line_len, cCOLS - 2 * right_len - 3); else { @@ -1748,7 +1738,6 @@ draw_page_header( strncat(buf, tmp, line_len - strlen(buf) - 1); } } - convert_to_printable(buf); #ifdef HAVE_COLOR fcol(tinrc.col_from); diff -Nurp tin-1.7.5/src/post.c tin-1.7.6/src/post.c --- tin-1.7.5/src/post.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/post.c 2004-08-20 18:53:08.000000000 +0200 @@ -3,7 +3,7 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-06-12 + * Updated : 2004-08-20 * Notes : mail/post/replyto/followup/repost & cancel articles * * Copyright (c) 1991-2004 Iain Lea @@ -322,8 +322,8 @@ msg_init_headers( int i; for (i = 0; i < MAX_MSG_HEADERS; i++) { - msg_headers[i].name = (char *) 0; - msg_headers[i].text = (char *) 0; + msg_headers[i].name = NULL; + msg_headers[i].text = NULL; } } @@ -348,8 +348,8 @@ msg_add_header( { const char *p; char *ptr; - char *new_name = (char *) 0; - char *new_text = (char *) 0; + char *new_name = NULL; + char *new_text = NULL; int i; t_bool done = FALSE; @@ -1449,8 +1449,9 @@ post_loop( { char a_message_id[HEADER_LEN]; /* Message-ID of the article if known */ int ret_code = POSTED_NONE; - long artchanged = 0L; /* artchanged work was not done in post_postponed_article */ int i = 1; + long artchanged = 0L; /* artchanged work was not done in post_postponed_article */ + struct t_group *ogroup = curr_group; t_bool art_unchanged; a_message_id[0] = '\0'; @@ -1460,13 +1461,22 @@ post_article_loop: art_unchanged = FALSE; switch (ch) { case iKeyPostEdit: - /* This was VERY different in repost_article - * Code existed to recheck subject and restart editor, but - * is not enabled + /* + * This was VERY different in repost_article Code existed to + * recheck subject and restart editor, but is not enabled */ artchanged = file_mtime(article); - if (!invoke_editor(article, offset)) + if (!invoke_editor(article, offset)) { + if (file_size(article) > 0L) { + if (artchanged != file_mtime(article)) { + unlink(backup_article_name(article)); + rename_file(article, dead_article); + if (tinrc.keep_dead_articles) + append_file(dead_articles, dead_article); + } + } goto post_article_postponed; + } ret_code = POSTED_REDRAW; /* This might be erroneous with posting postponed */ @@ -1709,6 +1719,7 @@ post_article_done: } post_article_postponed: + curr_group = ogroup; if (tinrc.unlink_article) unlink(article); @@ -1990,7 +2001,7 @@ fetch_postponed_article( { FILE *in, *out; FILE *tmp; - char *bufp = (char *) 0; + char *bufp = NULL; char postponed_tmp[PATH_LEN]; char line[HEADER_LEN]; t_bool first_article; @@ -2989,7 +3000,6 @@ mail_bug_report( char tmesg[LEN]; char subject[HEADER_LEN]; t_bool ret_code = FALSE; - t_bool is_nntp = FALSE, is_nntp_only; wait_message(0, _(txt_mail_bug_report)); snprintf(subject, sizeof(subject), "BUG REPORT %s\n", page_header); @@ -2997,8 +3007,8 @@ mail_bug_report( if ((fp = create_mail_headers(nam, ".bugreport", bug_addr, subject, NULL)) == NULL) return FALSE; - fprintf(fp, "VER1 : %s\n", page_header); /* some ppl. trash the subject, so include version information in the body as well */ -#ifdef HAVE_SYS_UTSNAME_H + start_line_offset += tin_version_info(fp); +#if defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) # ifdef _AIX fprintf(fp, "BOX1 : %s %s.%s", system_info.sysname, system_info.version, system_info.release); # else @@ -3010,16 +3020,7 @@ mail_bug_report( # endif /* _AIX */ #else fprintf(fp, "BOX1 : Please enter the following information: Machine+OS"); -#endif /* HAVE_SYS_UTSNAME_H */ - -#ifdef NNTP_ONLY - is_nntp_only = TRUE; -#else - is_nntp_only = FALSE; -# ifdef NNTP_ABLE - is_nntp = TRUE; -# endif /* NNTP_ABLE */ -#endif /* NNTP_ONLY */ +#endif /* HAVE_SYS_UTSNAME_H && HAVE_UNAME */ #ifdef DOMAIN_NAME domain = DOMAIN_NAME; @@ -3027,23 +3028,14 @@ mail_bug_report( domain = ""; #endif /* DOMAIN_NAME */ - fprintf(fp, "\nCFG1 : active=%d, arts=%d, reread=%d, longfilenames=%s\n", + fprintf(fp, "\nCFG1 : active=%d, arts=%d, reread=%d, nntp_xover=%s\n", DEFAULT_ACTIVE_NUM, DEFAULT_ARTICLE_NUM, tinrc.reread_active_file_secs, -#ifdef HAVE_LONG_FILE_NAMES - bool_unparse(TRUE) -#else - bool_unparse(FALSE) -#endif /* HAVE_LONG_FILE_NAMES */ - ); - fprintf(fp, "CFG2 : nntp=%s, nntp_only=%s, nntp_xover=%s\n", - bool_unparse(is_nntp), - bool_unparse(is_nntp_only), bool_unparse(xover_cmd != NULL)); - fprintf(fp, "CFG3 : debug=%d, threading=%d\n", debug, tinrc.thread_articles); - fprintf(fp, "CFG4 : domain=[%s]\n", BlankIfNull(domain)); - start_line_offset += 6; + fprintf(fp, "CFG2 : debug=%d, threading=%d\n", debug, tinrc.thread_articles); + fprintf(fp, "CFG3 : domain=[%s]\n", BlankIfNull(domain)); + start_line_offset += 4; if (*bug_nntpserver1) { fprintf(fp, "NNTP1: %s\n", bug_nntpserver1); @@ -3919,7 +3911,7 @@ checknadd_headers( char suffix[HEADER_LEN]; suffix[0] = '\0'; -#ifdef HAVE_SYS_UTSNAME_H +#if defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) # ifdef _AIX snprintf(suffix, sizeof(suffix), " (%s/%s.%s)", system_info.sysname, system_info.version, system_info.release); @@ -3932,7 +3924,12 @@ checknadd_headers( system_info.sysname, system_info.release, system_info.machine); # endif /* SEIUX */ # endif /* _AIX */ -#endif /* HAVE_SYS_UTSNAME_H */ +#else +# ifdef SYSTEM_NAME + if (strlen(SYSTEM_NAME)) + snprintf(suffix, sizeof(suffix), " (%s)", SYSTEM_NAME); +# endif /* SYSTEM_NAME */ +#endif /* HAVE_SYS_UTSNAME_H && HAVE_UNAME */ fprintf(fp_out, "User-Agent: %s/%s-%s (\"%s\") (%s)%s\n", PRODUCT, VERSION, RELEASEDATE, RELEASENAME, OSNAME, suffix); } @@ -4653,7 +4650,7 @@ get_secret( my_fprintf(stderr, _(txt_cannot_open), path_secret); my_fflush(stderr); sleep(2); - return ((char *) 0); + return NULL; } else { (void) fread(cancel_secret, HEADER_LEN - 1, 1, fp_secret); fclose(fp_secret); @@ -4714,14 +4711,14 @@ add_headers( struct tm *gmdate; char dateheader[50]; #if defined(HAVE_SETLOCALE) && !defined(NO_LOCALE) - char *old_lc_all = (char *) 0, *old_lc_time = (char *) 0; + char *old_lc_all = NULL, *old_lc_time = NULL; /* Unlocalized date-header */ if (getenv("LC_ALL") != NULL) { - old_lc_all = my_strdup(setlocale(LC_ALL, (char *) 0)); + old_lc_all = my_strdup(setlocale(LC_ALL, NULL)); setlocale(LC_ALL, "POSIX"); } else { - old_lc_time = my_strdup(setlocale(LC_TIME, (char *) 0)); + old_lc_time = my_strdup(setlocale(LC_TIME, NULL)); setlocale(LC_TIME, "POSIX"); } #endif /* HAVE_SETLOCALE && !NO_LOCALE */ diff -Nurp tin-1.7.5/src/prompt.c tin-1.7.6/src/prompt.c --- tin-1.7.5/src/prompt.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/prompt.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : prompt.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-06-12 + * Updated : 2004-07-03 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -68,9 +68,7 @@ prompt_num( int num; clear_message(); - snprintf(tmp, sizeof(tmp), "%c", ch); - if ((p = tin_getline(prompt, TRUE, tmp, 0, FALSE, HIST_OTHER)) != NULL) { STRCPY(tmp, p); num = atoi(tmp); @@ -78,7 +76,6 @@ prompt_num( num = -1; clear_message(); - return num; } @@ -115,16 +112,13 @@ prompt_default_string( char *p; clear_message(); - if ((p = tin_getline(prompt, FALSE, default_prompt, buf_len, FALSE, which_hist)) == NULL) { buf[0] = '\0'; clear_message(); return FALSE; } strcpy(buf, p); - clear_message(); - return TRUE; } @@ -148,14 +142,11 @@ prompt_menu_string( * would lead to a 'n' answer to the reconnect prompt */ fflush(stdin); - MoveCursor(line, 0); - if ((p = tin_getline(prompt, FALSE, var, 0, FALSE, HIST_OTHER)) == NULL) return FALSE; strcpy(var, p); - return TRUE; } @@ -212,7 +203,6 @@ prompt_yn( case KEY_PREFIX: # endif /* HAVE_KEY_PREFIX */ switch (get_arrow_key(ch)) { - case KEYMAP_UP: case KEYMAP_DOWN: default_answer = bool_not(default_answer); @@ -226,6 +216,7 @@ prompt_yn( case KEYMAP_RIGHT: ch = prompt_ch; break; + default: break; } @@ -246,7 +237,6 @@ prompt_yn( cursoroff(); my_flush(); } - return (tolower((unsigned char) map_to_default(ch, &menukeymap.prompt_yn)) == tolower((unsigned char)iKeyPromptYes)) ? 1 : (ch == iKeyAbort) ? -1 : 0; } @@ -271,8 +261,12 @@ prompt_list( { int ch, var_orig; int i, offset; + int change; int adjust = (strcasecmp(_(list[0]), _(txt_default)) == 0); size_t width = 0; +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + wchar_t *wbuf; +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ var += adjust; size += adjust; @@ -287,31 +281,68 @@ prompt_list( show_menu_help(help_text); cursoron(); - do { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t *wbuf; - - if ((wbuf = char2wchar_t(_(prompt_text))) != NULL) { - wconvert_to_printable(wbuf); - offset = wcswidth(wbuf, wcslen(wbuf) + 1); - if (offset == -1) { - /* something went wrong, use wcslen as fallback */ - offset = (int) wcslen(wbuf); - } - - free(wbuf); - } else + if ((wbuf = char2wchar_t(_(prompt_text))) != NULL) { + if ((offset = wcswidth(wbuf, wcslen(wbuf) + 1)) == -1) /* something went wrong, use wcslen as fallback */ + offset = (int) wcslen(wbuf); + free(wbuf); + } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - offset = (int) strlen(_(prompt_text)); + offset = (int) strlen(_(prompt_text)); + do { MoveCursor(row, col + offset); - if ((ch = (char) ReadCh()) == ' ') { + ch = (char) ReadCh(); + /* + * change: + * 1 = move to the next list element + * 0 = do nothing + * -1 = move to the previous list element + * + * if an arrow key was pressed change ch to an other value + * otherwise we will exit the while loop + */ + switch (ch) { + case ' ': + change = 1; + break; + + case ESC: /* (ESC) common arrow keys */ +# ifdef HAVE_KEY_PREFIX + case KEY_PREFIX: +# endif /* HAVE_KEY_PREFIX */ + switch (get_arrow_key(ch)) { + case KEYMAP_UP: + change = -1; + ch = ' '; + break; + + case KEYMAP_DOWN: + change = 1; + ch = ' '; + break; + + default: + change = 0; + break; + } + break; + + default: + change = 0; + break; + } + + if (change) { /* - * Increment list, looping around at the max + * increment or decrement list, loop around at the limits */ - ++var; - var %= size; + var += change; + if (var < 0) + var = size - 1; + else + var %= size; my_printf("%-*s", (int) width, _(list[var])); my_flush(); @@ -320,13 +351,11 @@ prompt_list( if (ch == ESC) { var = var_orig; - my_printf("%-*s", (int) width, _(list[var])); my_flush(); } cursoroff(); - return (var - adjust); } @@ -415,9 +444,7 @@ prompt_option_num( STRCPY(number, p); num = atoi(number); *(option_table[option].variable) = num; - clear_message(); - return TRUE; } @@ -455,7 +482,6 @@ prompt_option_char( } while (!*p); *variable = p[0]; - clear_message(); return TRUE; } @@ -566,7 +592,6 @@ sized_message( wchar_t *wformat; if ((wformat = char2wchar_t(format)) != NULL) { - wconvert_to_printable(wformat); /* The formatting info (%s) wastes 2 chars, but our prompt needs 1 char */ max_len = cCOLS - wcswidth(wformat, wcslen(wformat) + 1) + 2 - 1; free(wformat); @@ -665,7 +690,6 @@ prompt_slk_redraw( /* get the cursor _just_ right */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if ((wtmp = char2wchar_t(prompt_slk_message)) != NULL) { - wconvert_to_printable(wtmp); column = wcswidth(wtmp, wcslen(wtmp) + 1) - 1; free(wtmp); } else @@ -699,6 +723,7 @@ prompt_continue( # endif /* HAVE_KEY_PREFIX */ (void) get_arrow_key(ch); /* FALLTHROUGH */ + default: break; } diff -Nurp tin-1.7.5/src/read.c tin-1.7.6/src/read.c --- tin-1.7.5/src/read.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/read.c 2004-08-20 10:30:49.000000000 +0200 @@ -49,7 +49,7 @@ * The initial and expansion sizes to use for allocating read data */ #define INIT 512 -#define CHUNK 256 +#define RCHUNK 256 /* * Global error flag. Set if something abnormal happens during file I/O @@ -365,8 +365,8 @@ tin_fgets( next = offset; while (partial_read) { - if (next + CHUNK > size) - size = next + CHUNK; + if (next + RCHUNK > size) + size = next + RCHUNK; temp = my_realloc(dynbuf, size * sizeof(*dynbuf)); dynbuf = temp; temp = tin_read(dynbuf + next, size - next, fp, header); /* What if == 0? */ diff -Nurp tin-1.7.5/src/rfc1524.c tin-1.7.6/src/rfc1524.c --- tin-1.7.5/src/rfc1524.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/rfc1524.c 2004-08-20 10:30:49.000000000 +0200 @@ -161,19 +161,19 @@ parse_mailcap_line( /* malloc and init */ tmailcap = my_malloc(sizeof(t_mailcap)); - tmailcap->type = (char *) 0; - tmailcap->command = (char *) 0; + tmailcap->type = NULL; + tmailcap->command = NULL; tmailcap->needsterminal = FALSE; tmailcap->copiousoutput = FALSE; tmailcap->textualnewlines = 0; - tmailcap->description = (char *) 0; - tmailcap->test = (char *) 0; - tmailcap->nametemplate = (char *) 0; - tmailcap->compose = (char *) 0; - tmailcap->composetyped = (char *) 0; - tmailcap->edit = (char *) 0; - tmailcap->print = (char *) 0; - tmailcap->x11bitmap = (char *) 0; + tmailcap->description = NULL; + tmailcap->test = NULL; + tmailcap->nametemplate = NULL; + tmailcap->compose = NULL; + tmailcap->composetyped = NULL; + tmailcap->edit = NULL; + tmailcap->print = NULL; + tmailcap->x11bitmap = NULL; optr = ptr = my_strdup(mailcap); diff -Nurp tin-1.7.5/src/rfc2046.c tin-1.7.6/src/rfc2046.c --- tin-1.7.5/src/rfc2046.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/rfc2046.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : rfc2046.c * Author : Jason Faultless * Created : 2000-02-18 - * Updated : 2004-01-05 + * Updated : 2004-07-07 * Notes : RFC 2046 MIME article parsing * * Copyright (c) 2000-2004 Jason Faultless @@ -611,17 +611,19 @@ parse_header( int type; if (gnksa_split_from(ptr, addr, name, &type) == GNKSA_OK) { + buffer_to_ascii(addr); + if (*name) { if (type == GNKSA_ADDRTYPE_OLDSTYLE) - sprintf(ptr, "%s (%s)", addr, rfc1522_decode(name)); + sprintf(ptr, "%s (%s)", addr, convert_to_printable(rfc1522_decode(name))); else - sprintf(ptr, "%s <%s>", rfc1522_decode(name), addr); + sprintf(ptr, "%s <%s>", convert_to_printable(rfc1522_decode(name)), addr); } else sprintf(ptr, "%s", addr); } else - return ptr; + return convert_to_printable(ptr); } else - return (rfc1522_decode(ptr)); + return (convert_to_printable(rfc1522_decode(ptr))); } return ptr; diff -Nurp tin-1.7.5/src/rfc2047.c tin-1.7.6/src/rfc2047.c --- tin-1.7.5/src/rfc2047.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/rfc2047.c 2004-08-20 10:30:49.000000000 +0200 @@ -279,7 +279,7 @@ rfc1522_decode( c++; encoding = tolower((unsigned char)*c); if (encoding == 'b') - (void) mmdecode((char *) 0, 'b', 0, (char *) 0); /* flush */ + (void) mmdecode(NULL, 'b', 0, NULL); /* flush */ c++; if (*c == '?') { c++; diff -Nurp tin-1.7.5/src/save.c tin-1.7.6/src/save.c --- tin-1.7.5/src/save.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/save.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : save.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-03-14 + * Updated : 2004-06-22 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -154,6 +154,13 @@ check_start_save_any_news( for (i = 0; i < selmenu.max; i++) { art_count = hot_count = 0; group = &active[my_group[i]]; + /* + * FIXME: workaround to get a valid CURR_GROUP + * it also points to the currently processed group so that + * the correct attributes are used + * The correct fix is to get rid of CURR_GROUP + */ + selmenu.curr = i; if (group->bogus || !group->subscribed) continue; diff -Nurp tin-1.7.5/src/screen.c tin-1.7.6/src/screen.c --- tin-1.7.5/src/screen.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/screen.c 2004-09-03 17:32:02.000000000 +0200 @@ -3,7 +3,7 @@ * Module : screen.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-06-07 + * Updated : 2004-09-03 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -243,7 +243,6 @@ center_line( t_bool inverse, const char *str) { - char buffer[256]; int pos; int len; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) @@ -251,14 +250,9 @@ center_line( wchar_t *wbuffer; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - STRCPY(buffer, str); - - /* protect terminal... */ - convert_to_printable(buffer); - - len = strlen(buffer); + len = strlen(str); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if ((wbuffer = char2wchar_t(buffer)) != NULL) { + if ((wbuffer = char2wchar_t(str)) != NULL) { if ((width = wcswidth(wbuffer, wcslen(wbuffer) + 1)) > 0) len = width; free(wbuffer); @@ -279,13 +273,12 @@ center_line( } if (len >= cCOLS) { - char *buf; + char buffer[256]; - buf = my_strdup(buffer); - strunc(buf, buffer, sizeof(buffer), cCOLS - 2); - free(buf); - } - my_fputs(buffer, stdout); + strunc(str, buffer, sizeof(buffer), cCOLS - 2); + my_fputs(buffer, stdout); + } else + my_fputs(str, stdout); if (cmd_line) my_flush(); @@ -425,6 +418,7 @@ spin_cursor( } +#define DISPLAY_FMT "%s %3d%% " /* * progressmeter in % */ @@ -439,7 +433,6 @@ show_progress( time_t curr_time; static char last_display[LEN]; static const char *last_txt; - static int last_length; static int last_ratio; static long last_total; static time_t last_update; @@ -450,6 +443,7 @@ show_progress( static int sum; static struct timeval last_time; static struct timeval this_time; + char *display_format; int time_diff; int secs_left; long count_diff; @@ -460,7 +454,6 @@ show_progress( /* If this is a new progress meter, start recalculating */ if ((last_txt != txt) || (last_total != total)) { - last_length = 0; last_ratio = -1; last_display[0] = '\0'; last_update = time(NULL) - 2; @@ -478,11 +471,12 @@ show_progress( last_update = curr_time; #ifdef HAVE_GETTIMEOFDAY - if (last_length == 0) { + display_format = my_malloc(strlen(DISPLAY_FMT) + strlen(_(txt_remaining)) + 1); + strcpy(display_format, DISPLAY_FMT); + + if (last_ratio == -1) { /* Don't print a "time remaining" this time */ - snprintf(display, sizeof(display), "%s %3d%%", txt, ratio); - display[sizeof(display) - 1] = '\0'; - last_length = strlen(txt) + 5; + snprintf(display, sizeof(display), display_format, txt, ratio); /* Reset the variables */ sum = average = samples = 0; @@ -524,10 +518,10 @@ show_progress( if (secs_left < 0) secs_left = 0; - /* TODO: -> lang.c, difficult with hardcoded last_length */ - snprintf(display, sizeof(display), "%s %3d%% (%d:%02d remaining)", txt, ratio, secs_left / 60, secs_left % 60); - last_length = strlen(txt) + 21 + secs_left / 600; + strcat(display_format, _(txt_remaining)); + snprintf(display, sizeof(display), display_format, txt, ratio, secs_left / 60, secs_left % 60); } + free(display_format); last_count = count; gettimeofday(&last_time, NULL); @@ -538,6 +532,8 @@ show_progress( /* Only display text if it changed from last time */ if (strcmp(display, last_display)) { + char *tmp; + clear_message(); MoveCursor(cLINES, 0); @@ -545,7 +541,13 @@ show_progress( fcol(tinrc.col_message); # endif /* HAVE_COLOR */ - my_printf("%s", display); + /* + * TODO: depending on the length of the newsgroup name + * it's possible to cut away a great part of the progress meter + * perhaps we should shorten the newsgroup name instead? + */ + my_printf("%s", sized_message(&tmp, "%s", display)); + free(tmp); # ifdef HAVE_COLOR fcol(tinrc.col_normal); diff -Nurp tin-1.7.5/src/search.c tin-1.7.6/src/search.c --- tin-1.7.5/src/search.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/search.c 2004-09-04 21:23:00.000000000 +0200 @@ -3,7 +3,7 @@ * Module : search.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-03-14 + * Updated : 2004-09-04 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -164,21 +164,23 @@ search_config( if (n > last) n = 0; } + /* search only visible options */ + if (option_is_visible(n)) { #ifdef HAVE_UNICODE_NORMALIZATION - if (IS_LOCAL_CHARSET("UTF-8")) - buf = normalize(_(option_table[n].txt->opt)); - else + if (IS_LOCAL_CHARSET("UTF-8")) + buf = normalize(_(option_table[n].txt->opt)); + else #endif /* HAVE_UNICODE_NORMALIZATION */ - buf = my_strdup(_(option_table[n].txt->opt)); + buf = my_strdup(_(option_table[n].txt->opt)); - if (match_regex(buf, pattern, &search_regex, TRUE)) { - result = n; + if (match_regex(buf, pattern, &search_regex, TRUE)) { + result = n; + free(buf); + break; + } free(buf); - break; } - n += incr; - free(buf); } while (n != current); clear_message(); diff -Nurp tin-1.7.5/src/select.c tin-1.7.6/src/select.c --- tin-1.7.5/src/select.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/select.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : select.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-03-16 + * Updated : 2004-07-19 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -56,6 +56,7 @@ static int select_right(void); static t_bool pos_next_unread_group(t_bool redraw); static t_bool yanked_out = TRUE; static void catchup_group(struct t_group *group, t_bool goto_next_unread_group); +static void draw_group_arrow(void); static void read_groups(void); static void select_done(void); static void select_quit(void); @@ -395,7 +396,7 @@ selection_page( break; } if (CURR_GROUP.subscribed) { - mark_screen(SELECT_LEVEL, selmenu.curr - selmenu.first, 2, CURR_GROUP.newgroup ? "N" : "u"); + mark_screen(selmenu.curr, 2, CURR_GROUP.newgroup ? "N" : "u"); subscribe(&CURR_GROUP, UNSUBSCRIBED, TRUE); info_message(_(txt_unsubscribed_to), CURR_GROUP.name); move_down(); @@ -498,7 +499,7 @@ selection_page( STRCPY(tmp, tin_ltoa(CURR_GROUP.newsrc.num_unread, 5)); else STRCPY(tmp, " "); - mark_screen(SELECT_LEVEL, selmenu.curr - selmenu.first, 9, tmp); + mark_screen(selmenu.curr, 9, tmp); } break; @@ -650,7 +651,7 @@ show_selection_page( } -void +static void draw_group_arrow( void) { @@ -937,7 +938,7 @@ catchup_group( 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, " "); + mark_screen(selmenu.curr, 9, " "); if (goto_next_unread_group) pos_next_unread_group(TRUE); diff -Nurp tin-1.7.5/src/string.c tin-1.7.6/src/string.c --- tin-1.7.5/src/string.c 2004-08-20 10:35:13.000000000 +0200 +++ tin-1.7.6/src/string.c 2004-08-21 13:29:40.000000000 +0200 @@ -3,7 +3,7 @@ * Module : string.c * Author : Urs Janssen * Created : 1997-01-20 - * Updated : 2004-06-07 + * Updated : 2004-08-21 * Notes : * * Copyright (c) 1997-2004 Urs Janssen @@ -268,7 +268,7 @@ strpbrk( return ptr1; } } - return (char *) 0; + return NULL; } #endif /* !HAVE_STRPBRK */ @@ -714,40 +714,44 @@ wchar_t2char( /* - * copy wide-chars from '*from' to '*to' until 'columns' columns are filled - * pad with spaces if necessary + * returns a new string fitting into 'columns' columns + * if pad is TRUE the resulting string will be filled with spaces if necessary */ -void +wchar_t * wcspart( - wchar_t *to, - const wchar_t *from, + const wchar_t *wstr, int columns, - int size_to, t_bool pad) { - int n, i = 0; + int used = 0; wchar_t *ptr, *wbuf; - /* make sure all characters in from are printable */ - wbuf = my_wcsdup(from); + wbuf = my_wcsdup(wstr); + /* make sure all characters in wbuf are printable */ ptr = wconvert_to_printable(wbuf); - to[0] = (wint_t) '\0'; - while (*ptr && i < size_to && wcswidth(to, size_to - 1) + wcwidth(*ptr) <= columns) { - to[i] = *ptr; - ptr++; - to[++i] = (wint_t) '\0'; - } + /* terminate wbuf after 'columns' columns */ + while (*ptr && used + wcwidth(*ptr) <= columns) + used += wcwidth(*ptr++); + *ptr = (wchar_t) '\0'; /* pad with spaces */ if (pad) { - n = columns - wcswidth(to, size_to - 1) + (int) wcslen(to); - for (; i < MIN(n, size_to - 1); i++) - to[i] = (wint_t) ' '; - to[i] = (wint_t) '\0'; - } + int gap; + + gap = columns - wcswidth(wbuf, wcslen(wbuf) + 1); + assert(gap >= 0); + wbuf = my_realloc(wbuf, sizeof(wchar_t) * (wcslen(wbuf) + gap + 1)); + ptr = wbuf + wcslen(wbuf); /* set ptr again to end of wbuf */ + + while (gap-- > 0) + *ptr++ = (wchar_t) ' '; - free(wbuf); + *ptr = (wchar_t) '\0'; + } else + wbuf = my_realloc(wbuf, sizeof(wchar_t) * (wcslen(wbuf) + 1)); + + return wbuf; } #endif /* MULTIBYTE_ABLE && !NOLOCALE */ @@ -822,34 +826,36 @@ wstrunc( wtmp = my_wcsdup(wmessage); wconvert_to_printable(wtmp); - if (wcswidth(wtmp, wcslen(wtmp)) <= len && wcslen(wtmp) < wbuf_len) { - /* wtmp doesn't need to be truncated */ + if (wcswidth(wtmp, wcslen(wtmp)) <= len && wcslen(wtmp) < wbuf_len) /* wtmp doesn't need to be truncated */ wcscpy(wbuf, wtmp); - } else { + else { /* wtmp must be truncated */ + wchar_t *wtmp2, *format; + # ifdef USE_UTF8_HORIZONTAL_ELLIPSIS if (IS_LOCAL_CHARSET("UTF-8")) { /* * use U+2026 (HORIZONTAL ELLIPSIS) instead of "..." * we gain two additional screen positions */ - wchar_t wtail[2] = {8230, 0}; /* \0-terminated U+2026 */ + format = char2wchar_t("%ls%lc"); - wcspart(wbuf, wtmp, len - 1, wbuf_len - 1, FALSE); - wcscat(wbuf, wtail); + wtmp2 = wcspart(wtmp, MIN(len - 1, (int) wbuf_len - 2), FALSE); + swprintf(wbuf, wbuf_len, format, wtmp2, 8230); /* U+2026 */ } else # endif /* USE_UTF8_HORIZONTAL_ELLIPSIS */ { - wchar_t tail[4]; - size_t i; + wchar_t *tail; - i = mbstowcs(tail, TRUNC_TAIL, ARRAY_SIZE(tail)); - tail[3] = (wchar_t) '\0'; - assert(i != (size_t) (-1)); + tail = char2wchar_t(TRUNC_TAIL); + format = char2wchar_t("%ls%ls"); - wcspart(wbuf, wtmp, len - 3, wbuf_len - 3, FALSE); - wcscat(wbuf, tail); + wtmp2 = wcspart(wtmp, MIN(len - 3, (int) wbuf_len - 4), FALSE); + swprintf(wbuf, wbuf_len, format, wtmp2, tail); + free(tail); } + free(format); + free(wtmp2); } free(wtmp); @@ -1022,14 +1028,11 @@ 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 */ + if (vasprintf(&str, fmt, ap) == -1) /* something went wrong */ #endif /* HAVE_VASPRINTF */ { size_t size = LEN; diff -Nurp tin-1.7.5/src/tags.c tin-1.7.6/src/tags.c --- tin-1.7.5/src/tags.c 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/tags.c 2004-08-20 10:30:49.000000000 +0200 @@ -85,8 +85,8 @@ look_for_multipart_info( int *offset) { MultiPartInfo tmp; - char *subj = (char *) 0; - char *pch = (char *) 0; + char *subj = NULL; + char *pch = NULL; *offset = 0; diff -Nurp tin-1.7.5/src/tcurses.c tin-1.7.6/src/tcurses.c --- tin-1.7.5/src/tcurses.c 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/tcurses.c 2004-08-20 10:30:49.000000000 +0200 @@ -690,9 +690,8 @@ my_fputc( if (_inraw && ch == '\n') fputc('\r', fp); fputc(ch, fp); - } else { + } else addch((unsigned char) ch); - } } diff -Nurp tin-1.7.5/src/thread.c tin-1.7.6/src/thread.c --- tin-1.7.5/src/thread.c 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/thread.c 2004-09-01 19:31:23.000000000 +0200 @@ -3,7 +3,7 @@ * Module : thread.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-02-21 + * Updated : 2004-07-19 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -45,14 +45,8 @@ # include "menukeys.h" #endif /* !MENUKEYS_H */ -#define INDEX2TNUM(i) ((i) % NOTESLINES) -#define INDEX2LNUM(i) (INDEX_TOP + INDEX2TNUM(i)) - #define EXPIRED(a) ((a)->article == ART_UNAVAILABLE || arts[(a)->article].thread == ART_EXPIRED) -/* sizeof the tagged/art mark area */ -#define MAGIC 3 - int thread_basenote = 0; /* Index in base[] of basenote */ static int thread_respnum = 0; /* Index in arts[] of basenote ie base[thread_basenote] */ t_bool show_subject; @@ -60,6 +54,7 @@ t_bool show_subject; /* * Local prototypes */ +static char get_art_mark(struct t_article *art); static int enter_pager(int art, t_bool ignore_unavail, int level); static int mark_art_read(struct t_group *group); static int thread_catchup(int ch); @@ -83,9 +78,40 @@ static void update_thread_page(void); */ static t_menu thdmenu = {0, 0, 0, 0, show_thread_page, draw_thread_arrow }; + +/* + * returns the mark which should be used for this article + */ +static char +get_art_mark( + struct t_article *art) +{ + if (art->inrange) { + return tinrc.art_marked_inrange; + } else if (art->status == ART_UNREAD) { + return (art->selected ? tinrc.art_marked_selected : (tinrc.recent_time && ((time((time_t) 0) - art->date) < (tinrc.recent_time * DAY))) ? tinrc.art_marked_recent : tinrc.art_marked_unread); + } else if (art->status == ART_WILL_RETURN) { + return tinrc.art_marked_return; + } else if (art->killed && tinrc.kill_level != KILL_NOTHREAD) { + return tinrc.art_marked_killed; + } else { + if (/* tinrc.kill_level != KILL_UNREAD && */ art->score >= tinrc.score_select) + return tinrc.art_marked_read_selected; /* read hot chil^H^H^H^H article */ + else + return tinrc.art_marked_read; + } +} + + /* * Build one line of the thread page display. Looks long winded, but * there are a lot of variables in the format for the output + * + * WARNING: some other code expects to find the article mark (ART_MARK_READ, + * ART_MARK_SELECTED, etc) at MARK_OFFSET from beginning of the line. + * So, if you change the format used in this routine, be sure to check that + * the value of MARK_OFFSET (tin.h) is still correct. + * Yes, this is somewhat kludgy. */ static void build_tline( @@ -99,7 +125,7 @@ build_tline( struct t_msgid *ptr; char *buffer; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t wtmp[BUFSIZ], wtmp2[BUFSIZ]; + wchar_t *wtmp, *wtmp2; char tmp[BUFSIZ]; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -114,7 +140,7 @@ build_tline( buffer = my_malloc(cCOLS + 2); # endif /* MULTIBYTE_ABLE && !NO_LOCALE */ #else - buffer = screen[INDEX2TNUM(l)].col; + buffer = screen[INDEX2SNUM(l)].col; #endif /* USE_CURSES */ /* @@ -128,24 +154,12 @@ build_tline( * Add the article flags, tag number, or whatever (3 chars) */ rest_of_line -= 3; - if (art->tagged) + if (art->tagged) { strcat(buffer, tin_ltoa(art->tagged, 3)); - else { + mark = '\0'; + } else { strcat(buffer, " "); - if (art->inrange) { - mark = tinrc.art_marked_inrange; - } else if (art->status == ART_UNREAD) { - mark = (art->selected ? tinrc.art_marked_selected : (tinrc.recent_time && ((time((time_t) 0) - art->date) < (tinrc.recent_time * DAY))) ? tinrc.art_marked_recent : tinrc.art_marked_unread); - } else if (art->status == ART_WILL_RETURN) { - mark = tinrc.art_marked_return; - } else if (art->killed && tinrc.kill_level != KILL_NOTHREAD) { - mark = tinrc.art_marked_killed; - } else { - if (/* tinrc.kill_level != KILL_UNREAD && */ art->score >= tinrc.score_select) - mark = tinrc.art_marked_read_selected; /* read hot chil^H^H^H^H article */ - else - mark = tinrc.art_marked_read; - } + mark = get_art_mark(art); buffer[MARK_OFFSET] = mark; /* insert mark */ } @@ -230,18 +244,14 @@ build_tline( ; if (!(ptr && arts[ptr->article].subject == art->subject)) { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - 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) + if ((wtmp = char2wchar_t(art->subject)) != NULL) { + wtmp2 = wcspart(wtmp, gap, TRUE); + if (wcstombs(tmp, wtmp2, sizeof(tmp) - 1) != (size_t) -1) strncat(buffer, tmp, cCOLS * MB_CUR_MAX - len - 1); + + free(wtmp); + free(wtmp2); } - free(buf); } #else strncat(buffer, art->subject, gap); @@ -255,9 +265,9 @@ build_tline( */ if (len_from) { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (mbstowcs(wtmp, buffer, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { - wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - fill = cCOLS - len_from - wcswidth(wtmp, ARRAY_SIZE(wtmp) - 1); + if ((wtmp = char2wchar_t(buffer)) != NULL) { + fill = cCOLS - len_from - wcswidth(wtmp, wcslen(wtmp) + 1); + free(wtmp); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ fill = cCOLS - len_from - strlen(buffer); @@ -273,14 +283,13 @@ 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); - if (wcstombs(tmp, wtmp, sizeof(tmp) - 1) != (size_t) -1) + if ((wtmp = char2wchar_t(tmp)) != NULL) { + wtmp2 = wcspart(wtmp, len_from, TRUE); + if (wcstombs(tmp, wtmp2, sizeof(tmp) - 1) != (size_t) -1) strncat(buffer, tmp, cCOLS * MB_CUR_MAX - strlen(buffer) - 1); + + free(wtmp); + free(wtmp2); } #else get_author(TRUE, art, buffer + strlen(buffer), len_from); @@ -291,11 +300,13 @@ build_tline( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) get_author(TRUE, art, tmp, sizeof(tmp) - 1); - if (mbstowcs(wtmp2, tmp, ARRAY_SIZE(wtmp2) - 1) != (size_t) -1) { - wtmp2[ARRAY_SIZE(wtmp2) - 1] = (wchar_t) '\0'; - wcspart(wtmp, wtmp2, cCOLS - strlen(buffer), ARRAY_SIZE(wtmp), TRUE); - if (wcstombs(tmp, wtmp, sizeof(tmp) - 1) != (size_t) -1) + if ((wtmp = char2wchar_t(tmp)) != NULL) { + wtmp2 = wcspart(wtmp, cCOLS - strlen(buffer), TRUE); + if (wcstombs(tmp, wtmp2, sizeof(tmp) - 1) != (size_t) -1) strncat(buffer, tmp, cCOLS * MB_CUR_MAX - strlen(buffer) - 1); + + free(wtmp); + free(wtmp2); } #else get_author(TRUE, art, buffer + strlen(buffer), cCOLS - strlen(buffer)); @@ -310,9 +321,9 @@ build_tline( * Pad to end of line so that inverse bar looks 'good' */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (mbstowcs(wtmp, buffer, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { - wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - fill = cCOLS - wcswidth(wtmp, ARRAY_SIZE(wtmp) - 1); + if ((wtmp = char2wchar_t(buffer)) != NULL) { + fill = cCOLS - wcswidth(wtmp, wcslen(wtmp) + 1); + free(wtmp); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ fill = cCOLS - strlen(buffer); @@ -324,63 +335,15 @@ build_tline( buffer[gap + fill] = '\0'; } -#ifdef USE_CURSES WriteLine(INDEX2LNUM(l), buffer); - free(buffer); -#endif /* USE_CURSES */ -} - - -/* - * Update a line on the group or thread screen. - * This only puts to the screen, the hard work is done by build_*line() - * i is an index into base[] - * If 'magic' is != 0 then only a partial redraw of width=magic is done. - * This is intended to redraw the art_mark/tag/unread counts that change - * more frequently than the rest of the line - */ -void -draw_line( - int i, - int magic) -{ - int startpos = (!magic) ? 0 : (MARK_OFFSET - 2); - int tlen; #ifdef USE_CURSES - char buffer[BUFSIZ]; - char *s = screen_contents(INDEX2LNUM(i), startpos, buffer); -#else - char *s = &(screen[INDEX2TNUM(i)].col[startpos]); + free(buffer); #endif /* USE_CURSES */ - if (tinrc.strip_blanks) - strip_line(s); - if (!magic) { - tlen = strlen(s); /* note new line length */ - CleartoEOLN(); - } else - tlen = magic; - - MoveCursor(INDEX2LNUM(i), startpos); - if (tlen) - my_printf("%.*s", tlen, s); - - /* - * It is somewhat less efficient to go back and redo the art mark - * if selected, but it is more readable - * - * we don't highlight read_selected arts, as one might have set - * art_mark_read_selected = art_mark_read... - */ - if (s[MARK_OFFSET-startpos] == tinrc.art_marked_selected) { - MoveCursor(INDEX2LNUM(i), MARK_OFFSET); - StartInverse(); /* ToggleInverse() doesn't work correct with ncurses4.x */ - my_fputc(s[MARK_OFFSET-startpos], stdout); - EndInverse(); /* ToggleInverse() doesn't work correct with ncurses4.x */ - } - MoveCursor(INDEX2LNUM(i) + 1, 0); - return; + if (mark == tinrc.art_marked_selected) + draw_mark_selected(l); + MoveCursor(INDEX2LNUM(l) + 1, 0); } @@ -425,6 +388,7 @@ thread_page( t_pagerinfo *page) /* !NULL if we must go direct to the pager */ { char key[MAXKEYLEN]; + char mark[] = { '\0', '\0' }; int ret_code = 0; /* Set to < 0 when it is time to leave this menu */ int ch = 0; int i, n; @@ -706,10 +670,9 @@ thread_page( else { t_bool tagged; - if ((tagged = tag_article(n))) { - build_tline(thdmenu.curr, &arts[n]); /* Update just this line */ - draw_line(thdmenu.curr, MAGIC); - } else + if ((tagged = tag_article(n))) + mark_screen(thdmenu.curr, MARK_OFFSET - 2, tin_ltoa((&arts[n])->tagged, 3)); + else update_thread_page(); /* Must update whole page */ /* Automatically advance to next art if not at end of thread */ @@ -738,8 +701,8 @@ thread_page( case iKeyThreadMarkArtUnread: /* mark article as unread */ n = find_response(thread_basenote, thdmenu.curr); art_mark(group, &arts[n], ART_WILL_RETURN); - build_tline(thdmenu.curr, &arts[n]); - draw_line(thdmenu.curr, MAGIC); + mark[0] = get_art_mark(&arts[n]); + mark_screen(thdmenu.curr, MARK_OFFSET, mark); info_message(_(txt_marked_as_unread), _(txt_article_upper)); draw_thread_arrow(); break; @@ -756,8 +719,8 @@ thread_page( break; arts[n].selected = (!(ch == iKeyThreadToggleArtSel && arts[n].selected)); /* TODO: optimise? */ /* update_thread_page(); */ - build_tline(thdmenu.curr, &arts[n]); - draw_line(thdmenu.curr, MAGIC); + mark[0] = get_art_mark(&arts[n]); + mark_screen(thdmenu.curr, MARK_OFFSET, mark); if (thdmenu.curr + 1 < thdmenu.max) move_down(); else @@ -839,7 +802,6 @@ show_thread_page( for (i = thdmenu.first; i < thdmenu.last; ++i) { build_tline(i, &arts[art]); - draw_line(i, 0); art = next_response(art); } @@ -857,14 +819,22 @@ static void update_thread_page( void) { + char mark[] = { '\0', '\0' }; int i, j, the_index; the_index = find_response(thread_basenote, thdmenu.first); assert(thdmenu.first != 0 || the_index == thread_respnum); for (j = 0, i = thdmenu.first; j < NOTESLINES && i < thdmenu.last; ++i, ++j) { - build_tline(i, &arts[the_index]); - draw_line(i, MAGIC); + if ((&arts[the_index])->tagged) { + mark_screen(i, MARK_OFFSET - 2, tin_ltoa((&arts[the_index])->tagged, 3)); + } else { + mark[0] = get_art_mark(&arts[the_index]); + mark_screen(i, MARK_OFFSET - 2, " "); /* clear space used by tag numbering */ + mark_screen(i, MARK_OFFSET, mark); + if (mark[0] == tinrc.art_marked_selected) + draw_mark_selected(i); + } if ((the_index = next_response(the_index)) == -1) break; } @@ -1026,7 +996,10 @@ get_score_of_thread( int score = 0; for (i = n; i >= 0; i = arts[i].thread) { - if (arts[i].status != ART_READ || arts[i].killed == ART_KILLED_UNREAD) { + /* + * TODO: do we want to take the score of read articles into account? + */ + if (arts[i].status != ART_READ || arts[i].killed == ART_KILLED_UNREAD /* || tinrc.kill_level == KILL_THREAD */) { if (tinrc.thread_score == THREAD_SCORE_MAX) { /* we use the maximum article score for the complete thread */ if ((arts[i].score > score) && (arts[i].score > 0)) @@ -1546,9 +1519,11 @@ mark_art_read( case iKeyMarkReadCur: /* mark current article as read */ n = find_response(thread_basenote, thdmenu.curr); if ((arts[n].status == ART_UNREAD) || (arts[n].status == ART_WILL_RETURN)) { + char mark[] = { '\0', '\0' }; + art_mark(group, &arts[n], ART_READ); - build_tline(thdmenu.curr, &arts[n]); - draw_line(thdmenu.curr, MAGIC); + mark[0] = get_art_mark(&arts[n]); + mark_screen(thdmenu.curr, MARK_OFFSET, mark); } break; diff -Nurp tin-1.7.5/src/tincfg.tbl tin-1.7.6/src/tincfg.tbl --- tin-1.7.5/src/tincfg.tbl 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/tincfg.tbl 2004-09-06 10:59:58.000000000 +0200 @@ -223,7 +223,7 @@ # else # ifdef HAVE_LIBIDN normalization_form txt_normalization_forms 2 - #endif +# endif # endif #endif #if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) diff -Nurp tin-1.7.5/src/tmpfile.c tin-1.7.6/src/tmpfile.c --- tin-1.7.5/src/tmpfile.c 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/tmpfile.c 2004-08-20 10:30:49.000000000 +0200 @@ -79,7 +79,7 @@ tmpfile( (void) unlink(buf); u = umask(0); (void) umask(u); - (void) fchmod(fd, 0666 & ~u); + (void) fchmod(fd, (S_IRUGO|S_IWUGO) & ~u); } (void) sigprocmask(SIG_SETMASK, &oset, NULL); diff -Nurp tin-1.7.5/src/xface.c tin-1.7.6/src/xface.c --- tin-1.7.5/src/xface.c 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/xface.c 2004-08-20 10:30:49.000000000 +0200 @@ -3,7 +3,7 @@ * Module : xface.c * Author : Joshua Crawford & Drazen Kacar * Created : 2003-04-27 - * Updated : 2003-06-27 + * Updated : 2004-07-27 * Notes : * * Copyright (c) 2003-2004 Joshua Crawford & Drazen Kacar @@ -127,7 +127,7 @@ slrnface_start( } unlink(fifo); - if (mkfifo(fifo, 0600) < 0) { + if (mkfifo(fifo, (S_IRUSR|S_IWUSR)) < 0) { perror_message(_("Can't run slrnface: failed to create %s"), fifo); unlink(fifo); free(fifo); @@ -146,9 +146,9 @@ slrnface_start( * "-yOffsetChar", tinrc.xfacey, * "-ink", tinrc.xfacefg, * "-paper", tinrc.xfacebg, - * fifo, (char *) 0); + * fifo, NULL); */ - execlp("slrnface", "slrnface", fifo, (char *) 0); + execlp("slrnface", "slrnface", fifo, NULL); /* This is child, exit on error. */ giveup(); /* NOTREACHED */ @@ -165,7 +165,7 @@ slrnface_start( switch (WEXITSTATUS(status)) { case 0: /* All fine, open the pipe */ - slrnface_fd = open(fifo, O_WRONLY, 0600); + slrnface_fd = open(fifo, O_WRONLY, (S_IRUSR|S_IWUSR)); write(slrnface_fd, "start\n", strlen("start\n")); message = NULL; break; diff -Nurp tin-1.7.5/src/xref.c tin-1.7.6/src/xref.c --- tin-1.7.5/src/xref.c 2004-08-20 10:35:14.000000000 +0200 +++ tin-1.7.6/src/xref.c 2004-08-31 23:11:07.000000000 +0200 @@ -3,7 +3,7 @@ * Module : xref.c * Author : I. Lea & H. Brugge * Created : 1993-07-01 - * Updated : 2003-12-28 + * Updated : 2004-08-31 * Notes : * * Copyright (c) 1993-2004 Iain Lea @@ -172,7 +172,7 @@ art_mark_xref_read( long artnum; struct t_group *group; #ifdef DEBUG - char debug_mesg; + char *debug_mesg; #endif /* DEBUG */ #if defined(NNTP_ABLE) && defined(XHDR_XREF) diff -Nurp tin-1.7.5/tin.spec tin-1.7.6/tin.spec --- tin-1.7.5/tin.spec 2004-08-20 10:35:09.000000000 +0200 +++ tin-1.7.6/tin.spec 2004-08-20 10:30:47.000000000 +0200 @@ -1,6 +1,6 @@ Name: tin Summary: tin - an easy-to-use USENET news reader -Version: 1.7.5 +Version: 1.7.6 Release: 1 Copyright: BSD Group: Applications/News diff -Nurp tin-1.7.5/tools/tinews.pl tin-1.7.6/tools/tinews.pl --- tin-1.7.5/tools/tinews.pl 2004-08-20 10:35:10.000000000 +0200 +++ tin-1.7.6/tools/tinews.pl 2004-08-20 10:30:48.000000000 +0200 @@ -34,14 +34,15 @@ # # 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 ~/.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 # # version Number -my $version = "1.1.6"; +my $version = "1.1.7"; my %config; @@ -502,7 +503,7 @@ sub signarticle { `$PGPCommand`; open (FH, "<" . $config{'pgptmpf'} . ".txt.asc") or die "$0: can't open ".$config{'pgptmpf'}.".txt.asc: $!\n"; - $/ = $config{'pgpbegin'}."\n"; + $/ = "\n".$config{'pgpbegin'}."\n"; $_ = ; unless (m/\Q$config{'pgpbegin'}\E$/o) { unlink $config{'pgptmpf'} . ".txt"; diff -Nurp tin-1.7.5/tools/w2r.pl tin-1.7.6/tools/w2r.pl --- tin-1.7.5/tools/w2r.pl 2004-08-20 10:35:10.000000000 +0200 +++ tin-1.7.6/tools/w2r.pl 2004-08-24 14:43:37.000000000 +0200 @@ -18,7 +18,7 @@ require 5.004; # version Number -# $VERSION = "0.2.6"; +# $VERSION = "0.2.7"; while (defined($line = <>)) { chomp $line; @@ -92,13 +92,15 @@ sub w2p { } # common abbreviations - # - # replace [0-9] with [\d] in the first [] # TODO: make this global + # replace [0-9] with [\d] in the first [] + # replace [a-zA-Z0-9_] with [\w] in the first [] + # replace [a-zA-Z0-9] with [^\W_] in the first [] + # replace [a-zA-Z] with [^\W\d_] in the first [] $rval =~ s/^([^\[]*)\[0-9\]/$1\[\\d\]/o; - # replace [a-zA-Z_] with [\w] in the first [] - # TODO: make this global $rval =~ s/([^\[]*)\[a-za-z0-9_\]/$1\[\\w\]/io; + $rval =~ s/([^\[]*)\[a-za-z0-9\]/$1\[^\\W_\]/io; + $rval =~ s/([^\[]*)\[a-za-z\]/$1\[^\\W\\d_\]/io; # optimizations #