----------------------------------------------------------------------------- MANIFEST | 182 ++++----- Makefile | 4 aclocal.m4 | 7 config.guess | 10 config.sub | 14 configure | 589 ++++++++++++++++---------------- configure.in | 12 doc/CHANGES | 67 +++ doc/INSTALL | 6 doc/TODO | 51 -- doc/WHATSNEW | 105 ----- doc/tin.1 | 139 +++---- doc/tin.5 | 18 include/autoconf.hin | 3 include/extern.h | 12 include/nntplib.h | 1 include/policy.h | 20 - include/proto.h | 11 include/tin.h | 49 +- include/tinrc.h | 5 include/version.h | 10 pcre/ChangeLog | 56 +++ pcre/LICENCE | 2 pcre/Makefile.in-old | 23 - pcre/NEWS | 15 pcre/configure.in | 17 pcre/doc/pcre.3 | 15 pcre/internal.h | 5 pcre/pcre.c | 130 +++++-- pcre/pcre.in | 4 pcre/pcregrep.c | 4 pcre/pcreposix.c | 11 pcre/pcretest.c | 44 +- pcre/study.c | 45 ++ pcre/testdata/testinput5 | 30 + pcre/testdata/testoutput1 | 2 pcre/testdata/testoutput2 | 19 - pcre/testdata/testoutput3 | 4 pcre/testdata/testoutput4 | 2 pcre/testdata/testoutput5 | 76 +++- pcre/version.sh | 4 po/de.gmo |binary po/de.po | 796 ++++++++++++++++++++++--------------------- po/en_GB.gmo |binary po/en_GB.po | 789 ++++++++++++++++++++++--------------------- po/et.gmo |binary po/et.po | 803 ++++++++++++++++++++++---------------------- po/fr.gmo |binary po/fr.po | 794 ++++++++++++++++++++++--------------------- po/messages |binary po/tin.pot | 793 ++++++++++++++++++++++--------------------- src/active.c | 13 src/art.c | 339 +++++++----------- src/attrib.c | 4 src/auth.c | 8 src/config.c | 97 ++--- src/cook.c | 3 src/curses.c | 4 src/debug.c | 20 - src/feed.c | 10 src/filter.c | 36 - src/group.c | 11 src/header.c | 6 src/inews.c | 6 src/init.c | 10 src/keymap.c | 2 src/lang.c | 32 + src/main.c | 8 src/memory.c | 6 src/mimetypes.c | 3 src/misc.c | 41 +- src/newsrc.c | 93 ++--- src/nrctbl.c | 2 src/open.c | 209 ++++++++--- src/page.c | 49 +- src/post.c | 77 +--- src/prompt.c | 4 src/rfc1524.c | 206 ++++------- src/rfc2046.c | 134 ++++++- src/save.c | 24 - src/screen.c | 33 - src/search.c | 4 src/select.c | 6 src/sigfile.c | 1 src/signal.c | 8 src/strftime.c | 36 - src/string.c | 163 ++++++++ src/tags.c | 5 src/thread.c | 2 src/tincfg.tbl | 5 src/trace.c | 2 src/version.c | 6 src/xface.c | 2 src/xref.c | 63 +-- 94 files changed, 4076 insertions, 3515 deletions ----------------------------------------------------------------------------- diff -Nurp tin-1.7.0/MANIFEST tin-1.7.1/MANIFEST --- tin-1.7.0/MANIFEST Sun Aug 10 16:31:04 2003 +++ tin-1.7.1/MANIFEST Thu Sep 18 18:37:49 2003 @@ -1,4 +1,4 @@ -MANIFEST for tin-1.7.0 (Sun Aug 10 16:31:04 CEST 2003) +MANIFEST for tin-1.7.1 (Thu Sep 18 18:37:48 CEST 2003) ---------------------------------------------------- 13085 ./Makefile 7531 ./MANIFEST @@ -6,22 +6,22 @@ MANIFEST for tin-1.7.0 (Sun Aug 10 16:31 217 ./README.MAC 2209 ./README.VMS 1006 ./README.WIN - 133232 ./aclocal.m4 + 133038 ./aclocal.m4 882 ./conf-tin - 41853 ./config.guess - 30260 ./config.sub - 449433 ./configure - 28778 ./configure.in + 42069 ./config.guess + 30369 ./config.sub + 449401 ./configure + 28552 ./configure.in 5555 ./install.sh 777 ./mkdirs.sh 1505 ./tin.spec 18847 ./doc/ABOUT-NLS - 2574 ./doc/CHANGES + 5169 ./doc/CHANGES 226345 ./doc/CHANGES.old 1469 ./doc/DEBUG_REFS - 29430 ./doc/INSTALL - 31189 ./doc/TODO - 3302 ./doc/WHATSNEW + 29446 ./doc/INSTALL + 29986 ./doc/TODO + 412 ./doc/WHATSNEW 2617 ./doc/art_handling.txt 3862 ./doc/auth.txt 5346 ./doc/config-anomalies @@ -46,8 +46,8 @@ MANIFEST for tin-1.7.0 (Sun Aug 10 16:31 4168 ./doc/mmdf.5 2128 ./doc/newsoverview.5 6963 ./doc/plp_snprintf.3 - 120218 ./doc/tin.1 - 69817 ./doc/tin.5 + 120476 ./doc/tin.1 + 70016 ./doc/tin.5 4733 ./doc/w2r.1 2196 ./doc/wildmat.3 344 ./tools/expiretover @@ -61,89 +61,89 @@ MANIFEST for tin-1.7.0 (Sun Aug 10 16:31 2702 ./include/bool.h 2128 ./include/bugrep.h 9502 ./include/oldconfig.h - 57728 ./include/extern.h + 57722 ./include/extern.h 11429 ./include/keymap.h 15886 ./include/menukeys.h - 6539 ./include/nntplib.h + 6599 ./include/nntplib.h 665 ./include/plp_snprintf.h - 11836 ./include/policy.h - 29898 ./include/proto.h + 12079 ./include/policy.h + 30209 ./include/proto.h 5047 ./include/rfc2046.h 3373 ./include/stpwatch.h 5400 ./include/tcurses.h - 66312 ./include/tin.h - 12814 ./include/tinrc.h + 66282 ./include/tin.h + 12821 ./include/tinrc.h 5736 ./include/tnntp.h 2256 ./include/trace.h - 2685 ./include/version.h - 24977 ./src/active.c - 50476 ./src/art.c - 30113 ./src/attrib.c - 12301 ./src/auth.c + 2686 ./include/version.h + 25033 ./src/active.c + 49222 ./src/art.c + 30131 ./src/attrib.c + 12365 ./src/auth.c 13846 ./src/charset.c 5981 ./src/color.c - 85273 ./src/config.c - 29286 ./src/cook.c - 34665 ./src/curses.c - 9928 ./src/debug.c + 85678 ./src/config.c + 29311 ./src/cook.c + 34682 ./src/curses.c + 9917 ./src/debug.c 3414 ./src/envarg.c - 25215 ./src/feed.c - 52178 ./src/filter.c + 25277 ./src/feed.c + 51671 ./src/filter.c 17968 ./src/getline.c 7254 ./src/global.c - 44489 ./src/group.c + 44582 ./src/group.c 4158 ./src/hashstr.c - 9671 ./src/header.c + 9701 ./src/header.c 27952 ./src/help.c - 13778 ./src/inews.c - 31889 ./src/init.c + 13781 ./src/inews.c + 31958 ./src/init.c 2845 ./src/joinpath.c - 38017 ./src/keymap.c - 113906 ./src/lang.c + 38018 ./src/keymap.c + 114194 ./src/lang.c 4310 ./src/langinfo.c 7033 ./src/list.c 6672 ./src/lock.c 11882 ./src/mail.c - 26791 ./src/main.c + 26795 ./src/main.c 10227 ./src/makecfg.c - 12207 ./src/memory.c - 5222 ./src/mimetypes.c - 83791 ./src/misc.c - 37475 ./src/newsrc.c + 12216 ./src/memory.c + 5257 ./src/mimetypes.c + 84046 ./src/misc.c + 37066 ./src/newsrc.c 27755 ./src/nntplib.c - 7248 ./src/nrctbl.c - 26546 ./src/open.c - 55089 ./src/page.c + 7270 ./src/nrctbl.c + 28554 ./src/open.c + 55221 ./src/page.c 24132 ./src/parsdate.y 16966 ./src/plp_snprintf.c 12670 ./src/pgp.c - 130410 ./src/post.c - 13850 ./src/prompt.c + 130733 ./src/post.c + 13860 ./src/prompt.c 10822 ./src/read.c 24976 ./src/refs.c 4621 ./src/regex.c - 14215 ./src/rfc1524.c + 14488 ./src/rfc1524.c 5553 ./src/rfc2045.c - 26708 ./src/rfc2046.c + 28567 ./src/rfc2046.c 23766 ./src/rfc2047.c - 36925 ./src/save.c - 11495 ./src/screen.c - 12769 ./src/search.c - 30574 ./src/select.c - 7739 ./src/sigfile.c - 12361 ./src/signal.c - 7001 ./src/strftime.c - 12465 ./src/string.c - 13814 ./src/tags.c + 37008 ./src/save.c + 10834 ./src/screen.c + 12776 ./src/search.c + 30616 ./src/select.c + 7740 ./src/sigfile.c + 12534 ./src/signal.c + 7215 ./src/strftime.c + 15675 ./src/string.c + 13816 ./src/tags.c 15871 ./src/tcurses.c 3058 ./src/tmpfile.c 3376 ./src/my_tmpfile.c - 40019 ./src/thread.c - 2466 ./src/trace.c - 4120 ./src/version.c + 40018 ./src/thread.c + 2464 ./src/trace.c + 4109 ./src/version.c 5489 ./src/wildmat.c - 7133 ./src/xface.c - 7397 ./src/xref.c + 7129 ./src/xface.c + 7365 ./src/xref.c 4987 ./amiga/README 5520 ./amiga/tin.readme 9918 ./amiga/smakefile @@ -176,50 +176,50 @@ MANIFEST for tin-1.7.0 (Sun Aug 10 16:31 389 ./vms/vmstimval.h 179 ./pcre/AUTHORS 2218 ./pcre/COPYING - 57033 ./pcre/ChangeLog + 59675 ./pcre/ChangeLog 8049 ./pcre/INSTALL 2218 ./pcre/LICENCE 2405 ./pcre/Makefile.in - 12927 ./pcre/Makefile.in-old - 5101 ./pcre/NEWS + 12476 ./pcre/Makefile.in-old + 5514 ./pcre/NEWS 4790 ./pcre/NON-UNIX-USE 16335 ./pcre/README 3077 ./pcre/RunTest.in 72 ./pcre/config.h - 4781 ./pcre/configure.in + 4720 ./pcre/configure.in 4766 ./pcre/dftables.c 11406 ./pcre/get.c - 28259 ./pcre/internal.h + 28334 ./pcre/internal.h 4289 ./pcre/maketables.c 1093 ./pcre/pcre-config.in - 231769 ./pcre/pcre.c + 233449 ./pcre/pcre.c 271 ./pcre/pcre.def - 6632 ./pcre/pcre.in + 6717 ./pcre/pcre.in 11338 ./pcre/pcredemo.c - 15347 ./pcre/pcregrep.c - 10114 ./pcre/pcreposix.c + 15371 ./pcre/pcregrep.c + 10193 ./pcre/pcreposix.c 2347 ./pcre/pcreposix.h - 39441 ./pcre/pcretest.c + 39984 ./pcre/pcretest.c 5232 ./pcre/perltest 9610 ./pcre/printint.c - 12544 ./pcre/study.c - 395 ./pcre/version.sh - 6405 ./pcre/doc/pcre.3 + 13539 ./pcre/study.c + 398 ./pcre/version.sh + 6924 ./pcre/doc/pcre.3 55267 ./pcre/doc/pcrepattern.3 73940 ./pcre/testdata/testinput1 20201 ./pcre/testdata/testinput2 569 ./pcre/testdata/testinput3 8396 ./pcre/testdata/testinput4 - 2579 ./pcre/testdata/testinput5 - 98300 ./pcre/testdata/testoutput1 - 82791 ./pcre/testdata/testoutput2 - 1527 ./pcre/testdata/testoutput3 - 14599 ./pcre/testdata/testoutput4 - 18789 ./pcre/testdata/testoutput5 - 19111 ./include/autoconf.hin + 2889 ./pcre/testdata/testinput5 + 98303 ./pcre/testdata/testoutput1 + 82522 ./pcre/testdata/testoutput2 + 1498 ./pcre/testdata/testoutput3 + 14602 ./pcre/testdata/testoutput4 + 19217 ./pcre/testdata/testoutput5 + 19049 ./include/autoconf.hin 5800 ./pcre/pcre.mms 20141 ./src/Makefile.in - 7144 ./src/tincfg.tbl + 7211 ./src/tincfg.tbl 8747 ./src/descrip.mms 954 ./libcanlock/Build 882 ./libcanlock/CHANGES @@ -281,13 +281,13 @@ MANIFEST for tin-1.7.0 (Sun Aug 10 16:31 41 ./intl/VERSION 4962 ./po/Makefile.inn 839 ./po/POTFILES.in - 120827 ./po/tin.pot - 164556 ./po/de.gmo - 195151 ./po/de.po + 121210 ./po/tin.pot + 164399 ./po/de.gmo + 195427 ./po/de.po 7444 ./po/en_GB.gmo - 123346 ./po/en_GB.po - 156930 ./po/et.gmo - 187192 ./po/et.po - 104478 ./po/fr.gmo - 165579 ./po/fr.po -5913326 total + 123730 ./po/en_GB.po + 156502 ./po/et.gmo + 187490 ./po/et.po + 104476 ./po/fr.gmo + 166027 ./po/fr.po +5927860 total diff -Nurp tin-1.7.0/Makefile tin-1.7.1/Makefile --- tin-1.7.0/Makefile Sun Aug 10 16:31:02 2003 +++ tin-1.7.1/Makefile Thu Sep 18 18:37:45 2003 @@ -7,9 +7,9 @@ PROJECT = tin LVER = 1 PVER = 7 -SVER = 0 +SVER = 1 VER = $(LVER).$(PVER).$(SVER) -DVER = 20030810 +DVER = 20030918 EXE = tin # directory structure diff -Nurp tin-1.7.0/aclocal.m4 tin-1.7.1/aclocal.m4 --- tin-1.7.0/aclocal.m4 Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/aclocal.m4 Sat Sep 13 18:35:49 2003 @@ -2,7 +2,7 @@ dnl Project : tin - a Usenet reader dnl Module : aclocal.m4 dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2003-06-04 +dnl Updated : 2003-09-13 dnl Notes : dnl dnl Copyright (c) 1995-2003 Thomas E. Dickey @@ -16,10 +16,7 @@ dnl notice, this list of conditions a dnl 2. Redistributions in binary form must reproduce the above copyright dnl notice, this list of conditions and the following disclaimer in the dnl documentation and/or other materials provided with the distribution. -dnl 3. All advertising materials mentioning features or use of this software -dnl must display the following acknowledgement: -dnl This product includes software developed by Thomas E. Dickey. -dnl 4. The name of the author may not be used to endorse or promote +dnl 3. The name of the author may not be used to endorse or promote dnl products derived from this software without specific prior written dnl permission. dnl diff -Nurp tin-1.7.0/config.guess tin-1.7.1/config.guess --- tin-1.7.0/config.guess Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/config.guess Sat Aug 23 01:58:39 2003 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-06-17' +timestamp='2003-08-18' # 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 @@ -763,7 +763,10 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + # GNU/FreeBSD 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} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -944,6 +947,9 @@ EOF #else LIBC=gnuaout #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` diff -Nurp tin-1.7.0/config.sub tin-1.7.1/config.sub --- tin-1.7.0/config.sub Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/config.sub Sat Aug 23 01:58:39 2003 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-06-17' +timestamp='2003-08-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -228,13 +228,14 @@ case $basic_machine in | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ + | ip2k | iq2000 \ | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ @@ -304,7 +305,7 @@ case $basic_machine in | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ + | ip2k-* | iq2000-* \ | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ @@ -1128,7 +1129,7 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ @@ -1163,6 +1164,9 @@ case $os in ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` diff -Nurp tin-1.7.0/configure tin-1.7.1/configure --- tin-1.7.0/configure Sun Aug 10 16:31:04 2003 +++ tin-1.7.1/configure Thu Sep 18 18:37:48 2003 @@ -617,7 +617,7 @@ fi PACKAGE=tin -VERSION=1.7.0 +VERSION=1.7.1 cat >> confdefs.h <&6 -echo "configure:11064: checking for $ac_func" >&5 +echo "configure:11062: 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:11090: \"$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 @@ -11114,12 +11112,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:11118: checking for flock" >&5 +echo "configure:11116: 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:11144: \"$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 @@ -11164,7 +11162,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:11168: checking for flock in -lbsd" >&5 +echo "configure:11166: 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 @@ -11172,7 +11170,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:11185: \"$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 @@ -11212,12 +11210,12 @@ fi echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:11216: checking for wide char and multibyte support" >&5 +echo "configure:11214: 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 @@ -11253,7 +11251,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:11257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -11263,7 +11261,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -11289,7 +11287,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:11293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes cat >> confdefs.h <<\EOF @@ -11321,12 +11319,12 @@ echo "$ac_t""$am_cv_multibyte_able" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:11325: checking return type of signal handlers" >&5 +echo "configure:11323: 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 @@ -11343,7 +11341,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:11347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -11363,7 +11361,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:11367: checking declaration of signal arguments" >&5 +echo "configure:11365: 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 @@ -11372,7 +11370,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -11380,7 +11378,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:11384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -11406,13 +11404,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:11410: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:11408: 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 < @@ -11421,7 +11419,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:11425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -11442,13 +11440,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:11446: checking if we have sigaction/related functions" >&5 +echo "configure:11444: 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:11468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_sigaction_funcs=yes else @@ -11488,7 +11486,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:11492: checking for fork" >&5 +echo "configure:11490: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11497,7 +11495,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:11509: \"$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 @@ -11529,12 +11527,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:11533: checking for memmove" >&5 +echo "configure:11531: 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:11559: \"$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 @@ -11576,12 +11574,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:11580: checking for bcopy" >&5 +echo "configure:11578: 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:11606: \"$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 @@ -11620,7 +11618,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:11624: checking if bcopy does overlapping moves" >&5 +echo "configure:11622: 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 @@ -11629,7 +11627,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:11644: \"$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 @@ -11680,9 +11678,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:11684: checking if select expects int * arguments" >&5 +echo "configure:11682: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -11702,7 +11700,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:11706: checking whether closedir returns void" >&5 +echo "configure:11704: 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 @@ -11710,13 +11708,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:11720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11718: \"$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 @@ -11740,7 +11738,7 @@ fi ## AC_FUNC_SETPGRP echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:11744: checking whether setvbuf arguments are reversed" >&5 +echo "configure:11742: 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 @@ -11748,7 +11746,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. */ @@ -11762,7 +11760,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:11766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11764: \"$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 @@ -11799,12 +11797,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11803: checking for $ac_func" >&5 +echo "configure:11801: 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:11829: \"$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 @@ -11854,13 +11852,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:11858: checking for type sigaction_t" >&5 +echo "configure:11856: 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 < @@ -11868,7 +11866,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:11872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -11888,13 +11886,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:11892: checking for nonconflicting termios.h" >&5 +echo "configure:11890: 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:11918: \"$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 @@ -11947,13 +11945,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:11951: checking for passwd.pw_gecos" >&5 +echo "configure:11949: 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 < @@ -11964,7 +11962,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:11968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -11984,13 +11982,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:11988: checking for tm.tm_gmtoff" >&5 +echo "configure:11986: 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:12012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -12030,7 +12028,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:12034: checking for long file names" >&5 +echo "configure:12032: 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 @@ -12078,17 +12076,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:12082: checking for $ac_hdr" >&5 +echo "configure:12080: 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:12092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12090: \"$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* @@ -12125,17 +12123,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:12129: checking for $ac_hdr" >&5 +echo "configure:12127: 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:12139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12137: \"$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* @@ -12165,17 +12163,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:12169: checking for $ac_hdr" >&5 +echo "configure:12167: 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:12179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12177: \"$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* @@ -12216,13 +12214,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:12220: checking for union wait" >&5 +echo "configure:12218: 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:12235: \"$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 @@ -12244,7 +12242,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:12261: \"$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 @@ -12284,7 +12282,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:12288: checking if the system function returns usable child-status" >&5 +echo "configure:12286: 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 @@ -12293,7 +12291,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -12326,7 +12324,7 @@ int main() } EOF -if { (eval echo configure:12330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12328: \"$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 @@ -12337,11 +12335,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:12343: \"$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 @@ -12384,13 +12382,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:12388: checking for obsolete/broken version of ncurses" >&5 +echo "configure:12386: 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 < @@ -12404,7 +12402,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -12429,13 +12427,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:12433: checking if curses supports color attributes" >&5 +echo "configure:12431: 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 < @@ -12450,7 +12448,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:12454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -12501,7 +12499,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:12505: checking for redefinable signal constants" >&5 +echo "configure:12503: 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 @@ -12513,7 +12511,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:12542: \"$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 @@ -12566,13 +12564,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:12570: checking for ANSI qsort" >&5 +echo "configure:12568: 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:12586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -12612,7 +12610,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:12616: checking if application can dump core" >&5 +echo "configure:12614: 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 @@ -12621,7 +12619,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -12662,7 +12660,7 @@ int main() #endif } EOF -if { (eval echo configure:12666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12664: \"$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 @@ -12708,18 +12706,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:12712: checking for missing "${ac_func}" extern" >&5 +echo "configure:12710: 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 12718) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 12716) 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:12735: \"$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 @@ -12741,7 +12739,7 @@ if { (eval echo configure:12737: \"$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:12753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -12800,18 +12798,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:12804: checking for missing "${ac_func}" extern" >&5 +echo "configure:12802: 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 12810) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 12808) 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:12827: \"$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 @@ -12833,7 +12831,7 @@ if { (eval echo configure:12829: \"$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:12845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -12890,18 +12888,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:12894: checking for missing "${ac_func}" extern" >&5 +echo "configure:12892: 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 12900) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 12898) 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:12917: \"$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 @@ -12923,7 +12921,7 @@ if { (eval echo configure:12919: \"$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:12935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13017,7 +13015,6 @@ for ac_func in \ strncasecmp \ strtol \ system \ - tempnam \ time \ tolower \ toupper \ @@ -13032,18 +13029,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:13036: checking for missing "${ac_func}" extern" >&5 +echo "configure:13033: 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 13042) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13039) 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:13058: \"$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 @@ -13065,7 +13062,7 @@ if { (eval echo configure:13061: \"$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:13076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13119,18 +13116,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:13123: checking for missing "${ac_func}" extern" >&5 +echo "configure:13120: 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 13129) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13126) 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:13145: \"$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 @@ -13152,7 +13149,7 @@ if { (eval echo configure:13148: \"$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:13163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13209,18 +13206,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:13213: checking for missing "${ac_func}" extern" >&5 +echo "configure:13210: 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 13219) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13216) 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:13235: \"$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 @@ -13242,7 +13239,7 @@ if { (eval echo configure:13238: \"$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:13253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13290,7 +13287,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:13294: checking for working TIOCGWINSZ" >&5 +echo "configure:13291: 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 @@ -13301,7 +13298,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:13327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_use_tiocgwinsz=yes else @@ -13374,17 +13371,17 @@ 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:13378: checking for $ac_hdr" >&5 +echo "configure:13375: 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:13388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13385: \"$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* @@ -13413,12 +13410,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13417: checking for $ac_func" >&5 +echo "configure:13414: 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:13442: \"$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 @@ -13466,7 +13463,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13470: checking for working mmap" >&5 +echo "configure:13467: 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 @@ -13474,7 +13471,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:13615: \"$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 @@ -13638,12 +13635,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:13642: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:13639: 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 < @@ -13692,17 +13689,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:13696: checking for $ac_hdr" >&5 +echo "configure:13693: 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:13706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13703: \"$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* @@ -13733,12 +13730,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:13737: checking for $ac_func" >&5 +echo "configure:13734: 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:13762: \"$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 @@ -13802,7 +13799,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:13806: checking for iconv" >&5 +echo "configure:13803: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13810,7 +13807,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -13820,7 +13817,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:13824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -13832,7 +13829,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -13842,7 +13839,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:13846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13843: \"$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 @@ -13863,13 +13860,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:13867: checking for iconv declaration" >&5 +echo "configure:13864: 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 < @@ -13888,7 +13885,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -13917,19 +13914,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:13921: checking for nl_langinfo and CODESET" >&5 +echo "configure:13918: 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:13933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -13952,19 +13949,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:13956: checking for LC_MESSAGES" >&5 +echo "configure:13953: 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:13968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13965: \"$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 @@ -13985,7 +13982,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:13989: checking whether NLS is requested" >&5 +echo "configure:13986: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -14009,7 +14006,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:14013: checking whether included gettext is requested" >&5 +echo "configure:14010: 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 @@ -14030,17 +14027,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:14034: checking for libintl.h" >&5 +echo "configure:14031: 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:14044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14041: \"$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* @@ -14057,12 +14054,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:14061: checking for GNU gettext in libc" >&5 +echo "configure:14058: 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; @@ -14071,7 +14068,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:14075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14072: \"$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 @@ -14087,14 +14084,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:14091: checking for GNU gettext in libintl" >&5 +echo "configure:14088: 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; @@ -14103,7 +14100,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:14107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14104: \"$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 @@ -14136,12 +14133,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14140: checking for $ac_func" >&5 +echo "configure:14137: 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:14165: \"$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 @@ -14194,7 +14191,7 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14198: checking for $ac_word" >&5 +echo "configure:14195: 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 @@ -14228,7 +14225,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:14232: checking for $ac_word" >&5 +echo "configure:14229: 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 @@ -14266,7 +14263,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14270: checking for $ac_word" >&5 +echo "configure:14267: 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 @@ -14317,7 +14314,7 @@ fi set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14321: checking for $ac_word" >&5 +echo "configure:14318: 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 @@ -14351,7 +14348,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:14355: checking for $ac_word" >&5 +echo "configure:14352: 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 @@ -14388,7 +14385,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14392: checking for $ac_word" >&5 +echo "configure:14389: 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 @@ -14460,7 +14457,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:14464: checking for $ac_word" >&5 +echo "configure:14461: 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 @@ -14493,7 +14490,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:14497: checking version of bison" >&5 +echo "configure:14494: 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;; @@ -14540,7 +14537,7 @@ echo "configure:14497: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:14544: checking for catalogs to be installed" >&5 +echo "configure:14541: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -14591,7 +14588,7 @@ use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6 -echo "configure:14595: checking if we should use included message-library" >&5 +echo "configure:14592: 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 @@ -14637,17 +14634,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14641: checking for $ac_hdr" >&5 +echo "configure:14638: 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:14651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14648: \"$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* @@ -14720,9 +14717,9 @@ LIBS="$LIBS $LIBICONV" for cf_hdr in iconv.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:14724: checking for $cf_hdr" >&5 +echo "configure:14721: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -14730,7 +14727,7 @@ echo "configure:14724: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14731: \"$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* @@ -14756,13 +14753,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:14760: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:14757: 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:14780: \"$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 @@ -14807,7 +14804,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:14811: checking for X" >&5 +echo "configure:14808: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -14870,12 +14867,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:14879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14876: \"$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* @@ -14944,14 +14941,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:14952: \"$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. @@ -15051,7 +15048,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:15055: checking for open in -lc_s" >&5 +echo "configure:15052: 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 @@ -15059,7 +15056,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:15071: \"$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 @@ -15087,7 +15084,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:15091: checking for gethostname in -lbsd" >&5 +echo "configure:15088: 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 @@ -15095,7 +15092,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:15107: \"$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 @@ -15123,7 +15120,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:15127: checking for gethostname in -lnsl_s" >&5 +echo "configure:15124: 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 @@ -15131,7 +15128,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:15143: \"$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 @@ -15159,7 +15156,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:15163: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:15160: 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 @@ -15167,7 +15164,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:15179: \"$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 @@ -15195,7 +15192,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:15199: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:15196: 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 @@ -15203,7 +15200,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:15215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15255,7 +15252,7 @@ fi ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:15259: checking for socket in -lsocket" >&5 +echo "configure:15256: 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 @@ -15263,7 +15260,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:15275: \"$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 @@ -15302,7 +15299,7 @@ else fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:15306: checking for gethostname in -lnsl" >&5 +echo "configure:15303: 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 @@ -15310,7 +15307,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:15322: \"$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 @@ -15372,17 +15369,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:15376: checking whether -R must be followed by a space" >&5 +echo "configure:15373: 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:15383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -15398,14 +15395,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:15406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -15437,7 +15434,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:15441: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:15438: 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 @@ -15445,7 +15442,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:15457: \"$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 @@ -15478,7 +15475,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:15482: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:15479: 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 @@ -15486,7 +15483,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:15498: \"$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 @@ -15526,12 +15523,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:15530: checking for gethostbyname" >&5 +echo "configure:15527: 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:15555: \"$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 @@ -15575,7 +15572,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:15579: checking for gethostbyname in -lnsl" >&5 +echo "configure:15576: 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 @@ -15583,7 +15580,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:15595: \"$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 @@ -15624,12 +15621,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:15628: checking for connect" >&5 +echo "configure:15625: 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:15653: \"$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 @@ -15673,7 +15670,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:15677: checking for connect in -lsocket" >&5 +echo "configure:15674: 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 @@ -15681,7 +15678,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:15693: \"$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 @@ -15716,12 +15713,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:15720: checking for remove" >&5 +echo "configure:15717: 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:15745: \"$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 @@ -15765,7 +15762,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:15769: checking for remove in -lposix" >&5 +echo "configure:15766: 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 @@ -15773,7 +15770,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:15785: \"$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 @@ -15808,12 +15805,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:15812: checking for shmat" >&5 +echo "configure:15809: 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:15837: \"$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 @@ -15857,7 +15854,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:15861: checking for shmat in -lipc" >&5 +echo "configure:15858: 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 @@ -15865,7 +15862,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:15877: \"$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 @@ -15909,7 +15906,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:15913: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:15910: 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 @@ -15917,7 +15914,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:15929: \"$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 @@ -15994,14 +15991,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:16005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -16019,7 +16016,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:16023: checking for XOpenDisplay in -lX11" >&5 +echo "configure:16020: 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 @@ -16027,7 +16024,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:16039: \"$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 @@ -16059,7 +16056,7 @@ else fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:16063: checking for XtAppInitialize in -lXt" >&5 +echo "configure:16060: 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 @@ -16067,7 +16064,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:16079: \"$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 @@ -16146,14 +16143,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:16157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -16206,7 +16203,7 @@ fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:16210: checking for XextCreateExtension in -lXext" >&5 +echo "configure:16207: 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 @@ -16214,7 +16211,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:16226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16264,13 +16261,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:16268: checking for $cf_test in $cf_path" >&5 +echo "configure:16265: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:16271: checking for $cf_test" >&5 +echo "configure:16268: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -16279,7 +16276,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -16326,23 +16323,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:16330: checking for $cf_lib in $cf_path" >&5 +echo "configure:16327: 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:16334: checking for $cf_test in $cf_lib" >&5 +echo "configure:16331: 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:16343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -16421,14 +16418,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:16432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -16446,7 +16443,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:16450: checking for XOpenDisplay in -lX11" >&5 +echo "configure:16447: 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 @@ -16454,7 +16451,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:16466: \"$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 @@ -16486,14 +16483,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:16490: checking for XCurses library" >&5 +echo "configure:16487: 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 < @@ -16503,7 +16500,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:16507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else diff -Nurp tin-1.7.0/configure.in tin-1.7.1/configure.in --- tin-1.7.0/configure.in Sun Aug 10 16:31:02 2003 +++ tin-1.7.1/configure.in Thu Sep 18 18:37:45 2003 @@ -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 : 2003-06-18 +dnl Updated : 2003-09-13 dnl Notes : dnl dnl Copyright (c) 1995-2003 Thomas E. Dickey @@ -16,10 +16,7 @@ dnl notice, this list of conditions a dnl 2. Redistributions in binary form must reproduce the above copyright dnl notice, this list of conditions and the following disclaimer in the dnl documentation and/or other materials provided with the distribution. -dnl 3. All advertising materials mentioning features or use of this software -dnl must display the following acknowledgement: -dnl This product includes software developed by Thomas E. Dickey. -dnl 4. The name of the author may not be used to endorse or promote +dnl 3. The name of the author may not be used to endorse or promote dnl products derived from this software without specific prior written dnl permission. dnl @@ -44,7 +41,7 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=1.7.0 +VERSION=1.7.1 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -892,9 +889,7 @@ AC_CHECK_FUNCS(\ strrstr \ strstr \ strtol \ - tempnam \ tmpfile \ - tmpnam \ tzset \ uname \ unlink \ @@ -1072,7 +1067,6 @@ CF_CHECK_DECL(\ strncasecmp \ strtol \ system \ - tempnam \ time \ tolower \ toupper \ diff -Nurp tin-1.7.0/doc/CHANGES tin-1.7.1/doc/CHANGES --- tin-1.7.0/doc/CHANGES Sun Aug 10 16:34:12 2003 +++ tin-1.7.1/doc/CHANGES Thu Sep 18 18:30:41 2003 @@ -1,3 +1,68 @@ +-- 1.7.1 release 20030918 "Berneray" -- + +U005) Michael Bienia + REM. DEBUG_NEWSRC_FIXME + ADD. cleanup newsrc_test_harness() + ADD. trunc(), wtrunc() and my_wcsdup() + FIX. configure[.in], autoconf.h[in], extern.h, proto.h, tin.h, main.c + newsrc.c, page.c, prompt.c, screen.c, string.c + + 013) Joshua Crawford + BUG. thinko in read_server_config() + FIX. config.c + + 012) Urs Janssen + BUG. overview data wasn't unfolded before storing it + BUG. mem-leak in free_and_init_header() + BUG. "domainname missing" warning was displayed too short + BUG. allowed spaces in username/password portion of URLs + FIX. tin.h art.c, init.c, lang.c, rfc2046.c + +U004) Dirk Nimmich + BUG. art.c didn't compile with DEBUG on + + 011) Dirk Nimmich + BUG. 'V' didn't work with one multimedia part only + BUG. possible buffer overrun in escape_shell_meta() + BUG. mailcap command expansion didn't take shell meta characters into + account + BUG. mailcap nametemplate expansion took place twice + BUG. MIME Content-Type parameters parsed incorrectly + BUG. didn't refresh screen after viewing files and URLs + BUG. mem-leak in _lookup_mimetype + BUG. mem-leak in new_uu() + FIX. proto.h, tin.h, cook.c, mimetypes.c, misc.c, page.c, rfc1524.c + rfc2046.c, save.c + + 010) Michael Bienia + BUG. source and destination overlap in strncpy + FIX. config.c + +U003) Urs Janssen + ADD. don't rely on the output of LIST EXTENSIONS + ADD. replaced some sprintf() by snprintf() calls + ADD. config.guess, config.sub update + ADD. pcre update (4.3 -> 4.4) + FIX. active.c, art.c, config.c, header.c, open.c, page.c, post.c + version.c, config.guess, config.sub, pcre/* + + 009) Dirk Nimmich + BUG. doesn't try to reconnect after a 205 response + FIX. open.c + +U002) Jason Faultless + ADD. LIST EXTENSIONS + ADD. rewrite overview-parser + FIX. extern.h, nntplib.h, proto.h, tin.h, art.c, open.c, string.c + xref.c + +U001) Dirk Nimmich + BUG. don't feed headers to interactive mailreader and using -M/-N + ADD. allow interactive mailer to get headers + ADD. tinrc variable to control URL highlighting + FIX. extern.h, tin.h, tinrc.h, config.c, feed.c, init.c, lang.c, misc.c + page.c, post.c, save.c, tincfg.tbl, tin.1, tin.5 + -- 1.7.0 release 20030810 "Sandray" -- 008) Darrell Tangman @@ -18,7 +83,7 @@ 005) Dirk Nimmich BUG. make install_sysdefs didn't honor $DESTDIR BUG. filter on References didn't work on deep threads - BUG. upgrading from use_metamail=ON could lead to + BUG. upgrading from use_metamail=ON could lead to metamail_prog=--internal BUG. lines that were exactly cCOLS bytes long introduced an extra line in raw mode diff -Nurp tin-1.7.0/doc/INSTALL tin-1.7.1/doc/INSTALL --- tin-1.7.0/doc/INSTALL Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/doc/INSTALL Sat Sep 13 21:18:47 2003 @@ -66,9 +66,9 @@ TIN related: DEBUG MATCH_TAR_PATTERN DEBUG_NEWSRC NEW_HASH_METHOD - DEBUG_NEWSRC_FIXME OPTIMIZE_JUST_STAR - DEBUG_REFS (see doc/DEBUG_REFS) REREAD_ACTIVE_FILE_SECS - JUST_TESTING + DEBUG_REFS (see doc/DEBUG_REFS) OPTIMIZE_JUST_STAR + JUST_TESTING REREAD_ACTIVE_FILE_SECS + USE_UTF8_HORIZONTAL_ELLIPSIS System related: --datadir --localstatedir diff -Nurp tin-1.7.0/doc/TODO tin-1.7.1/doc/TODO --- tin-1.7.0/doc/TODO Sun Aug 10 15:31:41 2003 +++ tin-1.7.1/doc/TODO Wed Sep 17 16:07:11 2003 @@ -16,19 +16,9 @@ o Changes to int/bool tinrc variables i flashing changes to all affected groups and remove the reread of the attributes file from select.c -o single quotes in attachment names aren't escaped - (see ) - o 'C'atchup in pager is still not correct (we don't ever enter the next group) [20030515 Urs Janssen ] -o reconnect problem reported in debian bug #188052 - - [probabely fixed] - -o reconnect problem reported in debian bug #143417 - - o 'article loss' reported in @@ -65,7 +55,7 @@ o '-s' cmd-line switch implicitly chang o add version number to other config-files (e.g. tin.defaults, keymap) and do the same checks as for TINRC_VERSION/tinrc. for the filter (and attributes) file also store the editor offset (different - languages do use different headres) and the filter method used + languages do use different headers) and the filter method used (wildmat or regexp) and the charset the file is written in (e.g. ISO-8859-x vs. unicode) [Urs Janssen ] @@ -88,7 +78,7 @@ o overview file cacheing code is over-c the processed (decoded etc.) data, no matter if it's broken (e.g. contains raw 8 bit data) as we have to deal with that anyway. if there are no original overviews, cache the original data from the postings - headers. + headers (after unfolding and tab removal). - Add docs to explain how to create system-wide overviews o tin uses the first sig-isolator as recent one, USEFOR says it should @@ -98,11 +88,6 @@ o tin uses the first sig-isolator as re o iso2asc conversion is missing for 'internal' strings (e.g. 'M'enu) [20020319 Urs Janssen ] -o fix the outstandig mem-leaks, see - and - - for details [20030504 Urs Janssen ] - Pager Problems -------------- o raw mode loses (illegal) chars in multibyte based groups @@ -153,9 +138,6 @@ o allow bold, underline, italic, ... as (see also <20020416202232.A4575@bloatware.reston01.va.comcast.net>) [20030218 Serge Matveev ] -o add switch to disable URL-highlighting without disabling inverse-video - [20030805 Urs Janssen ] - 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) @@ -218,13 +200,6 @@ o add counter to post-processing comman o add key to toggle article and thread sorting preferences on the fly (like 'u' for threading) -o default_mailer_format should be extended to be able to - give the interactive mailer the full article including all - headers (useful for mutt -H). we could differ between - %f (just body, headers must be given with %S, %T, ...) - and %F (headers included in the body, useful for sendmail -t < - "%F" etc.pp.) - o rewrite keymap stuff: Define what key should trigger what action and use function names instead of the old key defines. This allows to add more functionality more easily @@ -245,7 +220,8 @@ o check if the articles Subject/From in if they are higher than the server's high-mark don't trust them (and discard the locally cached data). -o check if server supports HEADERS, if so use +o check if server supports HEADERS (if that ever makes into nntp-ext - don't + confuse it with LIST HEADERS), if so use "HEADERS - Subject From Date Message-ID References Lines Newsgroups Xref" instead of OVER or XOVER @@ -280,13 +256,6 @@ o add cmd-line/tinrc-switch to fetch on [-G is a start] allow setting a per group limit via attributes -o Add a trunc() function or something similar for shortening long strings - like a group name to a fixed length ending in ... (like center_line does) - for embedding into status messages. - Maybe somehow merge with sized_message(), then you can use - message(txt, trunc(group, 20)) etc. - we now could use s{w,n}printf() to do that. - o check if server supports 'LIST MOTD' (e.g. INN >= 2.0) and display it on startup. check if server supports 'LIST MODERATORS' and/or 'LIST DISTRIB.PATS' and if it does parse the output so it can be shown @@ -297,7 +266,7 @@ o check if server supports 'LIST MOTD' o if using "-n" commandline switch you can't subscribe to newsgroups not present in your newsrc - a simple check against the server (e.g. GROUP $newsgroup or if !NNTP try to stat the dir) would help. - ig we are running in NNTP mode and if the server understands + if we are running in NNTP mode and if the server understands LIST NEWSGROUPS pattern (don't use XGTITLE, it will become obsolete) we could also fetch the description without loosing "-n" speed improvements; if the server understands LIST ACTIVE pattern we could also get the group @@ -314,7 +283,7 @@ o Rather than Cc/Bcc, I'd like to see t the various Unix mailer programs (see mbox(5), mmdf(5)). [append_mail() should do the trick] -o MIME-pgp support according to RFC2015, RFC3156 - (should be easy now) +o MIME-pgp support according to RFC 2015, RFC 3156 - (should be easy now) and/or in the format that used by signcontrol/pgpverify (see also tinews.pl) @@ -338,7 +307,7 @@ o Additions to the thread menu: ';' (mark unread arts as hot if >= 1 art in thread is hot) '+' (mark thread as hot) '=' (mark pattern as hot) - 'Y' (check for new articles in thead) + 'Y' (check for new articles in thread) '%' (toggle rot13 encoding of screen content) 'o' (print) 'x' (repost) @@ -648,6 +617,10 @@ o make mm_network_charset an "option_li check wether KOI8-RU is still used/valid) [done except configure check 20010907 urs@tin.org] +o add IDNA support (RFC 3490ff.) + ( might be usefull) + [20030917 Urs Janssen ] + Docs/online help ---------------- o add installation guide (in html) @@ -715,8 +688,6 @@ o tin in batchmode dumps core if gettin o what is with conflicting tinrc settings? should we disallow those, or leave it to the user to realise that e.g. strip_blanks=ON && inverse_okay=ON looks ugly? - -o what is with DEBUG_NEWSRC_FIXME (not DEBUG_NEWSRC) in newsrc.c? o shows up cross-postings multiple times even if read once before getting a resync/reread active/newsrc-file diff -Nurp tin-1.7.0/doc/WHATSNEW tin-1.7.1/doc/WHATSNEW --- tin-1.7.0/doc/WHATSNEW Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/doc/WHATSNEW Sat Aug 23 01:58:40 2003 @@ -1,104 +1,10 @@ -New features and changes in tin-1.6 - -New Features ------------- - -. Rebindable keys - -. New pager - Parses and displays MIME articles - Single line scrolling with Up/Down - URL's are highlighted - URL's can be launched with 'U' - Binary attachments can be viewed and saved with 'V' - UUEncoded sections can optionally be displayed as attachments - See hide_uue on the manpage/tinrc file - ^H now switches to view of original 'raw' article - -. Searched for strings are highlighted - 'B'ody search goes direct to match in article - -. GPG support - PGP/GPG support honours 'from' attribute - -. NLS support - -. Charset conversion using iconv(3) for sending and displaying articles in - a different charset than the terminal tin runs on. The charsets are - customizable with tinrc-option and group-attribute mm_network_charset - (outgoing) and group-attribute undeclared_charset. - --disable-mime-strict-charset is a noop with working charset conversion. - The charset of the terminal is detected automatically if possible (using - nl_langinfo(3)). - -. Human readable time-stamp (as a comment) in filter file - -. Indicator for articles newer than n-days - See manpage for new tinrc variables: recent_time and art_marked_recent - -. art_mark_read, art_mark_killed, art_mark_selected are now configurable - in the usual ways. See the manpage for details. - -. Piping '|' now works on the thread menu - -. batch_save (tinrc and attribute) can now be used to control which groups - are affected by tin -S, -N, -M. See the manpage. - -. configurable scrolling via scroll_lines - -. configurable URL handler via url_handler - -. '.' sorts the newsgroup list - -- tin(5) manpage which describes the format of the various (config) files - used +New features and changes in tin-1.7 Changes ------- - -. 'K' on the thread menu will now skip threads - similar to 'K' on the group menu - -. tin will no longer re-connect to the news server in order to just disconnect - -. Lots of bug fixes - -. xref filter rules are now matched against a the reformatted xref line - (same format as Newsgroups:, everything except the newsgoup names is - stripped, the remaining groups are comma seperated) instead of matching - against each group except listed (except the current one) iduvidually - -Retired Features ----------------- - -. INDEX_DAEMON is no longer supported - -. -U indexing is no longer supported - -. ~/.tin/headers file is no longer directly supported. Use: - scope=* - x_headers=~/.tin/headers - or an equivalent instead - -. ~/.tin/bug_address is no longer supported. Set a site-wide address either - at compile time or set in the tin.defaults file. - -. 'k' no longer works in the pager. Use 'N' instead - -. display_mime_header_asis, display_mime_allheader_asis - By default the pager decodes headers. Use ^H to toggle to undecoded view - -. full_page_scroll and show_last_line_prev_page have been superceded by - scroll_lines - -. word_h_display_marks=3 as there is no word highligthing in signatures - anymore - -. tab_after_X_selection as it was broken for several years and nobody - complained about it - -. --with-local-charset as the ports (NeXT, MSDOS) where it was needed - weren't maintained for several years now. - -. filter rules xref_num and xref_score have been removed, the new format - of the xref rule should give you nearly the same functionailty +. interactive mailer can now be feed with headers. The old use_mailreader_i + config variable is obsolete and superseded by the new interactive_mailer + variable that can have three values: + 0 no interactive mailreader (old use_mailreader_i=OFF) + 1 interactive mailreader with headers + 2 interactive mailreader without headers (old use_mailreader_i=ON) diff -Nurp tin-1.7.0/doc/tin.1 tin-1.7.1/doc/tin.1 --- tin-1.7.0/doc/tin.1 Sun Aug 10 16:21:20 2003 +++ tin-1.7.1/doc/tin.1 Thu Sep 18 18:37:14 2003 @@ -3,13 +3,13 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2003-08-10 +.\" Updated : 2003-09-18 .\" Notes : use american english; still needs some work, i.e.: .\" - document authorization (.newsauth) .\" - document random organization feature .\" .\" -.TH tin 1 "August 10th, 2003" "1.7.0" "A Usenet newsreader" +.TH tin 1 "September 18th, 2003" "1.7.1" "A Usenet newsreader" .\" .\" .SH NAME @@ -1660,6 +1660,13 @@ If ON, show current group description or toggles setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP +.B Use interactive mail reader (interactive_mailer) +Interactive mailreader: if greater than 0 your mailreader will be invoked +earlier for reply so you can use more of its features (e.g. MIME, +pgp, ...). 1 means include headers, 2 means don't include headers +(old use_mailreader_i=ON option). 0 turns off usage. This option has to +suit \fBdefault_mailer_format\fP. Default is 0. +.TP .\" TODO: fix menu description .\" mono_mark* currently do allow "Reverse video" even if .\" inverse_okay=FALSE @@ -2163,17 +2170,15 @@ The program that will be run when launch using \fBPageViewUrl\fP ('\fBU\fP'). The actual URL will be appended to this. Default is \fBurl_handler.sh %s\fP. .TP +.B URL highlighting in message body (url_highlight) +Enable highlighting URLs in message body. Default is ON. +.TP .B Use ANSI color (use_color) If enabled \fBtin\fP uses ANSI-colors. Default is OFF. .TP .B Use scroll keys on keypad (use_keypad) Default is OFF. .TP -.B Use interactive mail reader (use_mailreader_i) -Interactive mailreader: if ON mailreader will be invoked earlier for reply -so you can use more of its features (e.g. MIME, pgp, ...) this option has to -suit \fBdefault_mailer_format\fP. Default is OFF. -.TP .B Use mouse in xterm (use_mouse) Allows the mouse key support in a .BR xterm (1x) @@ -2377,7 +2382,7 @@ would expand to: .nf .ft CW On 21 Jul 1992 09:45:51 -0400 in alt.sources you wrote: -In , Iain Lea wrote: +In , Joe Bar wrote: .ft R .fi .RE @@ -2518,8 +2523,8 @@ The following is an example of a \fI.Sig .RS .nf .ft CW -NAMES Iain Lea iain@ecrc.de -SNAIL Bruecken Str 12, 90419 Nuernberg 90, Germany +NAMES Joe Bar +SNAIL Musterweg 12, 99999 Notreal, Germany .ft P .fi .RE @@ -3205,63 +3210,63 @@ Brolik, Herman ten Brugge, Martin Buck, Burrell-Davis, Sean Casey, Peter Castro, Troy Cauble, Andrey A. Chernov, Albert Chin-A-Young, Park Chong-Dae, Tan Kwee Chuan, Boleslaw Ciesielski, Robert Claeson, Steven Cogswell, Don Costello, -Bryan Curnutt, Ned Danieley, Lars Dannenberg, Chris Davies, John -Davis, Borislav Deianov, Thomas E. Dickey, Martin Dickopp, Olaf -Dietrich, Herbert Martin Dietze, Theo Van Dinter, Ralf Doeblitz, -Bryan Dongray, Michael Douglass, Nickolay Dudorov, Craig Durland, -Bernd Eckenfels, Phil Edge, Kirk Edson, Nick Efthymiou, Stefan Elf, -Nigel Ellis, L. Scott Emmons, Rob Engle, Olle Eriksson, Brent -Ermlick, Bernd Ernesti, Ragnar Hojland Espinosa, Jason Faultless, -Michael Faurot, Werner Fleck, John M. Flinchbaugh, Andy Gabor, -Christian Garbs, Torsten Gesang, Ruediger Geys, Callum Gibson, Mike -Glendinning, Igor Goryachev, Philippe Goujard, Dan Greenspan, Karlo -Gross, Carl Hage, Piers Haken, Paul Halsema, Ed Hanway, Scott Hauck, -Christian Haul, James Hawtin, Per Headland, Arnold Hendriks, Daniel -Hermans, Jose Herrero, Dave Hill, Tom Hite, Torsten Homeyer, Ulli -Horlacher, Keith Howell, Tommy Hsieh, Shih-Kun Huang, Steve Hunt, -Jeff Hurwitt, Jeon Hyoung-Jo, Pieter Immelman, Jarkko Isokungas, -Patrick St. Jean, Hal Jespersen, Park Sang Jin, Robbin Johnson, -Jarkko Jormanainen, Yury July, Nelson Kading, Geoffrey Keating, -Karsten Keil, Charles S. Kerr, Fritz Kleeman, Andreas Kies, Janne -Kiviluoto, Tomasz Kloczko, Dwarven Knight, Thomas Koenig, Karl-Koenig -Koenigsson, Martin Kraemer, Gerald Krause, Thomas Kroener, Florian -Kuehnert, Bernd Kuemmerlen, Kris Kugel, Stephan Kulow, Manoj Kumar, -Dawid Kuroczko, Yuri Kuzmenko, Olivier Lacroix, Geoff Lane, Alex -Lange, Alain Lasserre, Stanislav Latishko, Hannu Laurila, Yen-Ming -Lee, Vincent Lefevre, Alexander Lehmann, Marty Leisner, Thomas -Leitner, Hakan Lennestal, Kevin Lentin, Chua Choon Leong, Chris -Lewis, Andreas Ley, David-Michael Lincke, Otto Lind, Richard Lloyd, -Florian Lohoff, Reinhard Luebke, Clifford Luke, Michael Lupp, David -MacKenzie, Hugh Mahon, Giuseppe De Marco, Scott Marovich, Dmitri A. -Martynoff, Kazushi Marukawa, Timur Maryin, William McBrine, Owen -Medd, Philipp Mergenthaler, Andreas Metzler, Arkadiusz Miskiewicz, -Soren Moller, Bruce Momjian, Sergio Morales, Michael Morrell, Klaus -Mueller, Mike Muise, Udo Munk, John R. Myers, Daniel Naber, Torsten -Neumann, Dirk Nimmich, James Nugen, David E. O'Brien, Michael -O'Reilly, Oleg Ohotnikov, Ronald Orr, Julien Oster, Guido Ostkamp, -Philip Paeps, Jeb Palmer, Neil Parker, Joseph Parmelee, Tom Parry, -Jim Patterson, Sven Paulus, Walter Pelissero, Cameron Perkins, Colin -Perkins, Eric Peterson, Tim Pierce, Bill Poitras, Scott W. Powers, -Wolfgang Prediger, Marc Prud'hommeaux, GianPiero Puccioni, Thomas -Quinot, Stefan Rapp, Martin Reising, Kyle Rhorer, Ted Richards, Steve -Robbins, Ollivier Robert, Branden Robinson, Jim Robinson, Thomas -Roessler, Erik van Roode, Meelis Roos, Stephen Roseman, Roland -Rosenfeld, Peter Van Rossem, Clifton Royston, Juergen Salk, Rich -Salz, Gary Sanders, Nickolay Saukh, John Sauter, Christopher Sawtell, -Holger Schif, Volker Schmidt, John Schmitz, Torsten Schneider, Stefan -Scholl, Rainer Scholz, Juergen Schroeder, Larry Schwimmer, Randy -Scott, Bart Sears, Karl-Olav Serrander, Doug Sewell, Philip Shearer, -Jungshik Shin, Sergey Shkonda, Andreas Siegert, Mark Smith, Toomas -Soome, Steve Spearman, Helmut Springer, Cliff Stanford, Steve Starck, -Jason Steiner, Ralf Stephan, Michael Stenns, Helmrich Streitmatter, -Hans Werner Strube, Dieter Stueken, Ed Sznyter, Lech Szychowski, Dean -Takemori, Darrell Tangman, Derek Terveer, Carsten Theis, Julian -Thompson, David Tiller, Andry Timonin, Mark Tomlin, Michael Traub, -Mark Trumbull, Alex Vasylenko, Michael Velten, Adri Verhoef, Paul -Vickers, Corinna Vinschen, Oliver B. Warzecha, Jason Wessel, Cary -Whitney, Henrik Wist, Greg Woods, Andreas Wrede, Lloyd Wright, Jens -Wuepper, Billy Y., Hideaki Yoshfuji, Nickolai Zeldovich, Zbigniew -Zych +Joshua Crawford, Bryan Curnutt, Ned Danieley, Lars Dannenberg, Chris +Davies, John Davis, Borislav Deianov, Thomas E. Dickey, Martin +Dickopp, Olaf Dietrich, Herbert Martin Dietze, Theo Van Dinter, Ralf +Doeblitz, Bryan Dongray, Michael Douglass, Nickolay Dudorov, Craig +Durland, Bernd Eckenfels, Phil Edge, Kirk Edson, Nick Efthymiou, +Stefan Elf, Nigel Ellis, L. Scott Emmons, Rob Engle, Olle Eriksson, +Brent Ermlick, Bernd Ernesti, Ragnar Hojland Espinosa, Jason +Faultless, Michael Faurot, Werner Fleck, John M. Flinchbaugh, Andy +Gabor, Christian Garbs, Torsten Gesang, Ruediger Geys, Callum Gibson, +Mike Glendinning, Igor Goryachev, Philippe Goujard, Dan Greenspan, +Karlo Gross, Carl Hage, Piers Haken, Paul Halsema, Ed Hanway, Scott +Hauck, Christian Haul, James Hawtin, Per Headland, Arnold Hendriks, +Daniel Hermans, Jose Herrero, Dave Hill, Tom Hite, Torsten Homeyer, +Ulli Horlacher, Keith Howell, Tommy Hsieh, Shih-Kun Huang, Steve +Hunt, Jeff Hurwitt, Jeon Hyoung-Jo, Pieter Immelman, Jarkko +Isokungas, Patrick St. Jean, Hal Jespersen, Park Sang Jin, Robbin +Johnson, Jarkko Jormanainen, Yury July, Nelson Kading, Geoffrey +Keating, Karsten Keil, Charles S. Kerr, Fritz Kleeman, Andreas Kies, +Janne Kiviluoto, Tomasz Kloczko, Dwarven Knight, Thomas Koenig, +Karl-Koenig Koenigsson, Martin Kraemer, Gerald Krause, Thomas +Kroener, Florian Kuehnert, Bernd Kuemmerlen, Kris Kugel, Stephan +Kulow, Manoj Kumar, Dawid Kuroczko, Yuri Kuzmenko, Olivier Lacroix, +Geoff Lane, Alex Lange, Alain Lasserre, Stanislav Latishko, Hannu +Laurila, Yen-Ming Lee, Vincent Lefevre, Alexander Lehmann, Marty +Leisner, Thomas Leitner, Hakan Lennestal, Kevin Lentin, Chua Choon +Leong, Chris Lewis, Andreas Ley, David-Michael Lincke, Otto Lind, +Richard Lloyd, Florian Lohoff, Reinhard Luebke, Clifford Luke, +Michael Lupp, David MacKenzie, Hugh Mahon, Giuseppe De Marco, Scott +Marovich, Dmitri A. Martynoff, Kazushi Marukawa, Timur Maryin, +William McBrine, Owen Medd, Philipp Mergenthaler, Andreas Metzler, +Arkadiusz Miskiewicz, Soren Moller, Bruce Momjian, Sergio Morales, +Michael Morrell, Klaus Mueller, Mike Muise, Udo Munk, John R. Myers, +Daniel Naber, Torsten Neumann, Dirk Nimmich, James Nugen, David E. +O'Brien, Michael O'Reilly, Oleg Ohotnikov, Ronald Orr, Julien Oster, +Guido Ostkamp, Philip Paeps, Jeb Palmer, Neil Parker, Joseph +Parmelee, Tom Parry, Jim Patterson, Sven Paulus, Walter Pelissero, +Cameron Perkins, Colin Perkins, Eric Peterson, Tim Pierce, Bill +Poitras, Scott W. Powers, Wolfgang Prediger, Marc Prud'hommeaux, +GianPiero Puccioni, Thomas Quinot, Stefan Rapp, Martin Reising, Kyle +Rhorer, Ted Richards, Steve Robbins, Ollivier Robert, Branden +Robinson, Jim Robinson, Thomas Roessler, Erik van Roode, Meelis Roos, +Stephen Roseman, Roland Rosenfeld, Peter Van Rossem, Clifton Royston, +Juergen Salk, Rich Salz, Gary Sanders, Nickolay Saukh, John Sauter, +Christopher Sawtell, Holger Schif, Volker Schmidt, John Schmitz, +Torsten Schneider, Stefan Scholl, Rainer Scholz, Juergen Schroeder, +Larry Schwimmer, Randy Scott, Bart Sears, Karl-Olav Serrander, Doug +Sewell, Philip Shearer, Jungshik Shin, Sergey Shkonda, Andreas +Siegert, Mark Smith, Toomas Soome, Steve Spearman, Helmut Springer, +Cliff Stanford, Steve Starck, Jason Steiner, Ralf Stephan, Michael +Stenns, Helmrich Streitmatter, Hans Werner Strube, Dieter Stueken, Ed +Sznyter, Lech Szychowski, Dean Takemori, Darrell Tangman, Derek +Terveer, Carsten Theis, Julian Thompson, David Tiller, Andry Timonin, +Mark Tomlin, Michael Traub, Mark Trumbull, Alex Vasylenko, Michael +Velten, Adri Verhoef, Paul Vickers, Corinna Vinschen, Oliver B. +Warzecha, Jason Wessel, Cary Whitney, Henrik Wist, Greg Woods, +Andreas Wrede, Lloyd Wright, Jens Wuepper, Billy Y., Hideaki +Yoshfuji, Nickolai Zeldovich, Zbigniew Zych .\" .\" .SH AUTHOR diff -Nurp tin-1.7.0/doc/tin.5 tin-1.7.1/doc/tin.5 --- tin-1.7.0/doc/tin.5 Sun Aug 10 16:21:30 2003 +++ tin-1.7.1/doc/tin.5 Thu Sep 18 18:37:37 2003 @@ -2,10 +2,10 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2003-08-10 +.\" Updated : 2003-09-18 .\" Notes : needs a some work .\" -.TH tin 5 "August 10th, 2003" "1.7.0" "A Usenet newsreader" +.TH tin 5 "September 18th, 2003" "1.7.1" "A Usenet newsreader" .SH NAME tin, rtin \- related files @@ -1411,6 +1411,12 @@ If ON, show current group description or toggles setting). This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP +.B interactive_mailer +If greater than 0 your mailreader will be invoked earlier for reply so you can +use more of its features (e.g. MIME, pgp, ...). 1 means include headers, 2 +means don't include headers (old use_mailreader_i=ON option). 0 turns off +usage. This option has to suit \fBdefault_mailer_format\fP. Default is 0. +.TP .B inverse_okay If ON use inverse video for page headers and URL highlighting. Default is ON. @@ -1926,6 +1932,9 @@ The program that will be run when launch using \fBPageViewUrl\fP ('\fBU\fP'). The actual URL will be appended to this. Default is \fBurl_handler.sh %s\fP. .TP +.B url_highlight +Enable highlighting URLs in message body. Default is ON. +.TP .B use_color If enabled .BR tin (1) @@ -1933,11 +1942,6 @@ uses ANSI-colors. Default is OFF. .TP .B use_keypad Use scroll keys on keypad. Default is OFF. -.TP -.B use_mailreader_i -Interactive mailreader: if ON mailreader will be invoked earlier for reply -so you can use more of its features (e.g. MIME, pgp, ...) this option has to -suit \fBdefault_mailer_format\fP. .TP .B use_mouse Allows the mouse key support in a diff -Nurp tin-1.7.0/include/autoconf.hin tin-1.7.1/include/autoconf.hin --- tin-1.7.0/include/autoconf.hin Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/include/autoconf.hin Sat Sep 6 17:37:27 2003 @@ -285,11 +285,9 @@ # undef HAVE_STRTOL # undef HAVE_TCGETATTR # undef HAVE_TCSETATTR -# undef HAVE_TEMPNAM # undef HAVE_TIGETINT # undef HAVE_TIGETNUM # undef HAVE_TMPFILE -# undef HAVE_TMPNAM # undef HAVE_TZSET # undef HAVE_UNAME # undef HAVE_UNLINK @@ -373,7 +371,6 @@ # undef DECL_STRNCASECMP # undef DECL_STRTOL # undef DECL_SYSTEM -# undef DECL_TEMPNAM # undef DECL_TGETENT # undef DECL_TGETFLAG # undef DECL_TGETNUM diff -Nurp tin-1.7.0/include/extern.h tin-1.7.1/include/extern.h --- tin-1.7.0/include/extern.h Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/include/extern.h Sat Sep 6 12:05:34 2003 @@ -3,7 +3,7 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-08-10 + * Updated : 2003-08-12 * Notes : * * Copyright (c) 1997-2003 Iain Lea @@ -235,9 +235,6 @@ #ifdef DECL_SYSTEM extern int system(const char *); #endif /* DECL_SYSTEM */ -#ifdef DECL_TEMPNAM - extern char *tempnam(const char *, const char *); -#endif /* DECL_TEMPNAM */ #ifdef DECL_TGETENT extern int tgetent(char *, char *); #endif /* DECL_TGETENT */ @@ -330,7 +327,6 @@ extern char *OPT_CHAR_list[]; extern char *OPT_STRING_list[]; extern char *ch_post_process; extern char *nntp_server; -extern char *xover_cmd; extern char active_times_file[PATH_LEN]; extern char bug_addr[LEN]; extern char bug_nntpserver1[PATH_LEN]; @@ -395,6 +391,7 @@ extern constext *txt_attrs[]; extern constext *txt_colors[]; extern constext *txt_confirm_choices[]; extern constext *txt_hide_uue_type[]; +extern constext *txt_interactive_mailers[]; extern constext *txt_kill_level_type[]; #ifdef CHARSET_CONVERSION extern constext *txt_mime_charsets[]; /* supported charsets */ @@ -1161,6 +1158,8 @@ extern constext txt_show_unread[]; extern constext txt_yes[]; extern constext txt_you_have_mail[]; +extern constext *xover_cmd; + #ifndef DISABLE_PRINTING extern constext txt_print[]; extern constext txt_printing[]; @@ -1488,6 +1487,7 @@ extern struct opttxt txt_group_catchup_o extern struct opttxt txt_groupname_max_length; extern struct opttxt txt_hide_uue; extern struct opttxt txt_inews_prog; +extern struct opttxt txt_interactive_mailer; extern struct opttxt txt_inverse_okay; extern struct opttxt txt_keep_dead_articles; extern struct opttxt txt_kill_level; @@ -1562,7 +1562,7 @@ extern struct opttxt txt_thread_score; extern struct opttxt txt_underscores_regex; extern struct opttxt txt_unlink_article; extern struct opttxt txt_url_handler; -extern struct opttxt txt_use_mailreader_i; +extern struct opttxt txt_url_highlight; extern struct opttxt txt_use_mouse; extern struct opttxt txt_wildcard; extern struct opttxt txt_word_highlight; diff -Nurp tin-1.7.0/include/nntplib.h tin-1.7.1/include/nntplib.h --- tin-1.7.0/include/nntplib.h Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/include/nntplib.h Sat Aug 23 01:58:40 2003 @@ -97,6 +97,7 @@ #define OK_CANPOST 200 /* Hello; you can post */ #define OK_NOPOST 201 /* Hello; you can't post */ +#define OK_EXTENSIONS 202 /* extensions supported follow */ #define OK_NOIHAVE 202 /* Hello; you can't IHAVE; discussed on the IETF-mailinglist */ #define OK_SLAVE 202 /* Slave status noted */ #define OK_NOPOSTIHAVE 203 /* Hello; you can't POST or IHAVE; iscussed on the IETF-mailinglist */ diff -Nurp tin-1.7.0/include/policy.h tin-1.7.1/include/policy.h --- tin-1.7.0/include/policy.h Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/include/policy.h Thu Sep 18 00:51:56 2003 @@ -3,7 +3,7 @@ * Module : policy.h * Author : Ralf Doeblitz * Created : 1999-01-12 - * Updated : 2003-03-11 + * Updated : 2003-09-08 * Notes : #defines and static data for policy configuration * * Copyright (c) 1999-2003 Ralf Doeblitz @@ -201,20 +201,28 @@ * .zw Zimbabwe * * - * invalid TLDs: - * .cs former Czechoslovakia, now: .cz and .sk - * .zr former Zaire, now: .cd + * invalid/obsolete TLDs: + * .bu Burma, now .mm + * .cs former Czechoslovakia, now .cz and .sk + * .dd former German Democratic Republic, now .de * .fx France, Metropolitan + * .yd Democratic Yemen, now .ye + * .zr former Zaire, now .cd + * + * user-assigned code elements: + * .aa, .qm, .qz, .xa, .xz, .zz * * unused TLDs: * .nt Neutral Zone * * requested new TLDs: + * .cs Serbia and Montenegro * .eu European Union * * 'expireing' TLDs: - *(.hk Hong Kong, now: .cn) - * .su former USSR, now: .ru + * .gb United Kingdom, use .uk + *(.hk Hong Kong, now .cn) + * .su former USSR, now .ru */ static char gnksa_country_codes[26*26] = { diff -Nurp tin-1.7.0/include/proto.h tin-1.7.1/include/proto.h --- tin-1.7.0/include/proto.h Sun Aug 10 15:31:50 2003 +++ tin-1.7.1/include/proto.h Sat Sep 13 20:44:40 2003 @@ -3,7 +3,7 @@ * Module : proto.h * Author : Urs Janssen * Created : - * Updated : 2003-08-10 + * Updated : 2003-09-12 * Notes : * * Copyright (c) 1997-2003 Urs Janssen @@ -162,7 +162,7 @@ extern void word_highlight_string(int ro extern void debug_print_arts(void); extern void debug_print_filters(void); extern void debug_print_header(struct t_article *s); - extern void vDbgPrintMalloc(int iIsMalloc, const char *pcFile, int iLine, size_t iSize); + extern void debug_print_malloc(int is_malloc, const char *xfile, int line, size_t size); #endif /* DEBUG */ #ifdef DEBUG_NEWSRC extern void debug_print_newsrc(struct t_newsrc *NewSrc, FILE *fp); @@ -399,7 +399,7 @@ extern void set_default_bitmap(struct t_ extern void art_mark_deleted(struct t_article *art); extern void art_mark_undeleted(struct t_article *art); #ifdef DEBUG_NEWSRC - extern void vNewsrcTestHarness(void); + extern void newsrc_test_harness(void); #endif /* DEBUG_NEWSRC */ /* nntplib.c */ @@ -542,6 +542,7 @@ extern int parse_rfc822_headers(struct t extern t_part *new_part(t_part *part); extern void art_close(t_openartinfo *artinfo); extern void free_and_init_header(struct t_header *hdr); +extern void free_list(t_param *list); extern void free_parts(t_part *ptr); extern void unfold_header(char *line); @@ -613,6 +614,7 @@ extern char *eat_tab(char *s); extern char *my_strdup(const char *str); extern char *str_trim(char *string); extern char *tin_ltoa(long value, int digits); +extern char *tin_strtok(char *str, const char *delim); #if !defined(HAVE_STRCASESTR) || defined(DECL_STRCASESTR) extern const char *strcasestr(const char *haystack, const char *needle); #endif /* !HAVE_STRCASESTR || DECL_STRCASESTR */ @@ -651,7 +653,10 @@ extern void str_lwr(char *str); #endif /* !HAVE_STRRSTR */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) extern void wcspart(wchar_t *to, const wchar_t *from, int columns, int size_to, t_bool pad); + extern wchar_t *wtrunc(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 */ +extern char *trunc(const char *message, char *buf, size_t buf_len, int len); /* tags.c */ extern int line_is_tagged(int n); diff -Nurp tin-1.7.0/include/tin.h tin-1.7.1/include/tin.h --- tin-1.7.0/include/tin.h Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/include/tin.h Sat Sep 6 12:05:34 2003 @@ -3,7 +3,7 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-07-28 + * Updated : 2003-09-05 * Notes : #include files, #defines & struct's * * Copyright (c) 1997-2003 Iain Lea , Rich Skrenta @@ -768,9 +768,9 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ * NOTE: the "-(?!-)" assertion must be removed when IDN is introduced */ #if 0 /* this one is ok for IPv4 */ -# define URL_REGEX "\\b(?:https?|ftp|gopher)://(?:[^:@/]*(?::[^:@/]*)?@)?(?:(?:[^\\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)://(?:[^:@/]*(?::[^:@/]*)?@)?(?:(?:[^\\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 */ /* * case insensitive @@ -1004,14 +1004,15 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ #define TINRC_CONFIRM_SELECT (tinrc.confirm_choice == 2 || tinrc.confirm_choice == 5 || tinrc.confirm_choice == 6 || tinrc.confirm_choice == 7) /* - * Number of MIME Encodings + * MIME Encodings */ -#define NUM_MIME_ENCODINGS 4 - -#define MIME_ENCODING_8BIT 0 -#define MIME_ENCODING_BASE64 1 -#define MIME_ENCODING_QP 2 -#define MIME_ENCODING_7BIT 3 +enum { + MIME_ENCODING_8BIT = 0, + MIME_ENCODING_BASE64, + MIME_ENCODING_QP, + MIME_ENCODING_7BIT, + NUM_MIME_ENCODINGS +}; #ifdef CHARSET_CONVERSION /* can/should do charset conversion via iconv() */ # define NUM_MIME_CHARSETS 27 /* # known 'outgoing' charsets */ @@ -1123,7 +1124,6 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ /* * used by feed_articles() & show_mini_help() & quick_filter & add_filter_rule */ -#define INTERNAL_LEVEL 0 /* do we need this? see comments in filter.c */ #define SELECT_LEVEL 1 #define GROUP_LEVEL 2 #define THREAD_LEVEL 3 @@ -1181,6 +1181,16 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ #define THREAD_SCORE_WEIGHT 2 /* + * Values for interactive_mailer + */ +enum { + INTERACTIVE_NONE = 0, + INTERACTIVE_WITH_HEADERS, + INTERACTIVE_WITHOUT_HEADERS, + NUM_INTERACTIVE_MAILERS +}; + +/* * used in feed.c & save.c */ #define POST_PROC_NO 0 @@ -1263,6 +1273,15 @@ enum rc_state { RC_IGNORE, RC_CHECK, RC_ #define UUE_YES 1 /* Hide uue data */ #define UUE_ALL 2 /* Hide uue data harder */ +/* + * used in misc.c/rfc1524.c + */ +enum quote_enum { + no_quote = 0, + dbl_quote, + sgl_quote +}; + /* * index_point variable values used throughout tin @@ -2185,14 +2204,6 @@ typedef void (*BodyPtr) (char *, FILE *, # define EndWin EndWind # endif /* !ferror */ #endif /* __DECC */ - -#ifdef HAVE_TEMPNAM -# define my_tempnam(a,b) tempnam(a,b) -#else -# ifdef HAVE_TMPNAM -# define my_tempnam(a,b) tmpnam((char *)0) -# endif /* HAVE_TMPNAM */ -#endif /* HAVE_TEMPNAM */ #ifndef my_tmpfile_only /* diff -Nurp tin-1.7.0/include/tinrc.h tin-1.7.1/include/tinrc.h --- tin-1.7.0/include/tinrc.h Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/include/tinrc.h Sat Aug 23 01:58:40 2003 @@ -3,7 +3,7 @@ * Module : tinrc.h * Author : Jason Faultless * Created : 1999-04-13 - * Updated : 2003-08-10 + * Updated : 2003-08-12 * Notes : * * Copyright (c) 1999-2003 Jason Faultless @@ -177,6 +177,7 @@ struct t_config { int mono_markslash; /* attribute for text highlighting with /slashes/ */ int mono_markstroke; /* attribute for text highlighting with -strokes- */ t_bool word_highlight; /* like word_highlight but stored in tinrc */ + t_bool url_highlight; /* highlight urls in text bodies */ int wrap_column; /* screen column to wrap of text messages */ # ifdef HAVE_COLOR t_bool use_color; /* like use_color but stored in tinrc */ @@ -230,7 +231,7 @@ struct t_config { t_bool thread_catchup_on_exit; /* catchup thread with left arrow key or not */ t_bool unlink_article; char inews_prog[PATH_LEN]; - t_bool use_mailreader_i; /* invoke user's mailreader earlier to use more of its features (i = interactive) */ + int interactive_mailer; /* invoke user's mailreader */ t_bool use_mouse; /* enables/disables mouse support under xterm */ # ifdef HAVE_KEYPAD t_bool use_keypad; diff -Nurp tin-1.7.0/include/version.h tin-1.7.1/include/version.h --- tin-1.7.0/include/version.h Sun Aug 10 16:31:02 2003 +++ tin-1.7.1/include/version.h Thu Sep 18 18:37:45 2003 @@ -3,7 +3,7 @@ * Module : version.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-06-29 + * Updated : 2003-08-12 * Notes : * * Copyright (c) 1991-2003 Iain Lea @@ -40,12 +40,12 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "1.7.0" +# define VERSION "1.7.1" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20030810" -# define RELEASENAME "Sandray" +# define RELEASEDATE "20030918" +# define RELEASENAME "Berneray" /* config-file versions - must by dotted triples */ -# define TINRC_VERSION "1.3.6" +# define TINRC_VERSION "1.3.7" # define ATTRIBUTES_VERSION "1.0.0" # define FILTER_VERSION "1.0.0" # define SERVERCONFIG_VERSION "1.0.0" diff -Nurp tin-1.7.0/pcre/ChangeLog tin-1.7.1/pcre/ChangeLog --- tin-1.7.0/pcre/ChangeLog Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/ChangeLog Sat Aug 23 01:58:58 2003 @@ -1,6 +1,62 @@ ChangeLog for PCRE ------------------ +Version 4.4 13-Aug-03 +--------------------- + + 1. In UTF-8 mode, a character class containing characters with values between + 127 and 255 was not handled correctly if the compiled pattern was studied. + In fixing this, I have also improved the studying algorithm for such + classes (slightly). + + 2. Three internal functions had redundant arguments passed to them. Removal + might give a very teeny performance improvement. + + 3. Documentation bug: the value of the capture_top field in a callout is *one + more than* the number of the hightest numbered captured substring. + + 4. The Makefile linked pcretest and pcregrep with -lpcre, which could result + in incorrectly linking with a previously installed version. They now link + explicitly with libpcre.la. + + 5. configure.in no longer needs to recognize Cygwin specially. + + 6. A problem in pcre.in for Windows platforms is fixed. + + 7. If a pattern was successfully studied, and the -d (or /D) flag was given to + pcretest, it used to include the size of the study block as part of its + output. Unfortunately, the structure contains a field that has a different + size on different hardware architectures. This meant that the tests that + showed this size failed. As the block is currently always of a fixed size, + this information isn't actually particularly useful in pcretest output, so + I have just removed it. + + 8. Three pre-processor statements accidentally did not start in column 1. + Sadly, there are *still* compilers around that complain, even though + standard C has not required this for well over a decade. Sigh. + + 9. In pcretest, the code for checking callouts passed small integers in the + callout_data field, which is a void * field. However, some picky compilers + complained about the casts involved for this on 64-bit systems. Now + pcretest passes the address of the small integer instead, which should get + rid of the warnings. + +10. By default, when in UTF-8 mode, PCRE now checks for valid UTF-8 strings at + both compile and run time, and gives an error if an invalid UTF-8 sequence + is found. There is a option for disabling this check in cases where the + string is known to be correct and/or the maximum performance is wanted. + +11. In response to a bug report, I changed one line in Makefile.in from + + -Wl,--out-implib,.libs/lib@WIN_PREFIX@pcreposix.dll.a \ + to + -Wl,--out-implib,.libs/@WIN_PREFIX@libpcreposix.dll.a \ + + to look similar to other lines, but I have no way of telling whether this + is the right thing to do, as I do not use Windows. No doubt I'll get told + if it's wrong... + + Version 4.3 21-May-03 --------------------- diff -Nurp tin-1.7.0/pcre/LICENCE tin-1.7.1/pcre/LICENCE --- tin-1.7.0/pcre/LICENCE Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/LICENCE Sat Aug 23 01:58:58 2003 @@ -9,7 +9,7 @@ Written by: Philip Hazel magic_number != MAGIC_NUMBER) return PCRE_ERROR_BADMAGIC; if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_STUDY_DATA) != 0) - study = extra_data->study_data; + study = (const pcre_study_data *)extra_data->study_data; switch (what) { @@ -592,11 +598,11 @@ pcre_config(int what, void *where) switch (what) { case PCRE_CONFIG_UTF8: - #ifdef SUPPORT_UTF8 +#ifdef SUPPORT_UTF8 *((int *)where) = 1; - #else +#else *((int *)where) = 0; - #endif +#endif break; case PCRE_CONFIG_NEWLINE: @@ -669,7 +675,6 @@ Arguments: bracount number of previous extracting brackets options the options bits isclass TRUE if inside a character class - cd pointer to char tables block Returns: zero or positive => a data character negative => a special escape sequence @@ -678,7 +683,7 @@ Returns: zero or positive => a data static int check_escape(const uschar **ptrptr, const char **errorptr, int bracount, - int options, BOOL isclass, compile_data *cd) + int options, BOOL isclass) { const uschar *ptr = *ptrptr; int c, i; @@ -801,7 +806,8 @@ else c = 0; while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0) { - int cc = *(++ptr); + int cc; /* Some compilers don't like ++ */ + cc = *(++ptr); /* in initializers */ if (cc >= 'a') cc -= 32; /* Convert to upper case */ c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10)); } @@ -858,13 +864,12 @@ where the ddds are digits. Arguments: p pointer to the first char after '{' - cd pointer to char tables block Returns: TRUE or FALSE */ static BOOL -is_counted_repeat(const uschar *p, compile_data *cd) +is_counted_repeat(const uschar *p) { if ((digitab[*p++] && ctype_digit) == 0) return FALSE; while ((digitab[*p] & ctype_digit) != 0) p++; @@ -895,15 +900,13 @@ Arguments: maxp pointer to int for max returned as -1 if no max errorptr points to pointer to error message - cd pointer to character tables clock Returns: pointer to '}' on success; current ptr on error, with errorptr set */ static const uschar * -read_repeat_counts(const uschar *p, int *minp, int *maxp, - const char **errorptr, compile_data *cd) +read_repeat_counts(const uschar *p, int *minp, int *maxp, const char **errorptr) { int min = 0; int max = -1; @@ -1793,7 +1796,7 @@ for (;; ptr++) if (c == '\\') { - c = check_escape(&ptr, errorptr, *brackets, options, TRUE, cd); + c = check_escape(&ptr, errorptr, *brackets, options, TRUE); if (-c == ESC_b) c = '\b'; /* \b is backslash in a class */ if (-c == ESC_Q) /* Handle start of quoted string */ @@ -1882,7 +1885,7 @@ for (;; ptr++) if (d == '\\') { const uschar *oldptr = ptr; - d = check_escape(&ptr, errorptr, *brackets, options, TRUE, cd); + d = check_escape(&ptr, errorptr, *brackets, options, TRUE); /* \b is backslash; any other special means the '-' was literal */ @@ -2091,8 +2094,8 @@ for (;; ptr++) /* Various kinds of repeat */ case '{': - if (!is_counted_repeat(ptr+1, cd)) goto NORMAL_CHAR; - ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorptr, cd); + if (!is_counted_repeat(ptr+1)) goto NORMAL_CHAR; + ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorptr); if (*errorptr != NULL) goto FAILED; goto REPEAT; @@ -3039,7 +3042,7 @@ for (;; ptr++) case '\\': tempptr = ptr; - c = check_escape(&ptr, errorptr, *brackets, options, FALSE, cd); + c = check_escape(&ptr, errorptr, *brackets, options, FALSE); /* Handle metacharacters introduced by \. For ones like \d, the ESC_ values are arranged to be the negation of the corresponding OP_values. For the @@ -3142,7 +3145,7 @@ for (;; ptr++) if (c == '\\') { tempptr = ptr; - c = check_escape(&ptr, errorptr, *brackets, options, FALSE, cd); + c = check_escape(&ptr, errorptr, *brackets, options, FALSE); if (c < 0) { ptr = tempptr; break; } /* If a character is > 127 in UTF-8 mode, we have to turn it into @@ -3727,6 +3730,56 @@ return c; +#ifdef SUPPORT_UTF8 +/************************************************* +* Validate a UTF-8 string * +*************************************************/ + +/* This function is called (optionally) at the start of compile or match, to +validate that a supposed UTF-8 string is actually valid. The early check means +that subsequent code can assume it is dealing with a valid string. The check +can be turned off for maximum performance, but then consequences of supplying +an invalid string are then undefined. + +Arguments: + string points to the string + length length of string, or -1 if the string is zero-terminated + +Returns: < 0 if the string is a valid UTF-8 string + >= 0 otherwise; the value is the offset of the bad byte +*/ + +static int +valid_utf8(const uschar *string, int length) +{ +register const uschar *p; + +if (length < 0) + { + for (p = string; *p != 0; p++); + length = p - string; + } + +for (p = string; length-- > 0; p++) + { + int ab; + if (*p < 128) continue; + if ((*p & 0xc0) != 0xc0) return p - string; + ab = utf8_table4[*p & 0x3f]; /* Number of additional bytes */ + if (length < ab) return p - string; + while (ab-- > 0) + { + if ((*(++p) & 0xc0) != 0x80) return p - string; + length--; + } + } + +return -1; +} +#endif + + + /************************************************* * Compile a Regular Expression * *************************************************/ @@ -3793,6 +3846,12 @@ if (erroroffset == NULL) #ifdef SUPPORT_UTF8 utf8 = (options & PCRE_UTF8) != 0; +if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 && + (*erroroffset = valid_utf8((uschar *)pattern, -1)) >= 0) + { + *errorptr = ERR44; + return NULL; + } #else if ((options & PCRE_UTF8) != 0) { @@ -3874,7 +3933,7 @@ while ((c = *(++ptr)) != 0) case '\\': { const uschar *save_ptr = ptr; - c = check_escape(&ptr, errorptr, bracount, options, FALSE, &compile_block); + c = check_escape(&ptr, errorptr, bracount, options, FALSE); if (*errorptr != NULL) goto PCRE_ERROR_RETURN; if (c >= 0) { @@ -3910,9 +3969,9 @@ while ((c = *(++ptr)) != 0) if (refnum > compile_block.top_backref) compile_block.top_backref = refnum; length += 2; /* For single back reference */ - if (ptr[1] == '{' && is_counted_repeat(ptr+2, &compile_block)) + if (ptr[1] == '{' && is_counted_repeat(ptr+2)) { - ptr = read_repeat_counts(ptr+2, &min, &max, errorptr, &compile_block); + ptr = read_repeat_counts(ptr+2, &min, &max, errorptr); if (*errorptr != NULL) goto PCRE_ERROR_RETURN; if ((min == 0 && (max == 1 || max == -1)) || (min == 1 && max == -1)) @@ -3942,8 +4001,8 @@ while ((c = *(++ptr)) != 0) class, or back reference. */ case '{': - if (!is_counted_repeat(ptr+1, &compile_block)) goto NORMAL_CHAR; - ptr = read_repeat_counts(ptr+1, &min, &max, errorptr, &compile_block); + if (!is_counted_repeat(ptr+1)) goto NORMAL_CHAR; + ptr = read_repeat_counts(ptr+1, &min, &max, errorptr); if (*errorptr != NULL) goto PCRE_ERROR_RETURN; /* These special cases just insert one extra opcode */ @@ -4039,8 +4098,7 @@ while ((c = *(++ptr)) != 0) #ifdef SUPPORT_UTF8 int prevchar = ptr[-1]; #endif - int ch = check_escape(&ptr, errorptr, bracount, options, TRUE, - &compile_block); + int ch = check_escape(&ptr, errorptr, bracount, options, TRUE); if (*errorptr != NULL) goto PCRE_ERROR_RETURN; /* \b is backspace inside a class */ @@ -4151,9 +4209,9 @@ while ((c = *(++ptr)) != 0) /* A repeat needs either 1 or 5 bytes. */ - if (*ptr != 0 && ptr[1] == '{' && is_counted_repeat(ptr+2, &compile_block)) + if (*ptr != 0 && ptr[1] == '{' && is_counted_repeat(ptr+2)) { - ptr = read_repeat_counts(ptr+2, &min, &max, errorptr, &compile_block); + ptr = read_repeat_counts(ptr+2, &min, &max, errorptr); if (*errorptr != NULL) goto PCRE_ERROR_RETURN; if ((min == 0 && (max == 1 || max == -1)) || (min == 1 && max == -1)) @@ -4505,9 +4563,9 @@ while ((c = *(++ptr)) != 0) /* Leave ptr at the final char; for read_repeat_counts this happens automatically; for the others we need an increment. */ - if ((c = ptr[1]) == '{' && is_counted_repeat(ptr+2, &compile_block)) + if ((c = ptr[1]) == '{' && is_counted_repeat(ptr+2)) { - ptr = read_repeat_counts(ptr+2, &min, &max, errorptr, &compile_block); + ptr = read_repeat_counts(ptr+2, &min, &max, errorptr); if (*errorptr != NULL) goto PCRE_ERROR_RETURN; } else if (c == '*') { min = 0; max = -1; ptr++; } @@ -4596,8 +4654,7 @@ while ((c = *(++ptr)) != 0) if (c == '\\') { const uschar *saveptr = ptr; - c = check_escape(&ptr, errorptr, bracount, options, FALSE, - &compile_block); + c = check_escape(&ptr, errorptr, bracount, options, FALSE); if (*errorptr != NULL) goto PCRE_ERROR_RETURN; if (c < 0) { ptr = saveptr; break; } @@ -7307,7 +7364,7 @@ if (extra_data != NULL) { register unsigned int flags = extra_data->flags; if ((flags & PCRE_EXTRA_STUDY_DATA) != 0) - study = extra_data->study_data; + study = (const pcre_study_data *)extra_data->study_data; if ((flags & PCRE_EXTRA_MATCH_LIMIT) != 0) match_block.match_limit = extra_data->match_limit; if ((flags & PCRE_EXTRA_CALLOUT_DATA) != 0) @@ -7339,6 +7396,15 @@ match_block.recursive = NULL; match_block.lcc = re->tables + lcc_offset; match_block.ctypes = re->tables + ctypes_offset; + +/* Check a UTF-8 string if required. Unfortunately there's no way of passing +back the character offset. */ + +#ifdef SUPPORT_UTF8 +if (match_block.utf8 && (options & PCRE_NO_UTF8_CHECK) == 0 && + valid_utf8((uschar *)subject, length) >= 0) + return PCRE_ERROR_BADUTF8; +#endif /* The ims options can vary during the matching as a result of the presence of (?ims) items in the pattern. They are kept in a local variable so that diff -Nurp tin-1.7.0/pcre/pcre.in tin-1.7.1/pcre/pcre.in --- tin-1.7.0/pcre/pcre.in Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/pcre.in Sat Aug 23 01:58:58 2003 @@ -23,7 +23,7 @@ make changes to pcre.in. */ # endif # else # ifndef PCRE_STATIC -# define PCRE_DATA_SCOPE __declspec(dllimport) +# define PCRE_DATA_SCOPE extern __declspec(dllimport) # endif # endif #endif @@ -57,6 +57,7 @@ extern "C" { #define PCRE_NOTEMPTY 0x0400 #define PCRE_UTF8 0x0800 #define PCRE_NO_AUTO_CAPTURE 0x1000 +#define PCRE_NO_UTF8_CHECK 0x2000 /* Exec-time and get/set-time error codes */ @@ -69,6 +70,7 @@ extern "C" { #define PCRE_ERROR_NOSUBSTRING (-7) #define PCRE_ERROR_MATCHLIMIT (-8) #define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */ +#define PCRE_ERROR_BADUTF8 (-10) /* Request types for pcre_fullinfo() */ diff -Nurp tin-1.7.0/pcre/pcregrep.c tin-1.7.1/pcre/pcregrep.c --- tin-1.7.0/pcre/pcregrep.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/pcregrep.c Sat Aug 23 01:58:58 2003 @@ -545,8 +545,8 @@ for (i = 1; i < argc; i++) } } -pattern_list = malloc(MAX_PATTERN_COUNT * sizeof(pcre *)); -hints_list = malloc(MAX_PATTERN_COUNT * sizeof(pcre_extra *)); +pattern_list = (pcre **)malloc(MAX_PATTERN_COUNT * sizeof(pcre *)); +hints_list = (pcre_extra **)malloc(MAX_PATTERN_COUNT * sizeof(pcre_extra *)); if (pattern_list == NULL || hints_list == NULL) { diff -Nurp tin-1.7.0/pcre/pcreposix.c tin-1.7.1/pcre/pcreposix.c --- tin-1.7.0/pcre/pcreposix.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/pcreposix.c Sat Aug 23 01:58:58 2003 @@ -48,7 +48,7 @@ static const char *estring[] = { ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR29, ERR29, ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39, ERR40, - ERR41, ERR42, ERR43 }; + ERR41, ERR42, ERR43, ERR44 }; static int eint[] = { REG_EESCAPE, /* "\\ at end of pattern" */ @@ -93,7 +93,8 @@ static int eint[] = { REG_BADPAT, /* "recursive call could loop indefinitely" */ REG_BADPAT, /* "unrecognized character after (?P" */ REG_BADPAT, /* "syntax error after (?P" */ - REG_BADPAT /* "two named groups have the same name" */ + REG_BADPAT, /* "two named groups have the same name" */ + REG_BADPAT /* "invalid UTF-8 string" */ }; /* Table of texts corresponding to POSIX error codes */ @@ -217,7 +218,7 @@ preg->re_erroffset = erroffset; if (preg->re_pcre == NULL) return pcre_posix_error_code(errorptr); -preg->re_nsub = pcre_info(preg->re_pcre, NULL, NULL); +preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); return 0; } @@ -264,8 +265,8 @@ if (nmatch > 0) } } -rc = pcre_exec(preg->re_pcre, NULL, string, (int)strlen(string), 0, options, - ovector, nmatch * 3); +rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string, (int)strlen(string), + 0, options, ovector, nmatch * 3); if (rc == 0) rc = nmatch; /* All captured slots were filled in */ diff -Nurp tin-1.7.0/pcre/pcretest.c tin-1.7.1/pcre/pcretest.c --- tin-1.7.0/pcre/pcretest.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/pcretest.c Sat Aug 23 01:58:58 2003 @@ -52,7 +52,6 @@ static int use_utf8; static size_t gotten_store; - static const int utf8_table1[] = { 0x0000007f, 0x000007ff, 0x0000ffff, 0x001fffff, 0x03ffffff, 0x7fffffff}; @@ -321,13 +320,16 @@ if (post_start > 0) } fprintf(outfile, "\n"); - first_callout = 0; -if ((int)(cb->callout_data) != 0) +if (cb->callout_data != NULL) { - fprintf(outfile, "Callout data = %d\n", (int)(cb->callout_data)); - return (int)(cb->callout_data); + int callout_data = *((int *)(cb->callout_data)); + if (callout_data != 0) + { + fprintf(outfile, "Callout data = %d\n", callout_data); + return callout_data; + } } return (cb->callout_number != callout_fail_id)? 0 : @@ -397,8 +399,8 @@ unsigned char *dbuffer; /* Get buffers from malloc() so that Electric Fence will check their misuse when I am debugging. */ -buffer = malloc(BUFFER_SIZE); -dbuffer = malloc(DBUFFER_SIZE); +buffer = (unsigned char *)malloc(BUFFER_SIZE); +dbuffer = (unsigned char *)malloc(DBUFFER_SIZE); /* Static so that new_malloc can use it. */ @@ -464,7 +466,7 @@ while (argc > 1 && argv[op][0] == '-') /* Get the store for the offsets vector, and remember what it was */ size_offsets_max = size_offsets; -offsets = malloc(size_offsets_max * sizeof(int)); +offsets = (int *)malloc(size_offsets_max * sizeof(int)); if (offsets == NULL) { printf("** Failed to get %d bytes of memory for offsets vector\n", @@ -619,6 +621,7 @@ while (!done) case 'U': options |= PCRE_UNGREEDY; break; case 'X': options |= PCRE_EXTRA; break; case '8': options |= PCRE_UTF8; use_utf8 = 1; break; + case '?': options |= PCRE_NO_UTF8_CHECK; break; case 'L': ppp = pp; @@ -787,7 +790,7 @@ while (!done) } if (get_options == 0) fprintf(outfile, "No options\n"); - else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s\n", + else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s%s\n", ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "", ((get_options & PCRE_CASELESS) != 0)? " caseless" : "", ((get_options & PCRE_EXTENDED) != 0)? " extended" : "", @@ -796,7 +799,8 @@ while (!done) ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "", ((get_options & PCRE_EXTRA) != 0)? " extra" : "", ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "", - ((get_options & PCRE_UTF8) != 0)? " utf8" : ""); + ((get_options & PCRE_UTF8) != 0)? " utf8" : "", + ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : ""); if (((((real_pcre *)re)->options) & PCRE_ICHANGED) != 0) fprintf(outfile, "Case state changes\n"); @@ -861,13 +865,17 @@ while (!done) else if (extra == NULL) fprintf(outfile, "Study returned NULL\n"); + /* Don't output study size; at present it is in any case a fixed + value, but it varies, depending on the computer architecture, and + so messes up the test suite. */ + else if (do_showinfo) { size_t size; uschar *start_bits = NULL; new_info(re, extra, PCRE_INFO_STUDYSIZE, &size); new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits); - fprintf(outfile, "Study size = %d\n", size); + /* fprintf(outfile, "Study size = %d\n", size); */ if (start_bits == NULL) fprintf(outfile, "No starting character set\n"); else @@ -1105,7 +1113,7 @@ while (!done) { size_offsets_max = n; free(offsets); - use_offsets = offsets = malloc(size_offsets_max * sizeof(int)); + use_offsets = offsets = (int *)malloc(size_offsets_max * sizeof(int)); if (offsets == NULL) { printf("** Failed to get %d bytes of memory for offsets vector\n", @@ -1120,6 +1128,10 @@ while (!done) case 'Z': options |= PCRE_NOTEOL; continue; + + case '?': + options |= PCRE_NO_UTF8_CHECK; + continue; } *q++ = c; } @@ -1136,7 +1148,7 @@ while (!done) int eflags = 0; regmatch_t *pmatch = NULL; if (use_size_offsets > 0) - pmatch = malloc(sizeof(regmatch_t) * use_size_offsets); + pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets); if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL; if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL; @@ -1203,7 +1215,7 @@ while (!done) if (extra == NULL) { - extra = malloc(sizeof(pcre_extra)); + extra = (pcre_extra *)malloc(sizeof(pcre_extra)); extra->flags = 0; } extra->flags |= PCRE_EXTRA_MATCH_LIMIT; @@ -1242,11 +1254,11 @@ while (!done) { if (extra == NULL) { - extra = malloc(sizeof(pcre_extra)); + extra = (pcre_extra *)malloc(sizeof(pcre_extra)); extra->flags = 0; } extra->flags |= PCRE_EXTRA_CALLOUT_DATA; - extra->callout_data = (void *)callout_data; + extra->callout_data = &callout_data; count = pcre_exec(re, extra, (char *)bptr, len, start_offset, options | g_notempty, use_offsets, use_size_offsets); extra->flags &= ~PCRE_EXTRA_CALLOUT_DATA; diff -Nurp tin-1.7.0/pcre/study.c tin-1.7.1/pcre/study.c --- tin-1.7.0/pcre/study.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/study.c Sat Aug 23 01:58:58 2003 @@ -9,7 +9,7 @@ the file Tech.Notes for some information Written by: Philip Hazel - Copyright (c) 1997-2002 University of Cambridge + Copyright (c) 1997-2003 University of Cambridge ----------------------------------------------------------------------------- Permission is granted to anyone to use this software for any purpose on any @@ -297,19 +297,50 @@ do /* Character class where all the information is in a bit map: set the bits and either carry on or not, according to the repeat count. If it was a negative class, and we are operating with UTF-8 characters, any byte - with the top-bit set is a potentially valid starter because it may start - a character with a value > 255. (This is sub-optimal in that the - character may be in the range 128-255, and those characters might be - unwanted, but that's as far as we go for the moment.) */ + with a value >= 0xc4 is a potentially valid starter because it starts a + character with a value > 255. */ case OP_NCLASS: - if (utf8) memset(start_bits+16, 0xff, 16); + if (utf8) + { + start_bits[24] |= 0xf0; /* Bits for 0xc4 - 0xc8 */ + memset(start_bits+25, 0xff, 7); /* Bits for 0xc9 - 0xff */ + } /* Fall through */ case OP_CLASS: { tcode++; - for (c = 0; c < 32; c++) start_bits[c] |= tcode[c]; + + /* In UTF-8 mode, the bits in a bit map correspond to character + values, not to byte values. However, the bit map we are constructing is + for byte values. So we have to do a conversion for characters whose + value is > 127. In fact, there are only two possible starting bytes for + characters in the range 128 - 255. */ + + if (utf8) + { + for (c = 0; c < 16; c++) start_bits[c] |= tcode[c]; + for (c = 128; c < 256; c++) + { + if ((tcode[c/8] && (1 << (c&7))) != 0) + { + int d = (c >> 6) | 0xc0; /* Set bit for this starter */ + start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */ + c = (c & 0xc0) + 0x40 - 1; /* next relevant character. */ + } + } + } + + /* In non-UTF-8 mode, the two bit maps are completely compatible. */ + + else + { + for (c = 0; c < 32; c++) start_bits[c] |= tcode[c]; + } + + /* Advance past the bit map, and act on what follows */ + tcode += 32; switch (*tcode) { diff -Nurp tin-1.7.0/pcre/testdata/testinput5 tin-1.7.1/pcre/testdata/testinput5 --- tin-1.7.0/pcre/testdata/testinput5 Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/testdata/testinput5 Sat Aug 23 01:58:59 2003 @@ -192,4 +192,34 @@ /[^\xff]/8D +/[Ä-Ãœ]/8 + Ö # Matches without Study + \x{d6} + +/[Ä-Ãœ]/8S + Ö <-- Same with Study + \x{d6} + +/[\x{c4}-\x{dc}]/8 + Ö # Matches without Study + \x{d6} + +/[\x{c4}-\x{dc}]/8S + Ö <-- Same with Study + \x{d6} + +/[Ã]/8 + +/Ã/8 + +/ÃÃÃxxx/8 + +/ÃÃÃxxx/8?D + +/abc/8 + Ã] + à + ÃÃà + ÃÃÃ\? + / End of testinput5 / diff -Nurp tin-1.7.0/pcre/testdata/testoutput1 tin-1.7.1/pcre/testdata/testoutput1 --- tin-1.7.0/pcre/testdata/testoutput1 Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/testdata/testoutput1 Sat Aug 23 01:58:59 2003 @@ -1,4 +1,4 @@ -PCRE version 4.3 21-May-2003 +PCRE version 4.4 21-August-2003 /the quick brown fox/ the quick brown fox diff -Nurp tin-1.7.0/pcre/testdata/testoutput2 tin-1.7.1/pcre/testdata/testoutput2 --- tin-1.7.0/pcre/testdata/testoutput2 Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/testdata/testoutput2 Sat Aug 23 01:58:59 2003 @@ -1,4 +1,4 @@ -PCRE version 4.3 21-May-2003 +PCRE version 4.4 21-August-2003 /(a)b|/ Capturing subpattern count = 1 @@ -136,7 +136,6 @@ Capturing subpattern count = 0 No options No first char No need char -Study size = 40 Starting character set: c d e this sentence eventually mentions a cat 0: cat @@ -148,7 +147,6 @@ Capturing subpattern count = 0 Options: caseless No first char No need char -Study size = 40 Starting character set: C D E c d e this sentence eventually mentions a CAT cat 0: CAT @@ -160,7 +158,6 @@ Capturing subpattern count = 0 No options No first char No need char -Study size = 40 Starting character set: a b c d /(a|[^\dZ])/S @@ -168,7 +165,6 @@ Capturing subpattern count = 1 No options No first char No need char -Study size = 40 Starting character set: \x00 \x01 \x02 \x03 \x04 \x05 \x06 \x07 \x08 \x09 \x0a \x0b \x0c \x0d \x0e \x0f \x10 \x11 \x12 \x13 \x14 \x15 \x16 \x17 \x18 \x19 \x1a \x1b \x1c \x1d \x1e \x1f \x20 ! " # $ % & ' ( ) * + , - . / : ; < = > @@ -189,7 +185,6 @@ Capturing subpattern count = 1 No options No first char No need char -Study size = 40 Starting character set: \x09 \x0a \x0c \x0d \x20 a b /(ab\2)/ @@ -524,7 +519,6 @@ Capturing subpattern count = 0 No options No first char No need char -Study size = 40 Starting character set: a b c d /(?i)[abcd]/S @@ -532,7 +526,6 @@ Capturing subpattern count = 0 Options: caseless No first char No need char -Study size = 40 Starting character set: A B C D a b c d /(?m)[xy]|(b|c)/S @@ -540,7 +533,6 @@ Capturing subpattern count = 1 Options: multiline No first char No need char -Study size = 40 Starting character set: b c x y /(^a|^b)/m @@ -612,7 +604,6 @@ No options Case state changes No first char No need char -Study size = 40 Starting character set: C a b c d /a$/ @@ -677,7 +668,6 @@ Capturing subpattern count = 0 No options No first char No need char -Study size = 40 Starting character set: a b /(? ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ \x7f - \x80 \x81 \x82 \x83 \x84 \x85 \x86 \x87 \x88 \x89 \x8a \x8b \x8c \x8d \x8e - \x8f \x90 \x91 \x92 \x93 \x94 \x95 \x96 \x97 \x98 \x99 \x9a \x9b \x9c \x9d - \x9e \x9f \xa0 \xa1 \xa2 \xa3 \xa4 \xa5 \xa6 \xa7 \xa8 \xa9 \xaa \xab \xac - \xad \xae \xaf \xb0 \xb1 \xb2 \xb3 \xb4 \xb5 \xb6 \xb7 \xb8 \xb9 \xba \xbb - \xbc \xbd \xbe \xbf \xc0 \xc1 \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca - \xcb \xcc \xcd \xce \xcf \xd0 \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd7 \xd8 \xd9 - \xda \xdb \xdc \xdd \xde \xdf \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 - \xe9 \xea \xeb \xec \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf7 - \xf8 \xf9 \xfa \xfb \xfc \xfd \xfe \xff + \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 + \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd7 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf + \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee + \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf7 \xf8 \xf9 \xfa \xfb \xfc \xfd + \xfe \xff \x{f1} 0: \x{f1} \x{bf} @@ -463,7 +458,6 @@ Capturing subpattern count = 1 Options: utf8 No first char No need char -Study size = 40 Starting character set: x \xc4 /(\x{100}*a|x)/8SD @@ -482,7 +476,6 @@ Capturing subpattern count = 1 Options: utf8 No first char No need char -Study size = 40 Starting character set: a x \xc4 /(\x{100}{0,2}a|x)/8SD @@ -501,7 +494,6 @@ Capturing subpattern count = 1 Options: utf8 No first char No need char -Study size = 40 Starting character set: a x \xc4 /(\x{100}{1,2}a|x)/8SD @@ -521,7 +513,6 @@ Capturing subpattern count = 1 Options: utf8 No first char No need char -Study size = 40 Starting character set: x \xc4 /\x{100}*(\d+|"(?1)")/8 @@ -825,6 +816,61 @@ Capturing subpattern count = 0 Options: utf8 No first char No need char + +/[Ä-Ãœ]/8 + Ö # Matches without Study + 0: \x{d6} + \x{d6} + 0: \x{d6} + +/[Ä-Ãœ]/8S + Ö <-- Same with Study + 0: \x{d6} + \x{d6} + 0: \x{d6} + +/[\x{c4}-\x{dc}]/8 + Ö # Matches without Study + 0: \x{d6} + \x{d6} + 0: \x{d6} + +/[\x{c4}-\x{dc}]/8S + Ö <-- Same with Study + 0: \x{d6} + \x{d6} + 0: \x{d6} + +/[Ã]/8 +Failed: invalid UTF-8 string at offset 2 + +/Ã/8 +Failed: invalid UTF-8 string at offset 0 + +/ÃÃÃxxx/8 +Failed: invalid UTF-8 string at offset 1 + +/ÃÃÃxxx/8?D +------------------------------------------------------------------ + 0 11 Bra 0 + 3 6 \x{c3}\x{f8}xx + 11 11 Ket + 14 End +------------------------------------------------------------------ +Capturing subpattern count = 0 +Options: utf8 no_utf8_check +First char = 195 +Need char = 'x' + +/abc/8 + Ã] +Error -10 + à +Error -10 + ÃÃà +Error -10 + ÃÃÃ\? +No match / End of testinput5 / diff -Nurp tin-1.7.0/pcre/version.sh tin-1.7.1/pcre/version.sh --- tin-1.7.0/pcre/version.sh Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/pcre/version.sh Sat Aug 23 01:58:58 2003 @@ -7,6 +7,6 @@ # that many releases anyway. PCRE_MAJOR=4 -PCRE_MINOR=3 -PCRE_DATE=21-May-2003 +PCRE_MINOR=4 +PCRE_DATE=21-August-2003 PCRE_VERSION=${PCRE_MAJOR}.${PCRE_MINOR} Binary files tin-1.7.0/po/de.gmo and tin-1.7.1/po/de.gmo differ diff -Nurp tin-1.7.0/po/de.po tin-1.7.1/po/de.po --- tin-1.7.0/po/de.po Sun Aug 10 16:30:35 2003 +++ tin-1.7.1/po/de.po Thu Sep 18 18:32:16 2003 @@ -6,7 +6,7 @@ # msgid "" msgstr "Project-Id-Version: tin 1.7.0\n" - "POT-Creation-Date: 2003-08-10 16:30+0200\n" + "POT-Creation-Date: 2003-09-18 18:31+0200\n" "PO-Revision-Date: 2003-03-13 04:15+0200\n" "Last-Translator: Sven Hartge , Kai Bojens " "\n" @@ -15,6 +15,11 @@ msgstr "Project-Id-Version: tin 1.7.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: src/art.c:1228 +#, c-format +msgid "%d Bad overview record (%d fields) '%s'" +msgstr "" + #: src/attrib.c:574 msgid "# Do not edit this comment block\n" "#\n" @@ -261,7 +266,7 @@ msgstr "# in *binaries* Nachbearbeitung, msgid "# and set Followup-To: poster\n" msgstr "# und Antwort per EMail (Followup-To: poster) anfordern\n" -#: src/cook.c:798 +#: src/cook.c:799 msgid "(unknown)" msgstr "(unbekannt)" @@ -926,7 +931,7 @@ msgstr "\n" msgid "Insecure permissions of %s (%o)" msgstr "Unsichere Zugriffsbeschränkungen auf %s (%o)" -#: src/lang.c:199 src/open.c:1009 +#: src/lang.c:199 src/open.c:1100 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "Ungültige Antwort auf GROUP-Befehl, %s" @@ -942,8 +947,8 @@ msgid "MIME parse error: Start boundary msgstr "" #: src/lang.c:203 -msgid "Can't get a (fully-qualified) domain-name!\n" -msgstr "Kann keinen (vollqualifizierten) Domainnamen finden!\n" +msgid "Can't get a (fully-qualified) domain-name!" +msgstr "Kann keinen (vollqualifizierten) Domainnamen finden!" #: src/lang.c:204 #, c-format @@ -4249,133 +4254,146 @@ msgid "Comp. q., quote sigs & empty line msgstr "Zitatz. kürzen, Sign & Leerz. zit." #: src/lang.c:1290 +msgid "no" +msgstr "nein" + +#: src/lang.c:1291 +msgid "with headers" +msgstr "mit Header" + +#: src/lang.c:1292 +msgid "without headers" +msgstr "ohne Header" + +#: src/lang.c:1297 msgid "Display Options" msgstr "Darstellungseinstellungen" -#: src/lang.c:1296 +#: src/lang.c:1303 msgid "Color Options" msgstr "Farbeinstellungen" -#: src/lang.c:1302 +#: src/lang.c:1309 msgid "Article-Limiting Options" msgstr "Artikel-Begrenzungseinstellungen" -#: src/lang.c:1308 +#: src/lang.c:1315 msgid "Posting/Mailing Options" msgstr "Versandeinstellungen für Mail und News" -#: src/lang.c:1314 +#: src/lang.c:1321 msgid "Saving/Printing Options" msgstr "Speicher- und Druckereinstellungen" -#: src/lang.c:1320 +#: src/lang.c:1327 msgid "Expert Options" msgstr "Experteneinstellungen" -#: src/lang.c:1326 +#: src/lang.c:1333 msgid "Filtering Options" msgstr "Filtereinstellungen" -#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 src/lang.c:1402 -#: src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 src/lang.c:1511 src/lang.c:1673 -#: src/lang.c:1679 src/lang.c:1685 src/lang.c:1691 src/lang.c:1703 src/lang.c:1710 -#: src/lang.c:1761 src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788 -#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 src/lang.c:1818 -#: src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 src/lang.c:1842 src/lang.c:1848 -#: src/lang.c:1854 src/lang.c:1860 src/lang.c:1866 src/lang.c:1872 src/lang.c:1878 -#: src/lang.c:1884 src/lang.c:1891 src/lang.c:1897 src/lang.c:1903 src/lang.c:1910 -#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 src/lang.c:1945 -#: src/lang.c:1959 src/lang.c:1971 src/lang.c:2005 src/lang.c:2057 src/lang.c:2064 -#: src/lang.c:2070 src/lang.c:2095 src/lang.c:2112 src/lang.c:2165 src/lang.c:2198 -#: src/lang.c:2218 src/lang.c:2253 src/lang.c:2261 src/lang.c:2286 src/lang.c:2298 +#: src/lang.c:1338 src/lang.c:1364 src/lang.c:1370 src/lang.c:1377 src/lang.c:1409 +#: src/lang.c:1415 src/lang.c:1423 src/lang.c:1443 src/lang.c:1518 src/lang.c:1680 +#: src/lang.c:1686 src/lang.c:1692 src/lang.c:1698 src/lang.c:1710 src/lang.c:1717 +#: src/lang.c:1768 src/lang.c:1777 src/lang.c:1783 src/lang.c:1789 src/lang.c:1795 +#: src/lang.c:1801 src/lang.c:1807 src/lang.c:1813 src/lang.c:1819 src/lang.c:1825 +#: src/lang.c:1831 src/lang.c:1837 src/lang.c:1843 src/lang.c:1849 src/lang.c:1855 +#: src/lang.c:1861 src/lang.c:1867 src/lang.c:1873 src/lang.c:1879 src/lang.c:1885 +#: src/lang.c:1891 src/lang.c:1898 src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 +#: src/lang.c:1928 src/lang.c:1934 src/lang.c:1940 src/lang.c:1946 src/lang.c:1952 +#: src/lang.c:1958 src/lang.c:1972 src/lang.c:1984 src/lang.c:2018 src/lang.c:2070 +#: src/lang.c:2077 src/lang.c:2083 src/lang.c:2108 src/lang.c:2125 src/lang.c:2178 +#: src/lang.c:2211 src/lang.c:2231 src/lang.c:2266 src/lang.c:2275 src/lang.c:2300 +#: src/lang.c:2312 msgid " toggles, sets, cancels." msgstr " schaltet um, setzt, bricht ab." -#: src/lang.c:1332 +#: src/lang.c:1339 msgid "Show mini menu & posting etiquette :" msgstr "Zeigt Minimenü & Posting etiquette :" -#: src/lang.c:1333 +#: src/lang.c:1340 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:1338 +#: src/lang.c:1345 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Zeige Kurzbeschreibung für Gruppe. wechselt & setzt." -#: src/lang.c:1339 +#: src/lang.c:1346 msgid "Show description of each newsgroup :" msgstr "Zeige Beschreibung der Newsgruppen :" -#: src/lang.c:1340 +#: src/lang.c:1347 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:1345 +#: src/lang.c:1352 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Zeigt Subject & From (Autor) Felder im Gruppenmenü. wechselt & " "setzt." -#: src/lang.c:1346 +#: src/lang.c:1353 msgid "In group menu, show author by :" msgstr "Im Gruppenmenü, zeige Autor an nach:" -#: src/lang.c:1347 +#: src/lang.c:1354 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:1351 +#: src/lang.c:1358 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Zeige -> oder Hervorhebung für Auswahl. wechselt & setzt." -#: src/lang.c:1352 +#: src/lang.c:1359 msgid "Draw -> instead of highlighted bar :" msgstr "Zeige -> anstatt einer Markierung :" -#: src/lang.c:1353 +#: src/lang.c:1360 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Falls ON benutze -> andernfalls benutze eine Markierung zur Auswahl\n" -#: src/lang.c:1358 +#: src/lang.c:1365 msgid "Use inverse video for page headers :" msgstr "Inverse Darstellung für die Header :" -#: src/lang.c:1359 +#: src/lang.c:1366 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:1364 +#: src/lang.c:1371 msgid "Thread articles by :" msgstr "Threade Artikel anhand :" -#: src/lang.c:1365 +#: src/lang.c:1372 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:1371 +#: src/lang.c:1378 msgid "Score of a thread :" msgstr "Bewertung eines Threads :" -#: src/lang.c:1372 +#: src/lang.c:1379 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:1376 +#: src/lang.c:1383 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Sortiere Artikel nach Subject, From, Datum oder Bewertung." -#: src/lang.c:1377 +#: src/lang.c:1384 msgid "Sort articles by :" msgstr "Sortiere Artikel nach :" -#: src/lang.c:1378 +#: src/lang.c:1385 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" @@ -4384,56 +4402,56 @@ msgstr "# Sort. Art. nach 0=(nichts) 1=( "# 7=(Bewertung abst.) 8=(Bewertung aufst.) 9=(Lines abst.) 10=(Lines " "aufst.).\n" -#: src/lang.c:1384 +#: src/lang.c:1391 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Threads nach Bewertung (Score) oder nichts ordnen. wechselt & " "setzt" -#: src/lang.c:1385 +#: src/lang.c:1392 msgid "Sort threads by :" msgstr "Sortiere Threads nach :" -#: src/lang.c:1386 +#: src/lang.c:1393 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:1390 +#: src/lang.c:1397 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:1391 +#: src/lang.c:1398 msgid "Goto first unread article in group :" msgstr "Setze Cursor auf ersten ungel. Art.:" -#: src/lang.c:1392 +#: src/lang.c:1399 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:1396 +#: src/lang.c:1403 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Zeige alle oder nur ungelesene Artikel. wechselt & setzt." -#: src/lang.c:1397 +#: src/lang.c:1404 msgid "Show only unread articles :" msgstr "Zeige nur ungelesene Artikel :" -#: src/lang.c:1398 +#: src/lang.c:1405 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:1403 +#: src/lang.c:1410 msgid "Show only groups with unread arts :" msgstr "Zeige nur Gruppen mit ungel. Art. :" -#: src/lang.c:1404 +#: src/lang.c:1411 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:1409 +#: src/lang.c:1416 msgid "Filter which articles :" msgstr "Filter (kill) anwenden auf :" -#: src/lang.c:1410 +#: src/lang.c:1417 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" @@ -4441,215 +4459,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:1417 +#: src/lang.c:1424 msgid "Tab goes to next unread article :" msgstr "Tab zeigt nächsten ungelesenen Art.:" -#: src/lang.c:1418 +#: src/lang.c:1425 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:1422 +#: src/lang.c:1429 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:1423 +#: src/lang.c:1430 msgid "Space goes to next unread article :" msgstr "Leertaste zeigt nächsten unge. Art.:" -#: src/lang.c:1424 +#: src/lang.c:1431 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:1429 +#: src/lang.c:1436 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:1430 +#: src/lang.c:1437 msgid "PgDn goes to next unread article :" msgstr "PgDn zeigt nächst. ungelesenen Art.:" -#: src/lang.c:1431 +#: src/lang.c:1438 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:1437 +#: src/lang.c:1444 msgid "List thread using right arrow key :" msgstr "Zeige Thread mit rechter Pfeilt. an:" -#: src/lang.c:1438 +#: src/lang.c:1445 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:1442 +#: src/lang.c:1449 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Definiere Zeichen für gelöschte Artikel. setzt, bricht ab." -#: src/lang.c:1443 +#: src/lang.c:1450 msgid "Character to show deleted articles :" msgstr "Zeichen für gelöschte Artikel :" -#: src/lang.c:1444 +#: src/lang.c:1451 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:1449 +#: src/lang.c:1456 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:1450 +#: src/lang.c:1457 msgid "Character to show inrange articles :" msgstr "Zeichen für Artikel im Bereich :" -#: src/lang.c:1451 +#: src/lang.c:1458 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:1456 +#: src/lang.c:1463 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Definiere Zeichen für wiederkehrende Art. setzt. bricht ab." -#: src/lang.c:1457 +#: src/lang.c:1464 msgid "Character to show returning arts :" msgstr "Zeichen für wiederkehrende Artikel :" -#: src/lang.c:1458 +#: src/lang.c:1465 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:1463 +#: src/lang.c:1470 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Zeichen für Artikel mit Markierung wichtig/'hot' setzt, bricht ab." -#: src/lang.c:1464 +#: src/lang.c:1471 msgid "Character to show selected articles:" msgstr "Zeichen für wichtige Artikel :" -#: src/lang.c:1465 +#: src/lang.c:1472 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:1470 +#: src/lang.c:1477 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Definiere Zeichen für aktuelle Artikel. setzt, bricht ab." -#: src/lang.c:1471 +#: src/lang.c:1478 msgid "Character to show recent articles :" msgstr "Zeichen für aktuelle Artikel :" -#: src/lang.c:1472 +#: src/lang.c:1479 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:1477 +#: src/lang.c:1484 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Zeichen für ungelesene Artikel. setzt, bricht ab." -#: src/lang.c:1478 +#: src/lang.c:1485 msgid "Character to show unread articles :" msgstr "Zeichen für ungelesene Artikel :" -#: src/lang.c:1479 +#: src/lang.c:1486 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:1484 +#: src/lang.c:1491 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Zeichen für gelesene Artikel. setzt, bricht ab." -#: src/lang.c:1485 +#: src/lang.c:1492 msgid "Character to show read articles :" msgstr "Zeichen für gelesene Artikel :" -#: src/lang.c:1486 +#: src/lang.c:1493 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:1491 +#: src/lang.c:1498 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Zeichen für gekillte Artikel. setzt, bricht ab." -#: src/lang.c:1492 +#: src/lang.c:1499 msgid "Character to show killed articles :" msgstr "Zeichen für gekillte Artikel :" -#: src/lang.c:1493 +#: src/lang.c:1500 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:1498 +#: src/lang.c:1505 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Zeichen für gelesene wichtige/'hot' Artikel. setzt, bricht ab." -#: src/lang.c:1499 +#: src/lang.c:1506 msgid "Character to show readselected arts:" msgstr "Zeichen für gelesene wichtige Art. :" -#: src/lang.c:1500 +#: src/lang.c:1507 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:1505 +#: src/lang.c:1512 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Maximale Länge des angezeigten Newsgruppennamens. setzt." -#: src/lang.c:1506 +#: src/lang.c:1513 msgid "Max. length of group names shown :" msgstr "Max. Länge angezeigter Gruppennamen:" -#: src/lang.c:1507 +#: src/lang.c:1514 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maximale Länge der angezeigten Newsgruppennamen\n" -#: src/lang.c:1512 +#: src/lang.c:1519 msgid "Show lines/score in listings :" msgstr "Zeige Zeilenz./Bewert. in Übersicht:" -#: src/lang.c:1513 +#: src/lang.c:1520 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:1518 +#: src/lang.c:1525 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:1519 +#: src/lang.c:1526 msgid "Number of lines to scroll in pager :" msgstr "Blättere Artikel um ... Zeilen :" -#: src/lang.c:1520 +#: src/lang.c:1527 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" @@ -4659,27 +4677,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:1527 +#: src/lang.c:1534 msgid "Display signatures. toggles & sets." msgstr "Zeige Signaturen an. wechselt & setzt." -#: src/lang.c:1528 +#: src/lang.c:1535 msgid "Display signatures :" msgstr "Zeige Signaturen an :" -#: src/lang.c:1529 +#: src/lang.c:1536 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "# Falls OFF zeige keine Signaturen an\n" -#: src/lang.c:1533 +#: src/lang.c:1540 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Uu-kodierte Teile als Attachment anzeigen. wechselt & setzt." -#: src/lang.c:1534 +#: src/lang.c:1541 msgid "Display uue data as an attachment :" msgstr "Zeige uue-Teile als Attachment :" -#: src/lang.c:1535 +#: src/lang.c:1542 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" @@ -4692,29 +4710,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:1544 +#: src/lang.c:1551 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "TeX german.sty Umlautkodierung auswerten. wechselt & setzt." -#: src/lang.c:1545 +#: src/lang.c:1552 msgid "Display \"a as Umlaut-a :" msgstr "Wandle TeX-Umlaute automatisch um :" -#: src/lang.c:1546 +#: src/lang.c:1553 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:1551 src/lang.c:1561 +#: src/lang.c:1558 src/lang.c:1568 msgid "Space separated list of header fields" msgstr "Durch Leerzeichen getrennte Liste der Header-Felder" -#: src/lang.c:1552 +#: src/lang.c:1559 msgid "Display these header fields (or *) :" msgstr "Zeige diese Header-Felder (oder *) :" -#: src/lang.c:1553 +#: src/lang.c:1560 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" @@ -4728,11 +4746,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:1562 +#: src/lang.c:1569 msgid "Do not display these header fields :" msgstr "Zeige folgende Header nicht an :" -#: src/lang.c:1563 +#: src/lang.c:1570 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 " @@ -4749,27 +4767,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:1573 +#: src/lang.c:1580 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:1574 +#: src/lang.c:1581 msgid "Skip multipart/alternative parts :" msgstr "Übersp. multipart/alternative-Teile:" -#: src/lang.c:1575 +#: src/lang.c:1582 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "# Falls ON entsorge multipart/alternative Teile des Artikels automatisch\n" -#: src/lang.c:1580 +#: src/lang.c:1587 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:1581 +#: src/lang.c:1588 msgid "Regex used to show quoted lines :" msgstr "Regulärer Ausd. für zit. Zeilen :" -#: src/lang.c:1582 +#: src/lang.c:1589 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" @@ -4778,15 +4796,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:1588 +#: src/lang.c:1595 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:1589 +#: src/lang.c:1596 msgid "Regex used to show twice quoted l. :" msgstr "Reg. Ausd. für zweifach zitierte Z.:" -#: src/lang.c:1590 +#: src/lang.c:1597 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" @@ -4795,15 +4813,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:1596 +#: src/lang.c:1603 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:1597 +#: src/lang.c:1604 msgid "Regex used to show >= 3 times q.l. :" msgstr "Reg. Ausd. für >=3-fach zitierte Z.:" -#: src/lang.c:1598 +#: src/lang.c:1605 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" @@ -4812,15 +4830,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:1605 +#: src/lang.c:1612 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:1606 +#: src/lang.c:1613 msgid "Regex used to highlight /slashes/ :" msgstr "Reg. für /Schrägst./ Hervorhebungen:" -#: src/lang.c:1607 +#: src/lang.c:1614 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" @@ -4828,15 +4846,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:1613 +#: src/lang.c:1620 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:1614 +#: src/lang.c:1621 msgid "Regex used to highlight *stars* :" msgstr "Regu. A. für *Stern* Hervorhebungen:" -#: src/lang.c:1615 +#: 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_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4844,15 +4862,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:1621 +#: src/lang.c:1628 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:1622 +#: src/lang.c:1629 msgid "Regex used to highlight -strokes- :" msgstr "Reg. für -Durchstr.- Hervorhebungen:" -#: src/lang.c:1623 +#: 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_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4860,15 +4878,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:1629 +#: src/lang.c:1636 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:1630 +#: src/lang.c:1637 msgid "Regex used to highlight _underline_:" msgstr "Reg. für _Unterstr._ Hervorhebungen:" -#: src/lang.c:1631 +#: 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_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4876,44 +4894,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:1637 +#: src/lang.c:1644 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:1638 +#: src/lang.c:1645 msgid "Regex with Subject prefixes :" msgstr "Reg. Ausd. für den Subjectanfang :" -#: src/lang.c:1639 +#: src/lang.c:1646 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:1644 +#: src/lang.c:1651 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:1645 +#: src/lang.c:1652 msgid "Regex with Subject suffixes :" msgstr "Reg. Ausd. für das Subjectende :" -#: src/lang.c:1646 +#: src/lang.c:1653 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:1651 +#: src/lang.c:1658 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:1652 +#: src/lang.c:1659 msgid "MIME binary content viewer :" msgstr "MIME-Viewer :" -#: src/lang.c:1653 +#: src/lang.c:1660 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" @@ -4922,51 +4940,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:1660 +#: src/lang.c:1667 msgid "Confirm before starting non-text viewing program" msgstr "Start des MIME-Viewers bestätigen" -#: src/lang.c:1661 +#: src/lang.c:1668 msgid "Ask before using MIME viewer :" msgstr "Start des MIME-Viewers bestätigen :" -#: src/lang.c:1662 +#: src/lang.c:1669 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:1667 +#: src/lang.c:1674 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "Beim Beenden anbieten, alle betretenen Gruppen als gelesen zu markieren?" -#: src/lang.c:1668 +#: src/lang.c:1675 msgid "Catchup read groups when quitting :" msgstr "Aufholen der Gruppen beim Beenden :" -#: src/lang.c:1669 +#: src/lang.c:1676 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:1674 +#: src/lang.c:1681 msgid "Catchup group using left key :" msgstr "Catchup der Gruppe mit l. Cursor :" -#: src/lang.c:1675 +#: src/lang.c:1682 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:1680 +#: src/lang.c:1687 msgid "Catchup thread by using left key :" msgstr "Catchup mit der linken Cursort. :" -#: src/lang.c:1686 +#: src/lang.c:1693 msgid "Which actions require confirmation :" msgstr "Bestätigung erforderlich für :" -#: src/lang.c:1687 +#: src/lang.c:1694 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" @@ -4974,321 +4992,322 @@ msgstr "# Welche Operationen müssen expl "# gelesen (siehe 'X' Befehl im Manual).\n" # TRANSLATION MISSING -#: src/lang.c:1692 +#: src/lang.c:1699 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1693 +# TRANSLATION MISSING +#: src/lang.c:1700 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1697 +#: src/lang.c:1704 msgid "Program to run to open URL's, sets, cancels." msgstr "Öffne URLs mit ... setzt, bricht ab." -#: src/lang.c:1698 +#: src/lang.c:1705 msgid "Program that opens URL's :" msgstr "Öffne URLs mit ... :" -#: src/lang.c:1699 +#: src/lang.c:1706 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:1704 +#: src/lang.c:1711 msgid "Use mouse in xterm :" msgstr "Maus in xterm nutzen :" -#: src/lang.c:1705 +#: src/lang.c:1712 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:1711 +#: src/lang.c:1718 msgid "Use scroll keys on keypad :" msgstr "Scrollt. vom Nummernblock nutzen :" -#: src/lang.c:1712 +#: src/lang.c:1719 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:1717 +#: src/lang.c:1724 msgid "Enter maximum number of article to get. sets." msgstr "Maximale Anzahl der zu holenden Artikel eingeben. setzt." -#: src/lang.c:1718 +#: src/lang.c:1725 msgid "Number of articles to get :" msgstr "Anzahl der zu holenden Artikel :" -#: src/lang.c:1719 +#: src/lang.c:1726 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:1724 +#: src/lang.c:1731 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:1725 +#: src/lang.c:1732 msgid "Article recentness time limit :" msgstr "Artikel Neuheitszeit-Limit :" -#: src/lang.c:1726 +#: src/lang.c:1733 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:1730 +#: src/lang.c:1737 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:1731 +#: src/lang.c:1738 msgid "Wildcard matching :" msgstr "Wildcardprüfung :" -#: src/lang.c:1732 +#: src/lang.c:1739 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "# Wildcardprüfung 0=(wildmat) 1=(Regulärer Ausdruck)\n" -#: src/lang.c:1736 +#: src/lang.c:1743 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:1737 +#: src/lang.c:1744 msgid "Score limit (kill) :" msgstr "Bewertungsgrenze (kill) :" -#: src/lang.c:1738 +#: src/lang.c:1745 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:1742 +#: src/lang.c:1749 msgid "Enter default score to kill articles. sets." msgstr "Bewertung für gekillte Artikel. setzt." -#: src/lang.c:1743 +#: src/lang.c:1750 msgid "Default score to kill articles :" msgstr "Bewertung für gekillte Artikel :" -#: src/lang.c:1744 +#: src/lang.c:1751 msgid "# Default score to kill articles\n" msgstr "# Bewertung für gekillte Artikel\n" -#: src/lang.c:1748 +#: src/lang.c:1755 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:1749 +#: src/lang.c:1756 msgid "Score limit (select) :" msgstr "Bewertungsgrenze (select) :" -#: src/lang.c:1750 +#: src/lang.c:1757 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:1754 +#: src/lang.c:1761 msgid "Enter default score to select articles. sets." msgstr "Bewertung für wichtige Artikel (hot). setzt." -#: src/lang.c:1755 +#: src/lang.c:1762 msgid "Default score to select articles :" msgstr "Bewertung für wichtige Artikel :" -#: src/lang.c:1756 +#: src/lang.c:1763 msgid "# Default score to select articles\n" msgstr "# Bewertung für wichtige Artikel (hot)\n" -#: src/lang.c:1762 +#: src/lang.c:1769 msgid "Use slrnface to show ''X-Face:''s :" msgstr "''X-Face:''s mit slrnface Anzeigen :" -#: src/lang.c:1763 +#: src/lang.c:1770 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:1771 +#: src/lang.c:1778 msgid "Use ANSI color :" msgstr "Benutze ANSI-Farben :" -#: src/lang.c:1772 +#: src/lang.c:1779 msgid "# If ON using ANSI-color\n" msgstr "# Falls ON benutze ANSI-Farben\n" -#: src/lang.c:1777 +#: src/lang.c:1784 msgid "Standard foreground color :" msgstr "Standard Vordergrundfarbe :" -#: src/lang.c:1778 +#: src/lang.c:1785 msgid "# Standard foreground color\n" msgstr "# Standard Vordergrundfarbe\n" -#: src/lang.c:1783 +#: src/lang.c:1790 msgid "Standard background color :" msgstr "Standard Hintergrundfarbe :" -#: src/lang.c:1784 +#: src/lang.c:1791 msgid "# Standard-Background-Color\n" msgstr "# Standard Hintergrundfarbe\n" -#: src/lang.c:1789 +#: src/lang.c:1796 msgid "Color for inverse text (background):" msgstr "Farbe des inversen Text (Hinterg.) :" -#: src/lang.c:1790 +#: src/lang.c:1797 msgid "# Color of background for inverse text\n" msgstr "# Farbe des Hintergrunds für inversen Text\n" -#: src/lang.c:1795 +#: src/lang.c:1802 msgid "Color for inverse text (foreground):" msgstr "Farbe des inversen Text (Vordergr.):" -#: src/lang.c:1796 +#: src/lang.c:1803 msgid "# Color of foreground for inverse text\n" msgstr "# Farbe des Vordergrunds für inversen Text\n" -#: src/lang.c:1801 +#: src/lang.c:1808 msgid "Color of text lines :" msgstr "Farbe der Textzeilen :" -#: src/lang.c:1802 +#: src/lang.c:1809 msgid "# Color of text-lines\n" msgstr "# Farbe der Textzeilen\n" -#: src/lang.c:1807 +#: src/lang.c:1814 msgid "Color of mini help menu :" msgstr "Farbe des Minihilfemenü :" -#: src/lang.c:1808 +#: src/lang.c:1815 msgid "# Color of mini help menu\n" msgstr "# Farbe des Minihilfemenü\n" -#: src/lang.c:1813 +#: src/lang.c:1820 msgid "Color of help text :" msgstr "Farbe des Hilfstext :" -#: src/lang.c:1814 +#: src/lang.c:1821 msgid "# Color of help pages\n" msgstr "# Farbe der Hilfsseiten\n" -#: src/lang.c:1819 +#: src/lang.c:1826 msgid "Color of status messages :" msgstr "Farbe der Statusmeldungen :" -#: src/lang.c:1820 +#: src/lang.c:1827 msgid "# Color of messages in last line\n" msgstr "# Farbe der letzten Zeile im Artikel\n" -#: src/lang.c:1825 +#: src/lang.c:1832 msgid "Color of quoted lines :" msgstr "Farbe der zitierten Zeilen :" -#: src/lang.c:1826 +#: src/lang.c:1833 msgid "# Color of quote-lines\n" msgstr "# Farbe der zitierten Zeilen\n" -#: src/lang.c:1831 +#: src/lang.c:1838 msgid "Color of twice quoted line :" msgstr "Farbe von zweifach zitierten Zeilen:" -#: src/lang.c:1832 +#: src/lang.c:1839 msgid "# Color of twice quoted lines\n" msgstr "# Farbe von zweifach zitierten Zeilen\n" -#: src/lang.c:1837 +#: src/lang.c:1844 msgid "Color of =>3 times quoted line :" msgstr "Farbe von =>3-fach zitierten Zeilen:" -#: src/lang.c:1838 +#: src/lang.c:1845 msgid "# Color of >=3 times quoted lines\n" msgstr "# Farbe von =>3-fach zitierten Zeilen\n" -#: src/lang.c:1843 +#: src/lang.c:1850 msgid "Color of article header lines :" msgstr "Farbe der Artikelheaderzeilen :" -#: src/lang.c:1844 +#: src/lang.c:1851 msgid "# Color of header-lines\n" msgstr "# Farbe der Artikelheaderzeilen\n" -#: src/lang.c:1849 +#: src/lang.c:1856 msgid "Color of actual news header fields :" msgstr "Farbe des angezeigten Headers :" -#: src/lang.c:1850 +#: src/lang.c:1857 msgid "# Color of actual news header fields\n" msgstr "# Farbe des angezeigten Headers\n" -#: src/lang.c:1855 +#: src/lang.c:1862 msgid "Color of article subject lines :" msgstr "Farbe der Subjectzeile :" -#: src/lang.c:1856 +#: src/lang.c:1863 msgid "# Color of article subject\n" msgstr "# Farbe der Subjectzeile\n" -#: src/lang.c:1861 +#: src/lang.c:1868 msgid "Color of response counter :" msgstr "Farbe des Antwortzählers :" -#: src/lang.c:1862 +#: src/lang.c:1869 msgid "# Color of response counter\n" msgstr "# Farbe des Antwortzählers\n" -#: src/lang.c:1867 +#: src/lang.c:1874 msgid "Color of sender (From:) :" msgstr "Farbe des Autors (From:) :" -#: src/lang.c:1868 +#: src/lang.c:1875 msgid "# Color of sender (From:)\n" msgstr "# Farbe des Autors (From:)\n" -#: src/lang.c:1873 +#: src/lang.c:1880 msgid "Color of help/mail sign :" msgstr "Farbe des Hilfe/Mail-Zeichen :" -#: src/lang.c:1874 +#: src/lang.c:1881 msgid "# Color of Help/Mail-Sign\n" msgstr "# Farbe des Hilfe/Mail-Zeichen\n" -#: src/lang.c:1879 +#: src/lang.c:1886 msgid "Color of signatures :" msgstr "Farbe von Signaturen :" -#: src/lang.c:1880 +#: src/lang.c:1887 msgid "# Color of signature\n" msgstr "# Farbe von Signaturen\n" -#: src/lang.c:1885 +#: src/lang.c:1892 msgid "Color of highlighting with *stars* :" msgstr "Farbe der Hervorhebung *Sterne* :" -#: src/lang.c:1886 +#: src/lang.c:1893 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:1892 +#: src/lang.c:1899 msgid "Color of highlighting with _dash_ :" msgstr "Farbe der Hervorhebung _Striche_ :" -#: src/lang.c:1898 +#: src/lang.c:1905 msgid "Color of highlighting with /slash/ :" msgstr "Farbe der Hervorhebung /Schrägstr./:" -#: src/lang.c:1904 +#: src/lang.c:1911 msgid "Color of highlighting with -stroke-:" msgstr "Farbe der Hervorhebung -Durchstr.- :" -#: src/lang.c:1911 +#: src/lang.c:1918 msgid "Attr. of highlighting with *stars* :" msgstr "Hervorhebungsattribute *Sterne* :" -#: src/lang.c:1912 +#: src/lang.c:1919 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5302,31 +5321,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:1922 +#: src/lang.c:1929 msgid "Attr. of highlighting with _dash_ :" msgstr "Hervorhebungsattr. _Unterstriche_ :" -#: src/lang.c:1928 +#: src/lang.c:1935 msgid "Attr. of highlighting with /slash/ :" msgstr "Hervorhebungsattr. /Schrägstriche/ :" -#: src/lang.c:1934 +#: src/lang.c:1941 msgid "Attr. of highlighting with -stroke-:" msgstr "Hervorhebungsattr. -Durchstreich.- :" -#: src/lang.c:1940 +#: src/lang.c:1947 +msgid "URL highlighting in message body :" +msgstr "URL-Hervorhebung im Artikel :" + +#: src/lang.c:1948 +msgid "# Enable URL highlighting?\n" +msgstr "# URL-Hervorhebung aktivieren?\n" + +#: src/lang.c:1953 msgid "Word highlighting in message body :" msgstr "Wort-Hervorhebung im Artikel :" -#: src/lang.c:1941 +#: src/lang.c:1954 msgid "# Enable word highlighting?\n" msgstr "# Wort-Hervorhebung aktivieren?\n" -#: src/lang.c:1946 +#: src/lang.c:1959 msgid "What to display instead of mark :" msgstr "Anstelle der Markierung anzeigen :" -#: src/lang.c:1947 +#: src/lang.c:1960 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" @@ -5334,59 +5361,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:1953 +#: src/lang.c:1966 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:1954 +#: src/lang.c:1967 msgid "Page line wrap column :" msgstr "Zeilen umbrechen nach :" -#: src/lang.c:1955 +#: src/lang.c:1968 msgid "# Wrap article lines at column\n" msgstr "# In der Artikelanzeige Zeilen umbrechen bei Spalte\n" -#: src/lang.c:1960 +#: src/lang.c:1973 msgid "Wrap around threads on next unread :" msgstr "Nä.ungel.-kein Abbr. am Listenende?:" -#: src/lang.c:1961 +#: src/lang.c:1974 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:1965 +#: src/lang.c:1978 msgid "Enter default mail address (and fullname). sets." msgstr "Standard Mail-Adresse (und Name) eingeben. setzt." -#: src/lang.c:1966 +#: src/lang.c:1979 msgid "Mail address (and fullname) :" msgstr "Mailadresse (und Name) :" -#: src/lang.c:1967 +#: src/lang.c:1980 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:1972 +#: src/lang.c:1985 msgid "Show empty Followup-To in editor :" msgstr "Leeres Fup'2 im Editor anzeigen :" -#: src/lang.c:1973 +#: src/lang.c:1986 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:1977 +#: src/lang.c:1990 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "Setze Pfad/! Kommando/--none um ihre Signatur festzulegen. setzt." -#: src/lang.c:1978 +#: src/lang.c:1991 msgid "Create signature from path/command :" msgstr "Erzeuge Signatur aus Pfad/Kommando :" -#: src/lang.c:1979 +#: src/lang.c:1992 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 " @@ -5397,49 +5424,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:1986 +#: src/lang.c:1999 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Trenne Sig mit \"-- \" in eigener Zeile ab. wechselt & setzt." -#: src/lang.c:1987 +#: src/lang.c:2000 msgid "Prepend signature with \"-- \" :" msgstr "Trenne Sig mit \"-- \" ab :" -#: src/lang.c:1988 +#: src/lang.c:2001 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "# Falls ON trenne Signatur mit '\\n-- \\n' ab\n" -#: src/lang.c:1992 +#: src/lang.c:2005 msgid "Add signature when reposting articles. toggles & sets." msgstr "Sig. beim Reposten eines Artikels hinzufügen? wechselt & setzt." -#: src/lang.c:1993 +#: src/lang.c:2006 msgid "Add signature when reposting :" msgstr "Signatur beim Reposten anhängen :" -#: src/lang.c:1994 +#: src/lang.c:2007 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:1998 +#: src/lang.c:2011 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:1999 +#: src/lang.c:2012 msgid "Characters used as quote-marks :" msgstr "Zitatzeichen :" -#: src/lang.c:2000 +#: src/lang.c:2013 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:2006 +#: src/lang.c:2019 msgid "Quoting behavior :" msgstr "Zitierverhalten :" -#: src/lang.c:2007 +#: src/lang.c:2020 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5460,15 +5487,15 @@ msgstr "# Spezielle Optionen beim Zitier "# 7 = Zitatzeichen zusammenziehen & Signaturen zitieren & Leerzeilen " "zitieren\n" -#: src/lang.c:2019 src/lang.c:2027 src/lang.c:2033 +#: src/lang.c:2032 src/lang.c:2040 src/lang.c:2046 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:2020 +#: src/lang.c:2033 msgid "Quote line when following up :" msgstr "Einleitungszeile beim Antworten :" -#: src/lang.c:2021 +#: src/lang.c:2034 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" @@ -5476,35 +5503,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:2028 +#: src/lang.c:2041 msgid "Quote line when cross-posting :" msgstr "Einleitungszeile beim Crossposten :" -#: src/lang.c:2034 +#: src/lang.c:2047 msgid "Quote line when mailing :" msgstr "Einleitungszeile bei Mailantwort :" -#: src/lang.c:2039 +#: src/lang.c:2052 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Falls ON, füge User-Agent:-Header ein. wechselt & setzt." -#: src/lang.c:2040 +#: src/lang.c:2053 msgid "Insert 'User-Agent:'-header :" msgstr "Füge 'User-Agent:'-header ein :" -#: src/lang.c:2041 +#: src/lang.c:2054 msgid "# If ON include advertising User-Agent: header\n" msgstr "# Falls ON füge 'User-Agent: header' ein\n" -#: src/lang.c:2045 +#: src/lang.c:2058 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:2046 +#: src/lang.c:2059 msgid "MM_CHARSET :" msgstr "MM_CHARSET :" -#: src/lang.c:2047 +#: src/lang.c:2060 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" @@ -5521,27 +5548,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:2058 +#: src/lang.c:2071 msgid "MM_NETWORK_CHARSET :" msgstr "MM_NETWORK_CHARSET :" -#: src/lang.c:2059 +#: src/lang.c:2072 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:2065 +#: src/lang.c:2078 msgid "Mailbox format :" msgstr "Mailbox-Format :" -#: src/lang.c:2066 +#: src/lang.c:2079 msgid "# Format of the mailbox.\n" msgstr "# Format der Mailbox.\n" -#: src/lang.c:2071 +#: src/lang.c:2084 msgid "MIME encoding in news messages :" msgstr "MIME-Kodierung in Newsartikeln :" -#: src/lang.c:2072 +#: src/lang.c:2085 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" @@ -5555,15 +5582,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:2080 src/lang.c:2101 +#: src/lang.c:2093 src/lang.c:2114 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:2081 +#: src/lang.c:2094 msgid "Use 8bit characters in news headers:" msgstr "Benutze 8bit-Zeichen im Newsheader :" -#: src/lang.c:2082 +#: src/lang.c:2095 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,27 +5602,27 @@ msgstr "# Wenn ON werden 8-Bit-Zeichen ( "# kodiert, wenn post_mime_encoding nicht auch auf 8bit eingestellt\n" "# ist.\n" -#: src/lang.c:2089 +#: src/lang.c:2102 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Nachbearbeitete Artikel autom. anz. wechselt, setzt, Ende" -#: src/lang.c:2090 +#: src/lang.c:2103 msgid "View post-processed files :" msgstr "Nachbearbeitete Artikel anzeigen :" -#: src/lang.c:2091 +#: src/lang.c:2104 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:2096 +#: src/lang.c:2109 msgid "MIME encoding in mail messages :" msgstr "MIME-Kodierung für E-Mails :" -#: src/lang.c:2102 +#: src/lang.c:2115 msgid "Use 8bit characters in mail headers:" msgstr "Benutze 8bit Zeichen im Mail Header:" -#: src/lang.c:2103 +#: src/lang.c:2116 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 " @@ -5612,24 +5639,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:2113 +#: src/lang.c:2126 msgid "Strip blanks from ends of lines :" msgstr "Leerzeichen am Zeilenende entfernen:" -#: src/lang.c:2114 +#: src/lang.c:2127 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:2119 +#: src/lang.c:2132 msgid "If ON, use transliteration. toggles & sets." msgstr "Wenn ON verwende Umschreibungen. wechselt & setzt." -#: src/lang.c:2120 +#: src/lang.c:2133 msgid "Transliteration :" msgstr "Verwende Umschreibungen :" -#: src/lang.c:2121 +#: src/lang.c:2134 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" @@ -5639,242 +5666,242 @@ msgstr "# Wenn ON verwende //TRANSLIT Er "# Terminal als EUR umschrieben, ohne //TRANSLIT würde tin ein\n" "# Fragezeichen verwenden.\n" -#: src/lang.c:2128 +#: src/lang.c:2141 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Sendet ihnen automatisch eine Kopie. wechselt & setzt." -#: src/lang.c:2129 +#: src/lang.c:2142 msgid "Send you a cc automatically :" msgstr "Sendet Ihnen ein Cc automatisch :" -#: src/lang.c:2130 +#: src/lang.c:2143 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:2134 +#: src/lang.c:2147 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Sendet ihnen automatisch eine blinde Kopie. wechselt & setzt." -#: src/lang.c:2135 +#: src/lang.c:2148 msgid "Send you a blind cc automatically :" msgstr "Sendet Ihnen eine blinde cc autom. :" -#: src/lang.c:2136 +#: src/lang.c:2149 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:2140 +#: src/lang.c:2153 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:2141 +#: src/lang.c:2154 msgid "Spamtrap warning address parts :" msgstr "Spamfallenwarnung in Adresse :" -#: src/lang.c:2142 +#: src/lang.c:2155 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:2147 +#: src/lang.c:2160 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Gültigkeit eines Filtereintrags in Tagen. setzt." -#: src/lang.c:2148 +#: src/lang.c:2161 msgid "No. of days a filter entry is valid:" msgstr "Tage, die ein Filter gültig ist :" -#: src/lang.c:2149 +#: src/lang.c:2162 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:2153 +#: src/lang.c:2166 msgid "Add posted articles to filter. toggles & sets." msgstr "Gepostete Artikel zum Filter hinzufügen. wechselt & setzt." -#: src/lang.c:2154 +#: src/lang.c:2167 msgid "Add posted articles to filter :" msgstr "Füge gepostete Artikel zum Filter :" -#: src/lang.c:2155 +#: src/lang.c:2168 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:2159 +#: src/lang.c:2172 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:2160 +#: src/lang.c:2173 msgid "Mail directory :" msgstr "Mail Verzeichnis :" -#: src/lang.c:2161 +#: src/lang.c:2174 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:2166 +#: src/lang.c:2179 msgid "Save articles in batch mode (-S) :" msgstr "Speicher Artikel im Batchmode (-S) :" -#: src/lang.c:2167 +#: src/lang.c:2180 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:2172 +#: src/lang.c:2185 msgid "The directory where you want articles/threads saved." msgstr "Das Verzeichnis, in dem Artikel/Threads gespeichert werden sollen." -#: src/lang.c:2173 +#: src/lang.c:2186 msgid "Directory to save arts/threads in :" msgstr "Verz. um Art/Threads zu speichern :" -#: src/lang.c:2174 +#: src/lang.c:2187 msgid "# Directory where articles/threads are saved\n" msgstr "# Verzeichnis in dem Artikel/Threads gespeichert werden\n" -#: src/lang.c:2178 +#: src/lang.c:2191 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:2179 +#: src/lang.c:2192 msgid "Use Archive-name: header for save :" msgstr "Nutze Archive-name: zum Speichern :" -#: src/lang.c:2180 +#: src/lang.c:2193 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:2185 +#: src/lang.c:2198 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "Gesp. Art. gelesen markieren. wechselt, setzt, bricht ab." -#: src/lang.c:2186 +#: src/lang.c:2199 msgid "Mark saved articles/threads as read:" msgstr "Mark. gesp. Artikel/Threads gelesen:" -#: src/lang.c:2187 +#: src/lang.c:2200 msgid "# If ON mark articles that are saved as read\n" msgstr "# Falls ON werden gespeicherte Artikel als gelesen markiert\n" -#: src/lang.c:2191 +#: src/lang.c:2204 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Bearbeite (z.B. unshar) gesp. Art/Threads. wechselt & setzt." -#: src/lang.c:2192 +#: src/lang.c:2205 msgid "Post process saved articles :" msgstr "Nachbearbeiten gespeichert. Artikel:" -#: src/lang.c:2193 +#: src/lang.c:2206 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:2199 +#: src/lang.c:2212 msgid "Process only unread articles :" msgstr "Bearbeite nur ungelesene Artikel :" -#: src/lang.c:2200 +#: src/lang.c:2213 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:2205 +#: src/lang.c:2218 msgid "Print all or just part of header. toggles & sets." msgstr "Drucke alles oder nur Teile des Headers wechselt & setzt." -#: src/lang.c:2206 +#: src/lang.c:2219 msgid "Print all headers when printing :" msgstr "Alle Header beim Drucken ausgeben :" -#: src/lang.c:2207 +#: src/lang.c:2220 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:2211 +#: src/lang.c:2224 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:2212 +#: src/lang.c:2225 msgid "Printer program with options :" msgstr "Druckprogramm mit Optionen :" -#: src/lang.c:2213 +#: src/lang.c:2226 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# Druckprogramm mit Optionen zum drucken der Artikel/Threads\n" -#: src/lang.c:2219 +#: src/lang.c:2232 msgid "Force redraw after certain commands:" msgstr "Anzeigeauffrischung nach Kommandos :" -#: src/lang.c:2220 +#: src/lang.c:2233 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:2224 +#: src/lang.c:2237 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "Starte Editor mit Einrückung. wechselt, setzt, bricht ab." -#: src/lang.c:2225 +#: src/lang.c:2238 msgid "Start editor with line offset :" msgstr "Starte Editor mit Einrückung :" -#: src/lang.c:2226 +#: src/lang.c:2239 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:2231 +#: src/lang.c:2244 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:2232 +#: src/lang.c:2245 msgid "Invocation of your editor :" msgstr "Aufruf ihres Editors :" -#: src/lang.c:2233 +#: src/lang.c:2246 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:2238 +#: src/lang.c:2251 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:2239 +#: src/lang.c:2252 msgid "External inews :" msgstr "Externes inews-Programm :" -#: src/lang.c:2240 +#: src/lang.c:2253 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:2244 +#: src/lang.c:2257 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:2245 +#: src/lang.c:2258 msgid "Invocation of your mail command :" msgstr "Aufruf ihres Mailkommandos :" -#: src/lang.c:2246 +#: src/lang.c:2259 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename %%U User (AmigaDOS)\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" @@ -5884,106 +5911,105 @@ 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:2254 +#: src/lang.c:2267 msgid "Use interactive mail reader :" msgstr "Benutze interaktives Mailprogramm :" -#: src/lang.c:2255 -msgid "# Interactive mailreader: if ON mailreader will be invoked earlier for\n" - "# reply so you can use more of its features (eg. MIME, pgp, ...)\n" - "# this option has to suit default_mailer_format\n" -msgstr "# Interaktives Mailprogramm: Falls ON wird das Mailprogramm an einer\n" - "# früheren Stelle aufgerufen, so das man seine Möglichkeiten besser nutzen\n" - "# kann (z.B. MIME, pgp, ...).\n" - "# Diese Option muss zu default_mailer_format passen.\n" +# TRANSLATION MISSING +#: src/lang.c:2268 +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:2262 +#: src/lang.c:2276 msgid "Remove ~/.article after posting :" msgstr "Entferne ~/.article nach dem posten:" -#: src/lang.c:2263 +#: src/lang.c:2277 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Falls ON entferne ~/.article nach dem posten.\n" -#: src/lang.c:2267 +#: src/lang.c:2281 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:2268 +#: src/lang.c:2282 msgid "Filename for posted articles :" msgstr "Gepostete Artikel speichern in :" -#: src/lang.c:2269 +#: src/lang.c:2283 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:2274 +#: src/lang.c:2288 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "Behalte alle Fehlschläge in ~/dead.articles. wechselt & setzt." -#: src/lang.c:2275 +#: src/lang.c:2289 msgid "Keep failed arts in ~/dead.articles:" msgstr "Halte Fehlschl. in ~/dead.articles :" -#: src/lang.c:2276 +#: src/lang.c:2290 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:2280 +#: src/lang.c:2294 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Wollen Sie nicht-abonnierte Gruppen aus der .newsrc entfernen?" -#: src/lang.c:2281 +#: src/lang.c:2295 msgid "No unsubscribed groups in newsrc :" msgstr "Nur abonnierte Gruppen in newsrc :" -#: src/lang.c:2282 +#: src/lang.c:2296 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Falls ON entferne nicht-abonnierte Gruppen aus der newsrc\n" -#: src/lang.c:2287 +#: src/lang.c:2301 msgid "Remove bogus groups from newsrc :" msgstr "Lösche nicht vorhande G. aus newsrc:" -#: src/lang.c:2288 +#: src/lang.c:2302 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:2292 +#: src/lang.c:2306 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:2293 +#: src/lang.c:2307 msgid "Interval in secs to reread active :" msgstr "Active alle ... Sekunden neu lesen :" -#: src/lang.c:2294 +#: src/lang.c:2308 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:2299 +#: src/lang.c:2313 msgid "Reconnect to server automatically :" msgstr "Autom. Wiederverbindung zum Server :" -#: src/lang.c:2300 +#: src/lang.c:2314 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:2304 +#: src/lang.c:2318 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Erzeuge lokale Kopien der NNTP Overview Dateien. wechselt & " "setzt." -#: src/lang.c:2305 +#: src/lang.c:2319 msgid "Cache NNTP overview files locally :" msgstr "Speichere NNTP Overview Daten lokal:" -#: src/lang.c:2306 +#: src/lang.c:2320 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Falls ON, erzeuge lokale Kopien der NNTP Overview Dateien.\n" @@ -6243,7 +6269,7 @@ msgstr "Unbekannter NNTP-Antwort-Code" msgid "couldn't expand %s\n" msgstr "Kann %s nicht expandieren\n" -#: src/open.c:1032 +#: src/open.c:1123 msgid "Unreachable?\n" msgstr "Unerreichbar?\n" @@ -6252,13 +6278,13 @@ msgstr "Unerreichbar?\n" msgid "%s is bogus" msgstr "%s ist ungültig" -#: src/post.c:1940 +#: src/post.c:1936 #, c-format msgid "Posting: %.*s ..." msgstr "Poste: %.*s ..." #. TODO: -> lang.c -#: src/post.c:4038 +#: src/post.c:4034 #, c-format msgid "Rereading %s..." msgstr "Lese %s..." Binary files tin-1.7.0/po/en_GB.gmo and tin-1.7.1/po/en_GB.gmo differ diff -Nurp tin-1.7.0/po/en_GB.po tin-1.7.1/po/en_GB.po --- tin-1.7.0/po/en_GB.po Sun Aug 10 16:30:36 2003 +++ tin-1.7.1/po/en_GB.po Thu Sep 18 18:32:18 2003 @@ -2,8 +2,8 @@ # Robert Brady , 2000-2002 # msgid "" -msgstr "Project-Id-Version: tin 1.6.0\n" - "POT-Creation-Date: 2003-08-10 16:30+0200\n" +msgstr "Project-Id-Version: tin 1.7.0\n" + "POT-Creation-Date: 2003-09-18 18:31+0200\n" "PO-Revision-Date: 2002-11-15 20:10+0000\n" "Last-Translator: Robert Brady \n" "Language-Team: \n" @@ -11,6 +11,11 @@ msgstr "Project-Id-Version: tin 1.6.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: src/art.c:1228 +#, c-format +msgid "%d Bad overview record (%d fields) '%s'" +msgstr "" + #: src/attrib.c:574 msgid "# Do not edit this comment block\n" "#\n" @@ -207,7 +212,7 @@ msgstr "" msgid "# and set Followup-To: poster\n" msgstr "" -#: src/cook.c:798 +#: src/cook.c:799 msgid "(unknown)" msgstr "" @@ -837,7 +842,7 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "" -#: src/lang.c:199 src/open.c:1009 +#: src/lang.c:199 src/open.c:1100 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "" @@ -852,7 +857,7 @@ msgid "MIME parse error: Start boundary msgstr "" #: src/lang.c:203 -msgid "Can't get a (fully-qualified) domain-name!\n" +msgid "Can't get a (fully-qualified) domain-name!" msgstr "" #: src/lang.c:204 @@ -3956,380 +3961,393 @@ msgid "Comp. q., quote sigs & empty line msgstr "" #: src/lang.c:1290 +msgid "no" +msgstr "" + +#: src/lang.c:1291 +msgid "with headers" +msgstr "" + +#: src/lang.c:1292 +msgid "without headers" +msgstr "" + +#: src/lang.c:1297 msgid "Display Options" msgstr "" -#: src/lang.c:1296 +#: src/lang.c:1303 msgid "Color Options" msgstr "Colour Options" -#: src/lang.c:1302 +#: src/lang.c:1309 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1308 +#: src/lang.c:1315 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1314 +#: src/lang.c:1321 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1320 +#: src/lang.c:1327 msgid "Expert Options" msgstr "" -#: src/lang.c:1326 +#: src/lang.c:1333 msgid "Filtering Options" msgstr "" -#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 src/lang.c:1402 -#: src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 src/lang.c:1511 src/lang.c:1673 -#: src/lang.c:1679 src/lang.c:1685 src/lang.c:1691 src/lang.c:1703 src/lang.c:1710 -#: src/lang.c:1761 src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788 -#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 src/lang.c:1818 -#: src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 src/lang.c:1842 src/lang.c:1848 -#: src/lang.c:1854 src/lang.c:1860 src/lang.c:1866 src/lang.c:1872 src/lang.c:1878 -#: src/lang.c:1884 src/lang.c:1891 src/lang.c:1897 src/lang.c:1903 src/lang.c:1910 -#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 src/lang.c:1945 -#: src/lang.c:1959 src/lang.c:1971 src/lang.c:2005 src/lang.c:2057 src/lang.c:2064 -#: src/lang.c:2070 src/lang.c:2095 src/lang.c:2112 src/lang.c:2165 src/lang.c:2198 -#: src/lang.c:2218 src/lang.c:2253 src/lang.c:2261 src/lang.c:2286 src/lang.c:2298 +#: src/lang.c:1338 src/lang.c:1364 src/lang.c:1370 src/lang.c:1377 src/lang.c:1409 +#: src/lang.c:1415 src/lang.c:1423 src/lang.c:1443 src/lang.c:1518 src/lang.c:1680 +#: src/lang.c:1686 src/lang.c:1692 src/lang.c:1698 src/lang.c:1710 src/lang.c:1717 +#: src/lang.c:1768 src/lang.c:1777 src/lang.c:1783 src/lang.c:1789 src/lang.c:1795 +#: src/lang.c:1801 src/lang.c:1807 src/lang.c:1813 src/lang.c:1819 src/lang.c:1825 +#: src/lang.c:1831 src/lang.c:1837 src/lang.c:1843 src/lang.c:1849 src/lang.c:1855 +#: src/lang.c:1861 src/lang.c:1867 src/lang.c:1873 src/lang.c:1879 src/lang.c:1885 +#: src/lang.c:1891 src/lang.c:1898 src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 +#: src/lang.c:1928 src/lang.c:1934 src/lang.c:1940 src/lang.c:1946 src/lang.c:1952 +#: src/lang.c:1958 src/lang.c:1972 src/lang.c:1984 src/lang.c:2018 src/lang.c:2070 +#: src/lang.c:2077 src/lang.c:2083 src/lang.c:2108 src/lang.c:2125 src/lang.c:2178 +#: src/lang.c:2211 src/lang.c:2231 src/lang.c:2266 src/lang.c:2275 src/lang.c:2300 +#: src/lang.c:2312 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1332 +#: src/lang.c:1339 msgid "Show mini menu & posting etiquette :" msgstr "" -#: src/lang.c:1333 +#: src/lang.c:1340 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:1338 +#: src/lang.c:1345 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1339 +#: src/lang.c:1346 msgid "Show description of each newsgroup :" msgstr "" -#: src/lang.c:1340 +#: src/lang.c:1347 msgid "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1345 +#: src/lang.c:1352 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "" -#: src/lang.c:1346 +#: src/lang.c:1353 msgid "In group menu, show author by :" msgstr "" -#: src/lang.c:1347 +#: src/lang.c:1354 msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" msgstr "" -#: src/lang.c:1351 +#: src/lang.c:1358 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1352 +#: src/lang.c:1359 msgid "Draw -> instead of highlighted bar :" msgstr "" -#: src/lang.c:1353 +#: src/lang.c:1360 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1358 +#: src/lang.c:1365 msgid "Use inverse video for page headers :" msgstr "" -#: src/lang.c:1359 +#: src/lang.c:1366 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1364 +#: src/lang.c:1371 msgid "Thread articles by :" msgstr "" -#: src/lang.c:1365 +#: src/lang.c:1372 msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" msgstr "" -#: src/lang.c:1371 +#: src/lang.c:1378 msgid "Score of a thread :" msgstr "" -#: src/lang.c:1372 +#: src/lang.c:1379 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "" -#: src/lang.c:1376 +#: src/lang.c:1383 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1377 +#: src/lang.c:1384 msgid "Sort articles by :" msgstr "" -#: src/lang.c:1378 +#: src/lang.c:1385 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:1384 +#: src/lang.c:1391 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1385 +#: src/lang.c:1392 msgid "Sort threads by :" msgstr "" -#: src/lang.c:1386 +#: src/lang.c:1393 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" msgstr "" -#: src/lang.c:1390 +#: src/lang.c:1397 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1391 +#: src/lang.c:1398 msgid "Goto first unread article in group :" msgstr "" -#: src/lang.c:1392 +#: src/lang.c:1399 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1396 +#: src/lang.c:1403 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1397 +#: src/lang.c:1404 msgid "Show only unread articles :" msgstr "" -#: src/lang.c:1398 +#: src/lang.c:1405 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1403 +#: src/lang.c:1410 msgid "Show only groups with unread arts :" msgstr "" -#: src/lang.c:1404 +#: src/lang.c:1411 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1409 +#: src/lang.c:1416 msgid "Filter which articles :" msgstr "" -#: src/lang.c:1410 +#: src/lang.c:1417 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:1417 +#: src/lang.c:1424 msgid "Tab goes to next unread article :" msgstr "" -#: src/lang.c:1418 +#: src/lang.c:1425 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "" -#: src/lang.c:1422 +#: src/lang.c:1429 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "" -#: src/lang.c:1423 +#: src/lang.c:1430 msgid "Space goes to next unread article :" msgstr "" -#: src/lang.c:1424 +#: src/lang.c:1431 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:1429 +#: src/lang.c:1436 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "" -#: src/lang.c:1430 +#: src/lang.c:1437 msgid "PgDn goes to next unread article :" msgstr "" -#: src/lang.c:1431 +#: src/lang.c:1438 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:1437 +#: src/lang.c:1444 msgid "List thread using right arrow key :" msgstr "" -#: src/lang.c:1438 +#: src/lang.c:1445 msgid "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1442 +#: src/lang.c:1449 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1443 +#: src/lang.c:1450 msgid "Character to show deleted articles :" msgstr "" -#: src/lang.c:1444 +#: src/lang.c:1451 msgid "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1449 +#: src/lang.c:1456 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1450 +#: src/lang.c:1457 msgid "Character to show inrange articles :" msgstr "" -#: src/lang.c:1451 +#: src/lang.c:1458 msgid "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1456 +#: src/lang.c:1463 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1457 +#: src/lang.c:1464 msgid "Character to show returning arts :" msgstr "" -#: src/lang.c:1458 +#: src/lang.c:1465 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1463 +#: src/lang.c:1470 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1464 +#: src/lang.c:1471 msgid "Character to show selected articles:" msgstr "" -#: src/lang.c:1465 +#: src/lang.c:1472 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1470 +#: src/lang.c:1477 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1471 +#: src/lang.c:1478 msgid "Character to show recent articles :" msgstr "" -#: src/lang.c:1472 +#: src/lang.c:1479 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1477 +#: src/lang.c:1484 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1478 +#: src/lang.c:1485 msgid "Character to show unread articles :" msgstr "" -#: src/lang.c:1479 +#: src/lang.c:1486 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1484 +#: src/lang.c:1491 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1485 +#: src/lang.c:1492 msgid "Character to show read articles :" msgstr "" -#: src/lang.c:1486 +#: src/lang.c:1493 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1491 +#: src/lang.c:1498 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1492 +#: src/lang.c:1499 msgid "Character to show killed articles :" msgstr "" -#: src/lang.c:1493 +#: src/lang.c:1500 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:1498 +#: src/lang.c:1505 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1499 +#: src/lang.c:1506 msgid "Character to show readselected arts:" msgstr "" -#: src/lang.c:1500 +#: src/lang.c:1507 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:1505 +#: src/lang.c:1512 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1506 +#: src/lang.c:1513 msgid "Max. length of group names shown :" msgstr "" -#: src/lang.c:1507 +#: src/lang.c:1514 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1512 +#: src/lang.c:1519 msgid "Show lines/score in listings :" msgstr "" -#: src/lang.c:1513 +#: src/lang.c:1520 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:1518 +#: src/lang.c:1525 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1519 +#: src/lang.c:1526 msgid "Number of lines to scroll in pager :" msgstr "" -#: src/lang.c:1520 +#: src/lang.c:1527 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" @@ -4339,27 +4357,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:1527 +#: src/lang.c:1534 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1528 +#: src/lang.c:1535 msgid "Display signatures :" msgstr "" -#: src/lang.c:1529 +#: src/lang.c:1536 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1533 +#: src/lang.c:1540 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1534 +#: src/lang.c:1541 msgid "Display uue data as an attachment :" msgstr "" -#: src/lang.c:1535 +#: src/lang.c:1542 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" @@ -4368,28 +4386,28 @@ msgid "# Handling of uuencoded data in t "# into a tag line.\n" msgstr "" -#: src/lang.c:1544 +#: src/lang.c:1551 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1545 +#: src/lang.c:1552 msgid "Display \"a as Umlaut-a :" msgstr "" -#: src/lang.c:1546 +#: src/lang.c:1553 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1551 src/lang.c:1561 +#: src/lang.c:1558 src/lang.c:1568 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1552 +#: src/lang.c:1559 msgid "Display these header fields (or *) :" msgstr "" -#: src/lang.c:1553 +#: src/lang.c:1560 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" @@ -4398,11 +4416,11 @@ msgid "# Which news headers you wish to "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1562 +#: src/lang.c:1569 msgid "Do not display these header fields :" msgstr "" -#: src/lang.c:1563 +#: src/lang.c:1570 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 " @@ -4413,512 +4431,512 @@ msgid "# Same as 'news_headers_to_displa "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1573 +#: src/lang.c:1580 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1574 +#: src/lang.c:1581 msgid "Skip multipart/alternative parts :" msgstr "" -#: src/lang.c:1575 +#: src/lang.c:1582 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1580 +#: src/lang.c:1587 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1581 +#: src/lang.c:1588 msgid "Regex used to show quoted lines :" msgstr "" -#: src/lang.c:1582 +#: src/lang.c:1589 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:1588 +#: src/lang.c:1595 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1589 +#: src/lang.c:1596 msgid "Regex used to show twice quoted l. :" msgstr "" -#: src/lang.c:1590 +#: src/lang.c:1597 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:1596 +#: src/lang.c:1603 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1597 +#: src/lang.c:1604 msgid "Regex used to show >= 3 times q.l. :" msgstr "" -#: src/lang.c:1598 +#: src/lang.c:1605 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:1605 +#: src/lang.c:1612 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1606 +#: src/lang.c:1613 msgid "Regex used to highlight /slashes/ :" msgstr "" -#: src/lang.c:1607 +#: src/lang.c:1614 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:1613 +#: src/lang.c:1620 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1614 +#: src/lang.c:1621 msgid "Regex used to highlight *stars* :" msgstr "" -#: src/lang.c:1615 +#: 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_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1621 +#: src/lang.c:1628 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1622 +#: src/lang.c:1629 msgid "Regex used to highlight -strokes- :" msgstr "" -#: src/lang.c:1623 +#: 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_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1629 +#: src/lang.c:1636 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1630 +#: src/lang.c:1637 msgid "Regex used to highlight _underline_:" msgstr "" -#: src/lang.c:1631 +#: 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_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1637 +#: src/lang.c:1644 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1638 +#: src/lang.c:1645 msgid "Regex with Subject prefixes :" msgstr "" -#: src/lang.c:1639 +#: src/lang.c:1646 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:1644 +#: src/lang.c:1651 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1645 +#: src/lang.c:1652 msgid "Regex with Subject suffixes :" msgstr "" -#: src/lang.c:1646 +#: src/lang.c:1653 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:1651 +#: src/lang.c:1658 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1652 +#: src/lang.c:1659 msgid "MIME binary content viewer :" msgstr "" -#: src/lang.c:1653 +#: src/lang.c:1660 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:1660 +#: src/lang.c:1667 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1661 +#: src/lang.c:1668 msgid "Ask before using MIME viewer :" msgstr "" -#: src/lang.c:1662 +#: src/lang.c:1669 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:1667 +#: src/lang.c:1674 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1668 +#: src/lang.c:1675 msgid "Catchup read groups when quitting :" msgstr "" -#: src/lang.c:1669 +#: src/lang.c:1676 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1674 +#: src/lang.c:1681 msgid "Catchup group using left key :" msgstr "" -#: src/lang.c:1675 +#: src/lang.c:1682 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1680 +#: src/lang.c:1687 msgid "Catchup thread by using left key :" msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1693 msgid "Which actions require confirmation :" msgstr "" -#: src/lang.c:1687 +#: src/lang.c:1694 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1692 +#: src/lang.c:1699 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1693 +#: src/lang.c:1700 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1697 +#: src/lang.c:1704 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1698 +#: src/lang.c:1705 msgid "Program that opens URL's :" msgstr "" -#: src/lang.c:1699 +#: src/lang.c:1706 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1704 +#: src/lang.c:1711 msgid "Use mouse in xterm :" msgstr "" -#: src/lang.c:1705 +#: src/lang.c:1712 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1711 +#: src/lang.c:1718 msgid "Use scroll keys on keypad :" msgstr "" -#: src/lang.c:1712 +#: src/lang.c:1719 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1724 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1718 +#: src/lang.c:1725 msgid "Number of articles to get :" msgstr "" -#: src/lang.c:1719 +#: src/lang.c:1726 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:1724 +#: src/lang.c:1731 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1725 +#: src/lang.c:1732 msgid "Article recentness time limit :" msgstr "" -#: src/lang.c:1726 +#: src/lang.c:1733 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1730 +#: src/lang.c:1737 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1738 msgid "Wildcard matching :" msgstr "" -#: src/lang.c:1732 +#: src/lang.c:1739 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1736 +#: src/lang.c:1743 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1744 msgid "Score limit (kill) :" msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1745 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1742 +#: src/lang.c:1749 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1743 +#: src/lang.c:1750 msgid "Default score to kill articles :" msgstr "" -#: src/lang.c:1744 +#: src/lang.c:1751 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1748 +#: src/lang.c:1755 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1749 +#: src/lang.c:1756 msgid "Score limit (select) :" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1757 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1754 +#: src/lang.c:1761 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1755 +#: src/lang.c:1762 msgid "Default score to select articles :" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1763 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1769 msgid "Use slrnface to show ''X-Face:''s :" msgstr "" -#: src/lang.c:1763 +#: src/lang.c:1770 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:1771 +#: src/lang.c:1778 msgid "Use ANSI color :" msgstr "Use ANSI colour :" -#: src/lang.c:1772 +#: src/lang.c:1779 msgid "# If ON using ANSI-color\n" msgstr "# If ON using ANSI-colour\n" -#: src/lang.c:1777 +#: src/lang.c:1784 msgid "Standard foreground color :" msgstr "Standard foreground colour :" -#: src/lang.c:1778 +#: src/lang.c:1785 msgid "# Standard foreground color\n" msgstr "# Standard foreground colour\n" -#: src/lang.c:1783 +#: src/lang.c:1790 msgid "Standard background color :" msgstr "Standard background colour :" -#: src/lang.c:1784 +#: src/lang.c:1791 msgid "# Standard-Background-Color\n" msgstr "# Standard-Background-Colour\n" -#: src/lang.c:1789 +#: src/lang.c:1796 msgid "Color for inverse text (background):" msgstr "Colour for inverse text (bg) :" -#: src/lang.c:1790 +#: src/lang.c:1797 msgid "# Color of background for inverse text\n" msgstr "# Colour of background for inverse text\n" -#: src/lang.c:1795 +#: src/lang.c:1802 msgid "Color for inverse text (foreground):" msgstr "Colour for inverse text (fg) :" -#: src/lang.c:1796 +#: src/lang.c:1803 msgid "# Color of foreground for inverse text\n" msgstr "# Colour of foreground for inverse text\n" -#: src/lang.c:1801 +#: src/lang.c:1808 msgid "Color of text lines :" msgstr "Colour of text lines :" -#: src/lang.c:1802 +#: src/lang.c:1809 msgid "# Color of text-lines\n" msgstr "# Colour of text-lines\n" -#: src/lang.c:1807 +#: src/lang.c:1814 msgid "Color of mini help menu :" msgstr "Colour of mini help menu :" -#: src/lang.c:1808 +#: src/lang.c:1815 msgid "# Color of mini help menu\n" msgstr "# Colour of mini help menu\n" -#: src/lang.c:1813 +#: src/lang.c:1820 msgid "Color of help text :" msgstr "Colour of help text :" -#: src/lang.c:1814 +#: src/lang.c:1821 msgid "# Color of help pages\n" msgstr "# Colour of help pages\n" -#: src/lang.c:1819 +#: src/lang.c:1826 msgid "Color of status messages :" msgstr "Colour of status messages :" -#: src/lang.c:1820 +#: src/lang.c:1827 msgid "# Color of messages in last line\n" msgstr "# Colour of messages in last line\n" -#: src/lang.c:1825 +#: src/lang.c:1832 msgid "Color of quoted lines :" msgstr "Colour of quoted lines :" -#: src/lang.c:1826 +#: src/lang.c:1833 msgid "# Color of quote-lines\n" msgstr "# Colour of quote-lines\n" -#: src/lang.c:1831 +#: src/lang.c:1838 msgid "Color of twice quoted line :" msgstr "Colour of twice quoted line :" -#: src/lang.c:1832 +#: src/lang.c:1839 msgid "# Color of twice quoted lines\n" msgstr "# Colour of twice quoted lines\n" -#: src/lang.c:1837 +#: src/lang.c:1844 msgid "Color of =>3 times quoted line :" msgstr "Colour of =>3 times quoted line :" -#: src/lang.c:1838 +#: src/lang.c:1845 msgid "# Color of >=3 times quoted lines\n" msgstr "# Colour of >=3 times quoted lines\n" -#: src/lang.c:1843 +#: src/lang.c:1850 msgid "Color of article header lines :" msgstr "Colour of article header lines :" -#: src/lang.c:1844 +#: src/lang.c:1851 msgid "# Color of header-lines\n" msgstr "# Colour of header-lines\n" -#: src/lang.c:1849 +#: src/lang.c:1856 msgid "Color of actual news header fields :" msgstr "Colour of actual news header fields:" -#: src/lang.c:1850 +#: src/lang.c:1857 msgid "# Color of actual news header fields\n" msgstr "# Colour of actual news header fields\n" -#: src/lang.c:1855 +#: src/lang.c:1862 msgid "Color of article subject lines :" msgstr "Colour of article subject lines :" -#: src/lang.c:1856 +#: src/lang.c:1863 msgid "# Color of article subject\n" msgstr "# Colour of article subject\n" -#: src/lang.c:1861 +#: src/lang.c:1868 msgid "Color of response counter :" msgstr "Colour of response counter :" -#: src/lang.c:1862 +#: src/lang.c:1869 msgid "# Color of response counter\n" msgstr "# Colour of response counter\n" -#: src/lang.c:1867 +#: src/lang.c:1874 msgid "Color of sender (From:) :" msgstr "Colour of sender (From:) :" -#: src/lang.c:1868 +#: src/lang.c:1875 msgid "# Color of sender (From:)\n" msgstr "# Colour of sender (From:)\n" -#: src/lang.c:1873 +#: src/lang.c:1880 msgid "Color of help/mail sign :" msgstr "Colour of help/mail sign :" -#: src/lang.c:1874 +#: src/lang.c:1881 msgid "# Color of Help/Mail-Sign\n" msgstr "# Colour of Help/Mail-Sign\n" -#: src/lang.c:1879 +#: src/lang.c:1886 msgid "Color of signatures :" msgstr "Colour of signatures :" -#: src/lang.c:1880 +#: src/lang.c:1887 msgid "# Color of signature\n" msgstr "# Colour of signature\n" -#: src/lang.c:1885 +#: src/lang.c:1892 msgid "Color of highlighting with *stars* :" msgstr "Colour of highlighting with *stars*:" -#: src/lang.c:1886 +#: src/lang.c:1893 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:1892 +#: src/lang.c:1899 msgid "Color of highlighting with _dash_ :" msgstr "Colour of highlighting with _dash_ :" -#: src/lang.c:1898 +#: src/lang.c:1905 msgid "Color of highlighting with /slash/ :" msgstr "Colour of highlighting with /slash/:" -#: src/lang.c:1904 +#: src/lang.c:1911 msgid "Color of highlighting with -stroke-:" msgstr "Colour of highlighting w. -stroke- :" -#: src/lang.c:1911 +#: src/lang.c:1918 msgid "Attr. of highlighting with *stars* :" msgstr "" -#: src/lang.c:1912 +#: src/lang.c:1919 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -4927,85 +4945,93 @@ msgid "# Attribute of word highlighting "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1922 +#: src/lang.c:1929 msgid "Attr. of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1928 +#: src/lang.c:1935 msgid "Attr. of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1934 +#: src/lang.c:1941 msgid "Attr. of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1947 +msgid "URL highlighting in message body :" +msgstr "" + +#: src/lang.c:1948 +msgid "# Enable URL highlighting?\n" +msgstr "" + +#: src/lang.c:1953 msgid "Word highlighting in message body :" msgstr "" -#: src/lang.c:1941 +#: src/lang.c:1954 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1959 msgid "What to display instead of mark :" msgstr "" -#: src/lang.c:1947 +#: src/lang.c:1960 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:1953 +#: src/lang.c:1966 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1967 msgid "Page line wrap column :" msgstr "" -#: src/lang.c:1955 +#: src/lang.c:1968 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1960 +#: src/lang.c:1973 msgid "Wrap around threads on next unread :" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:1974 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1965 +#: src/lang.c:1978 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1966 +#: src/lang.c:1979 msgid "Mail address (and fullname) :" msgstr "" -#: src/lang.c:1967 +#: src/lang.c:1980 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:1972 +#: src/lang.c:1985 msgid "Show empty Followup-To in editor :" msgstr "" -#: src/lang.c:1973 +#: src/lang.c:1986 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:1977 +#: src/lang.c:1990 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:1978 +#: src/lang.c:1991 msgid "Create signature from path/command :" msgstr "" -#: src/lang.c:1979 +#: src/lang.c:1992 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 " @@ -5013,48 +5039,48 @@ msgid "# Signature path (random sigs)/fi "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1999 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:1987 +#: src/lang.c:2000 msgid "Prepend signature with \"-- \" :" msgstr "" -#: src/lang.c:1988 +#: src/lang.c:2001 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:2005 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:2006 msgid "Add signature when reposting :" msgstr "" -#: src/lang.c:1994 +#: src/lang.c:2007 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:1998 +#: src/lang.c:2011 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:1999 +#: src/lang.c:2012 msgid "Characters used as quote-marks :" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2013 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:2006 +#: src/lang.c:2019 msgid "Quoting behavior :" msgstr "Quoting behaviour :" -#: src/lang.c:2007 +#: src/lang.c:2020 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5066,49 +5092,49 @@ msgid "# How quoting should be handled w "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2019 src/lang.c:2027 src/lang.c:2033 +#: src/lang.c:2032 src/lang.c:2040 src/lang.c:2046 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2020 +#: src/lang.c:2033 msgid "Quote line when following up :" msgstr "" -#: src/lang.c:2021 +#: src/lang.c:2034 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:2028 +#: src/lang.c:2041 msgid "Quote line when cross-posting :" msgstr "" -#: src/lang.c:2034 +#: src/lang.c:2047 msgid "Quote line when mailing :" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2052 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2040 +#: src/lang.c:2053 msgid "Insert 'User-Agent:'-header :" msgstr "" -#: src/lang.c:2041 +#: src/lang.c:2054 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2058 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2046 +#: src/lang.c:2059 msgid "MM_CHARSET :" msgstr "" -#: src/lang.c:2047 +#: src/lang.c:2060 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" @@ -5117,27 +5143,27 @@ msgid "# Charset supported locally which "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2058 +#: src/lang.c:2071 msgid "MM_NETWORK_CHARSET :" msgstr "" -#: src/lang.c:2059 +#: src/lang.c:2072 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2065 +#: src/lang.c:2078 msgid "Mailbox format :" msgstr "" -#: src/lang.c:2066 +#: src/lang.c:2079 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2084 msgid "MIME encoding in news messages :" msgstr "" -#: src/lang.c:2072 +#: src/lang.c:2085 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" @@ -5145,42 +5171,42 @@ msgid "# MIME encoding (8bit, base64, qu "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2080 src/lang.c:2101 +#: src/lang.c:2093 src/lang.c:2114 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2081 +#: src/lang.c:2094 msgid "Use 8bit characters in news headers:" msgstr "" -#: src/lang.c:2082 +#: src/lang.c:2095 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:2089 +#: src/lang.c:2102 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2103 msgid "View post-processed files :" msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2104 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2096 +#: src/lang.c:2109 msgid "MIME encoding in mail messages :" msgstr "" -#: src/lang.c:2102 +#: src/lang.c:2115 msgid "Use 8bit characters in mail headers:" msgstr "" -#: src/lang.c:2103 +#: src/lang.c:2116 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 " @@ -5190,351 +5216,352 @@ msgid "# If ON, 8bit characters in mail "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2113 +#: src/lang.c:2126 msgid "Strip blanks from ends of lines :" msgstr "" -#: src/lang.c:2114 +#: src/lang.c:2127 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2119 +#: src/lang.c:2132 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2120 +#: src/lang.c:2133 msgid "Transliteration :" msgstr "" -#: src/lang.c:2121 +#: src/lang.c:2134 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:2128 +#: src/lang.c:2141 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2129 +#: src/lang.c:2142 msgid "Send you a cc automatically :" msgstr "" -#: src/lang.c:2130 +#: src/lang.c:2143 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2147 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2135 +#: src/lang.c:2148 msgid "Send you a blind cc automatically :" msgstr "" -#: src/lang.c:2136 +#: src/lang.c:2149 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2153 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2141 +#: src/lang.c:2154 msgid "Spamtrap warning address parts :" msgstr "" -#: src/lang.c:2142 +#: src/lang.c:2155 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:2147 +#: src/lang.c:2160 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2148 +#: src/lang.c:2161 msgid "No. of days a filter entry is valid:" msgstr "" -#: src/lang.c:2149 +#: src/lang.c:2162 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2153 +#: src/lang.c:2166 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2154 +#: src/lang.c:2167 msgid "Add posted articles to filter :" msgstr "" -#: src/lang.c:2155 +#: src/lang.c:2168 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2159 +#: src/lang.c:2172 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2160 +#: src/lang.c:2173 msgid "Mail directory :" msgstr "" -#: src/lang.c:2161 +#: src/lang.c:2174 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2166 +#: src/lang.c:2179 msgid "Save articles in batch mode (-S) :" msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2180 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:2172 +#: src/lang.c:2185 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2186 msgid "Directory to save arts/threads in :" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2187 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2178 +#: src/lang.c:2191 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "" -#: src/lang.c:2179 +#: src/lang.c:2192 msgid "Use Archive-name: header for save :" msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2193 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:2185 +#: src/lang.c:2198 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2186 +#: src/lang.c:2199 msgid "Mark saved articles/threads as read:" msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2200 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2204 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2192 +#: src/lang.c:2205 msgid "Post process saved articles :" msgstr "" -#: src/lang.c:2193 +#: src/lang.c:2206 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:2199 +#: src/lang.c:2212 msgid "Process only unread articles :" msgstr "" -#: src/lang.c:2200 +#: src/lang.c:2213 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "" -#: src/lang.c:2205 +#: src/lang.c:2218 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2206 +#: src/lang.c:2219 msgid "Print all headers when printing :" msgstr "" -#: src/lang.c:2207 +#: src/lang.c:2220 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2224 msgid "The printer program with options that is to be used to print articles/threads." msgstr "" -#: src/lang.c:2212 +#: src/lang.c:2225 msgid "Printer program with options :" msgstr "" -#: src/lang.c:2213 +#: src/lang.c:2226 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2219 +#: src/lang.c:2232 msgid "Force redraw after certain commands:" msgstr "" -#: src/lang.c:2220 +#: src/lang.c:2233 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2237 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2225 +#: src/lang.c:2238 msgid "Start editor with line offset :" msgstr "" -#: src/lang.c:2226 +#: src/lang.c:2239 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:2231 +#: src/lang.c:2244 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2232 +#: src/lang.c:2245 msgid "Invocation of your editor :" msgstr "" -#: src/lang.c:2233 +#: src/lang.c:2246 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2238 +#: src/lang.c:2251 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2239 +#: src/lang.c:2252 msgid "External inews :" msgstr "" -#: src/lang.c:2240 +#: src/lang.c:2253 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:2244 +#: src/lang.c:2257 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2245 +#: src/lang.c:2258 msgid "Invocation of your mail command :" msgstr "" -#: src/lang.c:2246 +#: src/lang.c:2259 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename %%U User (AmigaDOS)\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" msgstr "" -#: src/lang.c:2254 +#: src/lang.c:2267 msgid "Use interactive mail reader :" msgstr "" -#: src/lang.c:2255 -msgid "# Interactive mailreader: if ON mailreader will be invoked earlier for\n" - "# reply so you can use more of its features (eg. MIME, pgp, ...)\n" - "# this option has to suit default_mailer_format\n" +#: src/lang.c:2268 +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:2262 +#: src/lang.c:2276 msgid "Remove ~/.article after posting :" msgstr "" -#: src/lang.c:2263 +#: src/lang.c:2277 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2267 +#: src/lang.c:2281 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2268 +#: src/lang.c:2282 msgid "Filename for posted articles :" msgstr "" -#: src/lang.c:2269 +#: src/lang.c:2283 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:2274 +#: src/lang.c:2288 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2275 +#: src/lang.c:2289 msgid "Keep failed arts in ~/dead.articles:" msgstr "" -#: src/lang.c:2276 +#: src/lang.c:2290 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2280 +#: src/lang.c:2294 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2281 +#: src/lang.c:2295 msgid "No unsubscribed groups in newsrc :" msgstr "" -#: src/lang.c:2282 +#: src/lang.c:2296 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2287 +#: src/lang.c:2301 msgid "Remove bogus groups from newsrc :" msgstr "" -#: src/lang.c:2288 +#: src/lang.c:2302 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:2292 +#: src/lang.c:2306 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2293 +#: src/lang.c:2307 msgid "Interval in secs to reread active :" msgstr "" -#: src/lang.c:2294 +#: src/lang.c:2308 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2299 +#: src/lang.c:2313 msgid "Reconnect to server automatically :" msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2314 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2304 +#: src/lang.c:2318 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2305 +#: src/lang.c:2319 msgid "Cache NNTP overview files locally :" msgstr "" -#: src/lang.c:2306 +#: src/lang.c:2320 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" @@ -5793,7 +5820,7 @@ msgstr "" msgid "couldn't expand %s\n" msgstr "" -#: src/open.c:1032 +#: src/open.c:1123 msgid "Unreachable?\n" msgstr "" @@ -5802,13 +5829,13 @@ msgstr "" msgid "%s is bogus" msgstr "" -#: src/post.c:1940 +#: src/post.c:1936 #, c-format msgid "Posting: %.*s ..." msgstr "" #. TODO: -> lang.c -#: src/post.c:4038 +#: src/post.c:4034 #, c-format msgid "Rereading %s..." msgstr "" Binary files tin-1.7.0/po/et.gmo and tin-1.7.1/po/et.gmo differ diff -Nurp tin-1.7.0/po/et.po tin-1.7.1/po/et.po --- tin-1.7.0/po/et.po Sun Aug 10 16:30:38 2003 +++ tin-1.7.1/po/et.po Thu Sep 18 18:32:21 2003 @@ -3,8 +3,8 @@ # Toomas Soome , 2003. # msgid "" -msgstr "Project-Id-Version: tin 1.6.0\n" - "POT-Creation-Date: 2003-08-10 16:30+0200\n" +msgstr "Project-Id-Version: tin 1.7.0\n" + "POT-Creation-Date: 2003-09-18 18:31+0200\n" "PO-Revision-Date: 2003-07-15 11:07+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -12,6 +12,11 @@ msgstr "Project-Id-Version: tin 1.6.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" +#: src/art.c:1228 +#, c-format +msgid "%d Bad overview record (%d fields) '%s'" +msgstr "" + #: src/attrib.c:574 msgid "# Do not edit this comment block\n" "#\n" @@ -213,7 +218,7 @@ msgstr "# *binaarfailidel* sea täielik j msgid "# and set Followup-To: poster\n" msgstr "# ja sea Followup-To: postitaja\n" -#: src/cook.c:798 +#: src/cook.c:799 msgid "(unknown)" msgstr "(tundmatu)" @@ -879,7 +884,7 @@ msgstr "\n" msgid "Insecure permissions of %s (%o)" msgstr "Ebaturvalised õigused failil %s (%o)" -#: src/lang.c:199 src/open.c:1009 +#: src/lang.c:199 src/open.c:1100 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "Vigane vastus GROUP käsule, %s" @@ -894,8 +899,8 @@ msgid "MIME parse error: Start boundary msgstr "MIME parsimise viga: Algas eraldaja aga loen alles päiseid" #: src/lang.c:203 -msgid "Can't get a (fully-qualified) domain-name!\n" -msgstr "Ei õnnestu saada (täis) doomeninime!\n" +msgid "Can't get a (fully-qualified) domain-name!" +msgstr "Ei õnnestu saada (täis) doomeninime!" #: src/lang.c:204 #, c-format @@ -4188,136 +4193,152 @@ msgstr "Tsiteeri allkirju ja tühje ridu" msgid "Comp. q., quote sigs & empty lines" msgstr "Tihenda tsitaate, tsiteeri allkirju ja tühje ridu" +# TRANSLATION MISSING #: src/lang.c:1290 +msgid "no" +msgstr "" + +# TRANSLATION MISSING +#: src/lang.c:1291 +msgid "with headers" +msgstr "" + +# TRANSLATION MISSING +#: src/lang.c:1292 +msgid "without headers" +msgstr "" + +#: src/lang.c:1297 msgid "Display Options" msgstr "Ekraani seaded" -#: src/lang.c:1296 +#: src/lang.c:1303 msgid "Color Options" msgstr "Värvide seaded" -#: src/lang.c:1302 +#: src/lang.c:1309 msgid "Article-Limiting Options" msgstr "Artikli piirangute seaded" -#: src/lang.c:1308 +#: src/lang.c:1315 msgid "Posting/Mailing Options" msgstr "Postitamise/saatmise seaded" -#: src/lang.c:1314 +#: src/lang.c:1321 msgid "Saving/Printing Options" msgstr "Salvestamise/trükkimise seaded" -#: src/lang.c:1320 +#: src/lang.c:1327 msgid "Expert Options" msgstr "Ekspertseaded" -#: src/lang.c:1326 +#: src/lang.c:1333 msgid "Filtering Options" msgstr "Filtreerimise seaded" -#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 src/lang.c:1402 -#: src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 src/lang.c:1511 src/lang.c:1673 -#: src/lang.c:1679 src/lang.c:1685 src/lang.c:1691 src/lang.c:1703 src/lang.c:1710 -#: src/lang.c:1761 src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788 -#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 src/lang.c:1818 -#: src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 src/lang.c:1842 src/lang.c:1848 -#: src/lang.c:1854 src/lang.c:1860 src/lang.c:1866 src/lang.c:1872 src/lang.c:1878 -#: src/lang.c:1884 src/lang.c:1891 src/lang.c:1897 src/lang.c:1903 src/lang.c:1910 -#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 src/lang.c:1945 -#: src/lang.c:1959 src/lang.c:1971 src/lang.c:2005 src/lang.c:2057 src/lang.c:2064 -#: src/lang.c:2070 src/lang.c:2095 src/lang.c:2112 src/lang.c:2165 src/lang.c:2198 -#: src/lang.c:2218 src/lang.c:2253 src/lang.c:2261 src/lang.c:2286 src/lang.c:2298 +#: src/lang.c:1338 src/lang.c:1364 src/lang.c:1370 src/lang.c:1377 src/lang.c:1409 +#: src/lang.c:1415 src/lang.c:1423 src/lang.c:1443 src/lang.c:1518 src/lang.c:1680 +#: src/lang.c:1686 src/lang.c:1692 src/lang.c:1698 src/lang.c:1710 src/lang.c:1717 +#: src/lang.c:1768 src/lang.c:1777 src/lang.c:1783 src/lang.c:1789 src/lang.c:1795 +#: src/lang.c:1801 src/lang.c:1807 src/lang.c:1813 src/lang.c:1819 src/lang.c:1825 +#: src/lang.c:1831 src/lang.c:1837 src/lang.c:1843 src/lang.c:1849 src/lang.c:1855 +#: src/lang.c:1861 src/lang.c:1867 src/lang.c:1873 src/lang.c:1879 src/lang.c:1885 +#: src/lang.c:1891 src/lang.c:1898 src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 +#: src/lang.c:1928 src/lang.c:1934 src/lang.c:1940 src/lang.c:1946 src/lang.c:1952 +#: src/lang.c:1958 src/lang.c:1972 src/lang.c:1984 src/lang.c:2018 src/lang.c:2070 +#: src/lang.c:2077 src/lang.c:2083 src/lang.c:2108 src/lang.c:2125 src/lang.c:2178 +#: src/lang.c:2211 src/lang.c:2231 src/lang.c:2266 src/lang.c:2275 src/lang.c:2300 +#: src/lang.c:2312 msgid " toggles, sets, cancels." msgstr " lülitab, seab, katkestab." -#: src/lang.c:1332 +#: src/lang.c:1339 msgid "Show mini menu & posting etiquette :" msgstr "Näita minimenüüd & post. etiketti :" -#: src/lang.c:1333 +#: src/lang.c:1340 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:1338 +#: src/lang.c:1345 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Näita gruppide lühikirjeldusi. lülitab ja seab." -#: src/lang.c:1339 +#: src/lang.c:1346 msgid "Show description of each newsgroup :" msgstr "Näita iga grupi lühikirjeldust :" -#: src/lang.c:1340 +#: src/lang.c:1347 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:1345 +#: src/lang.c:1352 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:1346 +#: src/lang.c:1353 msgid "In group menu, show author by :" msgstr "Näita grupimenüüs autorit :" -#: src/lang.c:1347 +#: src/lang.c:1354 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:1351 +#: src/lang.c:1358 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Märgi valik -> või heleda ribaga. lülitab, seab." -#: src/lang.c:1352 +#: src/lang.c:1359 msgid "Draw -> instead of highlighted bar :" msgstr "Joonista -> heleda riba asemel :" -#: src/lang.c:1353 +#: src/lang.c:1360 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:1358 +#: src/lang.c:1365 msgid "Use inverse video for page headers :" msgstr "Kasuta päistel pööratud videot :" -#: src/lang.c:1359 +#: src/lang.c:1366 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:1364 +#: src/lang.c:1371 msgid "Thread articles by :" msgstr "Artiklite teemadesse jagamine :" -#: src/lang.c:1365 +#: src/lang.c:1372 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:1371 +#: src/lang.c:1378 msgid "Score of a thread :" msgstr "Teema kaal :" -#: src/lang.c:1372 +#: src/lang.c:1379 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "# Teema kaal 0=(Maksimum) 1=(Summa) 2=(Keskmine)\n" -#: src/lang.c:1376 +#: src/lang.c:1383 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:1377 +#: src/lang.c:1384 msgid "Sort articles by :" msgstr "Artiklite järjestus :" -#: src/lang.c:1378 +#: src/lang.c:1385 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" @@ -4325,57 +4346,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:1384 +#: src/lang.c:1391 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:1385 +#: src/lang.c:1392 msgid "Sort threads by :" msgstr "Teemade järjestus :" -#: src/lang.c:1386 +#: src/lang.c:1393 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:1390 +#: src/lang.c:1397 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:1391 +#: src/lang.c:1398 msgid "Goto first unread article in group :" msgstr "Mine grupis esimesele lugemata art.:" -#: src/lang.c:1392 +#: src/lang.c:1399 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:1396 +#: src/lang.c:1403 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:1397 +#: src/lang.c:1404 msgid "Show only unread articles :" msgstr "Näita ainult lugemata artikleid :" -#: src/lang.c:1398 +#: src/lang.c:1405 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:1403 +#: src/lang.c:1410 msgid "Show only groups with unread arts :" msgstr "Ainult lugemata artiklitega grupid :" -#: src/lang.c:1404 +#: src/lang.c:1411 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:1409 +#: src/lang.c:1416 msgid "Filter which articles :" msgstr "Filtreeri artikleid :" -#: src/lang.c:1410 +#: src/lang.c:1417 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" @@ -4383,212 +4404,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:1417 +#: src/lang.c:1424 msgid "Tab goes to next unread article :" msgstr "Tab viib järgmisele lugemata art. :" -#: src/lang.c:1418 +#: src/lang.c:1425 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:1422 +#: src/lang.c:1429 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:1423 +#: src/lang.c:1430 msgid "Space goes to next unread article :" msgstr "Tühik viib järgmisele lugemata art.:" -#: src/lang.c:1424 +#: src/lang.c:1431 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:1429 +#: src/lang.c:1436 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:1430 +#: src/lang.c:1437 msgid "PgDn goes to next unread article :" msgstr "PgDn viib järgmisele lugemata art. :" -#: src/lang.c:1431 +#: src/lang.c:1438 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:1437 +#: src/lang.c:1444 msgid "List thread using right arrow key :" msgstr "Nool paremale näitab teema loendit :" -#: src/lang.c:1438 +#: src/lang.c:1445 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:1442 +#: src/lang.c:1449 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Sisestage sümbol kustutatud artiklite märkimiseks. seab, katkestab." -#: src/lang.c:1443 +#: src/lang.c:1450 msgid "Character to show deleted articles :" msgstr "Kustutatud artiklite marker :" -#: src/lang.c:1444 +#: src/lang.c:1451 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:1449 +#: src/lang.c:1456 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:1450 +#: src/lang.c:1457 msgid "Character to show inrange articles :" msgstr "Artiklite vahemiku marker :" -#: src/lang.c:1451 +#: src/lang.c:1458 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:1456 +#: src/lang.c:1463 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "Sisestage tagasituleva artikli marker. seab, katkestab." -#: src/lang.c:1457 +#: src/lang.c:1464 msgid "Character to show returning arts :" msgstr "Tagasi tulnud artiklite marker :" -#: src/lang.c:1458 +#: src/lang.c:1465 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:1463 +#: src/lang.c:1470 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1464 +#: src/lang.c:1471 msgid "Character to show selected articles:" msgstr "Valitud artiklite marker :" -#: src/lang.c:1465 +#: src/lang.c:1472 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:1470 +#: src/lang.c:1477 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "Sisestage värskeid artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1471 +#: src/lang.c:1478 msgid "Character to show recent articles :" msgstr "Värskete artiklite marker :" -#: src/lang.c:1472 +#: src/lang.c:1479 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:1477 +#: src/lang.c:1484 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "Sisestage lugemata artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1478 +#: src/lang.c:1485 msgid "Character to show unread articles :" msgstr "Lugemata artiklite marker :" -#: src/lang.c:1479 +#: src/lang.c:1486 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:1484 +#: src/lang.c:1491 msgid "Enter character to indicate read articles. sets, cancels." msgstr "Sisestage loetud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1485 +#: src/lang.c:1492 msgid "Character to show read articles :" msgstr "Loetud artiklite marker :" -#: src/lang.c:1486 +#: src/lang.c:1493 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:1491 +#: src/lang.c:1498 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "Sisestage surmatud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1492 +#: src/lang.c:1499 msgid "Character to show killed articles :" msgstr "Surmatud artiklite marker :" -#: src/lang.c:1493 +#: src/lang.c:1500 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:1498 +#: src/lang.c:1505 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." -#: src/lang.c:1499 +#: src/lang.c:1506 msgid "Character to show readselected arts:" msgstr "Lugemiseks valitud artiklite marker:" -#: src/lang.c:1500 +#: src/lang.c:1507 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:1505 +#: src/lang.c:1512 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "Sisestage maksimaalne näidatav grupi nime pikkus. seab." -#: src/lang.c:1506 +#: src/lang.c:1513 msgid "Max. length of group names shown :" msgstr "Maksimaalne grupinime pikkus :" -#: src/lang.c:1507 +#: src/lang.c:1514 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maksimaalne grupi nime pikkus, mida näidatakse ekraanil\n" -#: src/lang.c:1512 +#: src/lang.c:1519 msgid "Show lines/score in listings :" msgstr "Näita loendis artikli kaalu/ridu :" -#: src/lang.c:1513 +#: src/lang.c:1520 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:1518 +#: src/lang.c:1525 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:1519 +#: src/lang.c:1526 msgid "Number of lines to scroll in pager :" msgstr "Lehitsejas keritavate ridade arv :" -#: src/lang.c:1520 +#: src/lang.c:1527 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" @@ -4598,27 +4619,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:1527 +#: src/lang.c:1534 msgid "Display signatures. toggles & sets." msgstr "Näita signatuure, lülitab, seab." -#: src/lang.c:1528 +#: src/lang.c:1535 msgid "Display signatures :" msgstr "Näita signatuure :" -#: src/lang.c:1529 +#: src/lang.c:1536 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:1533 +#: src/lang.c:1540 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "Näita uuenkodeeritud andmeid märgitud lisadena. lülitab ja seab." -#: src/lang.c:1534 +#: src/lang.c:1541 msgid "Display uue data as an attachment :" msgstr "Näita uuenk. andmeid lisadena :" -#: src/lang.c:1535 +#: src/lang.c:1542 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" @@ -4633,30 +4654,30 @@ msgstr "# uuenkodeeritud andmete käsitle "# märgituna.\n" # -#: src/lang.c:1544 +#: src/lang.c:1551 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:1545 +#: src/lang.c:1552 msgid "Display \"a as Umlaut-a :" msgstr "Näita \"a kui Umlaut-a :" -#: src/lang.c:1546 +#: src/lang.c:1553 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:1551 src/lang.c:1561 +#: src/lang.c:1558 src/lang.c:1568 msgid "Space separated list of header fields" msgstr "Tühikuga eraldatud päised" -#: src/lang.c:1552 +#: src/lang.c:1559 msgid "Display these header fields (or *) :" msgstr "Näita neid päiseid (või *) :" -#: src/lang.c:1553 +#: src/lang.c:1560 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" @@ -4671,11 +4692,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:1562 +#: src/lang.c:1569 msgid "Do not display these header fields :" msgstr "Ära näita neid päiseridu :" -#: src/lang.c:1563 +#: src/lang.c:1570 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 " @@ -4693,28 +4714,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:1573 +#: src/lang.c:1580 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:1574 +#: src/lang.c:1581 msgid "Skip multipart/alternative parts :" msgstr "Jäta multipart/alternative osad :" -#: src/lang.c:1575 +#: src/lang.c:1582 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:1580 +#: src/lang.c:1587 msgid "A regex used to decide which lines to show in col_quote." msgstr "Regulaaravaldis otsustamaks, milliseid ridu tsitaatides näidata." -#: src/lang.c:1581 +#: src/lang.c:1588 msgid "Regex used to show quoted lines :" msgstr "Tsiteeritud ridade näitamise regex :" -#: src/lang.c:1582 +#: src/lang.c:1589 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" @@ -4722,15 +4743,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:1588 +#: src/lang.c:1595 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:1589 +#: src/lang.c:1596 msgid "Regex used to show twice quoted l. :" msgstr "Topelt tsiteeritud ridu näitav reg :" -#: src/lang.c:1590 +#: src/lang.c:1597 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" @@ -4739,15 +4760,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:1596 +#: src/lang.c:1603 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:1597 +#: src/lang.c:1604 msgid "Regex used to show >= 3 times q.l. :" msgstr ">= 3 tsiteeritud ridu näitav reg :" -#: src/lang.c:1598 +#: src/lang.c:1605 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" @@ -4756,15 +4777,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:1605 +#: src/lang.c:1612 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:1606 +#: src/lang.c:1613 msgid "Regex used to highlight /slashes/ :" msgstr "Regex et esile tõsta /kaldkriipse/ :" -#: src/lang.c:1607 +#: src/lang.c:1614 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" @@ -4772,15 +4793,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:1613 +#: src/lang.c:1620 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:1614 +#: src/lang.c:1621 msgid "Regex used to highlight *stars* :" msgstr "Regex et esile tõsta *tärne* :" -#: src/lang.c:1615 +#: 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_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4788,15 +4809,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:1621 +#: src/lang.c:1628 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:1622 +#: src/lang.c:1629 msgid "Regex used to highlight -strokes- :" msgstr "Regex et esile tõsta -kriipse- :" -#: src/lang.c:1623 +#: 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_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4804,15 +4825,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:1629 +#: src/lang.c:1636 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:1630 +#: src/lang.c:1637 msgid "Regex used to highlight _underline_:" msgstr "Regex et esile tõsta _alakriipse_ :" -#: src/lang.c:1631 +#: 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_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" @@ -4820,44 +4841,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:1637 +#: src/lang.c:1644 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "Regulaaravaldis eemaldatava teema prefiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:1638 +#: src/lang.c:1645 msgid "Regex with Subject prefixes :" msgstr "Regex teema prefiksi leidmiseks :" -#: src/lang.c:1639 +#: src/lang.c:1646 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:1644 +#: src/lang.c:1651 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "Regulaaravaldis eemaldatava teema sufiksi leidmiseks. Eraldajaks on '|'." -#: src/lang.c:1645 +#: src/lang.c:1652 msgid "Regex with Subject suffixes :" msgstr "Regex teema sufiksi leidmiseks :" -#: src/lang.c:1646 +#: src/lang.c:1653 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:1651 +#: src/lang.c:1658 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:1652 +#: src/lang.c:1659 msgid "MIME binary content viewer :" msgstr "MIME kahendsisu lehitseja :" -#: src/lang.c:1653 +#: src/lang.c:1660 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" @@ -4867,371 +4888,372 @@ 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:1660 +#: src/lang.c:1667 msgid "Confirm before starting non-text viewing program" msgstr "Küsi enne mitte-tekstiliste osade vaatamist kinnitust" -#: src/lang.c:1661 +#: src/lang.c:1668 msgid "Ask before using MIME viewer :" msgstr "Küsi MIME lehitseja kasutamise luba:" -#: src/lang.c:1662 +#: src/lang.c:1669 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:1667 +#: src/lang.c:1674 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:1668 +#: src/lang.c:1675 msgid "Catchup read groups when quitting :" msgstr "Väljumisel märkida grupid loetuks :" -#: src/lang.c:1669 +#: src/lang.c:1676 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:1674 +#: src/lang.c:1681 msgid "Catchup group using left key :" msgstr "Nool vasakule märgib grupi loetuks :" -#: src/lang.c:1675 +#: src/lang.c:1682 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:1680 +#: src/lang.c:1687 msgid "Catchup thread by using left key :" msgstr "Nool vasakule märgib teema loetuks :" # TRANSLATION TOO LONG -#: src/lang.c:1686 +#: src/lang.c:1693 msgid "Which actions require confirmation :" msgstr "Millised tegevused nõuavad kinnitust:" -#: src/lang.c:1687 +#: src/lang.c:1694 msgid "# What should we ask confirmation for.\n" msgstr "# Millele me peaksime küsima kinnitust.\n" # TRANSLATION MISSING -#: src/lang.c:1692 +#: src/lang.c:1699 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1693 +# TRANSLATION MISSING +#: src/lang.c:1700 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1697 +#: src/lang.c:1704 msgid "Program to run to open URL's, sets, cancels." msgstr "Programm URLide avamiseks, seab, katkestab." -#: src/lang.c:1698 +#: src/lang.c:1705 msgid "Program that opens URL's :" msgstr "Programm URLide avamiseks :" -#: src/lang.c:1699 +#: src/lang.c:1706 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:1704 +#: src/lang.c:1711 msgid "Use mouse in xterm :" msgstr "Kasuta xterm aknas hiirt :" -#: src/lang.c:1705 +#: src/lang.c:1712 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:1711 +#: src/lang.c:1718 msgid "Use scroll keys on keypad :" msgstr "Kasuta kerimisnuppe :" -#: src/lang.c:1712 +#: src/lang.c:1719 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:1717 +#: src/lang.c:1724 msgid "Enter maximum number of article to get. sets." msgstr "Sisestage suurim laetavate artiklite arv. seab." -#: src/lang.c:1718 +#: src/lang.c:1725 msgid "Number of articles to get :" msgstr "Laetavate artiklite arv :" -#: src/lang.c:1719 +#: src/lang.c:1726 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:1724 +#: src/lang.c:1731 msgid "Enter number of days article is considered recent. sets." msgstr "Sisestage artikli värskuse kestus. seab." -#: src/lang.c:1725 +#: src/lang.c:1732 msgid "Article recentness time limit :" msgstr "Artikli värskuse ajapiir :" -#: src/lang.c:1726 +#: src/lang.c:1733 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:1730 +#: src/lang.c:1737 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "WILDMAT tavalistele jokkeritele, REGEX täisregulaaravaldistega otsimisele." -#: src/lang.c:1731 +#: src/lang.c:1738 msgid "Wildcard matching :" msgstr "Jokkeritega otsimine :" -#: src/lang.c:1732 +#: src/lang.c:1739 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "# Jokkeritega otsimine 0=(wildmat) 1=(regex)\n" -#: src/lang.c:1736 +#: src/lang.c:1743 msgid "Enter minimal score before an article is marked killed. sets." msgstr "Sisestage minimaalne kaal artikli surmamiseks. seab." -#: src/lang.c:1737 +#: src/lang.c:1744 msgid "Score limit (kill) :" msgstr "Kaalu alampiir (surmamine) :" -#: src/lang.c:1738 +#: src/lang.c:1745 msgid "# Score limit before an article is marked killed\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse surmatuks\n" -#: src/lang.c:1742 +#: src/lang.c:1749 msgid "Enter default score to kill articles. sets." msgstr "Sisestage vaikimisi kaal artiklite surmamiseks. seab." # TRANSLATION TOO LONG -#: src/lang.c:1743 +#: src/lang.c:1750 msgid "Default score to kill articles :" msgstr "Vaikimisi kaal artiklite surmamiseks:" -#: src/lang.c:1744 +#: src/lang.c:1751 msgid "# Default score to kill articles\n" msgstr "# Vaikimisi kaal artiklite surmamiseks\n" -#: src/lang.c:1748 +#: src/lang.c:1755 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:1749 +#: src/lang.c:1756 msgid "Score limit (select) :" msgstr "Kaalu alampiir (valik) :" -#: src/lang.c:1750 +#: src/lang.c:1757 msgid "# Score limit before an article is marked hot\n" msgstr "# Kaalu alampiir, enne kui artikkel märgitakse muumaks\n" -#: src/lang.c:1754 +#: src/lang.c:1761 msgid "Enter default score to select articles. sets." msgstr "Sisestage vaikimisi kaal artiklite valimiseks. seab." -#: src/lang.c:1755 +#: src/lang.c:1762 msgid "Default score to select articles :" msgstr "Vaikimisi kaal artiklite valimiseks:" -#: src/lang.c:1756 +#: src/lang.c:1763 msgid "# Default score to select articles\n" msgstr "# Vaikimisi kaal artiklite valimiseks\n" # TRANSLATION TOO LONG -#: src/lang.c:1762 +#: src/lang.c:1769 msgid "Use slrnface to show ''X-Face:''s :" msgstr "Et näidata ''X-Face:'', kasutage slrnface:" -#: src/lang.c:1763 +#: src/lang.c:1770 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:1771 +#: src/lang.c:1778 msgid "Use ANSI color :" msgstr "Kasuta ANSI värve :" -#: src/lang.c:1772 +#: src/lang.c:1779 msgid "# If ON using ANSI-color\n" msgstr "# Kui väärtus on ON, kasuta ANSI värve\n" -#: src/lang.c:1777 +#: src/lang.c:1784 msgid "Standard foreground color :" msgstr "Standardne esiplaani värv :" -#: src/lang.c:1778 +#: src/lang.c:1785 msgid "# Standard foreground color\n" msgstr "# Standardne esiplaani värv\n" -#: src/lang.c:1783 +#: src/lang.c:1790 msgid "Standard background color :" msgstr "Standardne tagaplaani värv :" -#: src/lang.c:1784 +#: src/lang.c:1791 msgid "# Standard-Background-Color\n" msgstr "# Standardne tagaplaani värv\n" -#: src/lang.c:1789 +#: src/lang.c:1796 msgid "Color for inverse text (background):" msgstr "Pööratud teksti värv (tagaplaan) :" -#: src/lang.c:1790 +#: src/lang.c:1797 msgid "# Color of background for inverse text\n" msgstr "# Pööratud teksti tagaplaani värv\n" -#: src/lang.c:1795 +#: src/lang.c:1802 msgid "Color for inverse text (foreground):" msgstr "Pööratud teksti värv (esiplaan) :" -#: src/lang.c:1796 +#: src/lang.c:1803 msgid "# Color of foreground for inverse text\n" msgstr "# Pööratud teksti esiplaani värv\n" -#: src/lang.c:1801 +#: src/lang.c:1808 msgid "Color of text lines :" msgstr "Tekstiridade värv :" -#: src/lang.c:1802 +#: src/lang.c:1809 msgid "# Color of text-lines\n" msgstr "# Tekstiridade värv\n" -#: src/lang.c:1807 +#: src/lang.c:1814 msgid "Color of mini help menu :" msgstr "Miniabiinfo värv :" -#: src/lang.c:1808 +#: src/lang.c:1815 msgid "# Color of mini help menu\n" msgstr "# Miniabiinfo värv\n" -#: src/lang.c:1813 +#: src/lang.c:1820 msgid "Color of help text :" msgstr "Abiinfo värv :" -#: src/lang.c:1814 +#: src/lang.c:1821 msgid "# Color of help pages\n" msgstr "# Abiinfo värv\n" -#: src/lang.c:1819 +#: src/lang.c:1826 msgid "Color of status messages :" msgstr "Olekuteadete värv :" -#: src/lang.c:1820 +#: src/lang.c:1827 msgid "# Color of messages in last line\n" msgstr "# Viimasel real olevate teadete värv\n" -#: src/lang.c:1825 +#: src/lang.c:1832 msgid "Color of quoted lines :" msgstr "Tsitaadi värv :" -#: src/lang.c:1826 +#: src/lang.c:1833 msgid "# Color of quote-lines\n" msgstr "# Tsitaadi värv\n" -#: src/lang.c:1831 +#: src/lang.c:1838 msgid "Color of twice quoted line :" msgstr "Topelt tsiteeritud rea värv :" -#: src/lang.c:1832 +#: src/lang.c:1839 msgid "# Color of twice quoted lines\n" msgstr "# Topelt tsiteeritud rea värv\n" -#: src/lang.c:1837 +#: src/lang.c:1844 msgid "Color of =>3 times quoted line :" msgstr "=>3 korda tsiteeritud rea värv :" -#: src/lang.c:1838 +#: src/lang.c:1845 msgid "# Color of >=3 times quoted lines\n" msgstr "# =>3 korda tsiteeritud rea värv\n" -#: src/lang.c:1843 +#: src/lang.c:1850 msgid "Color of article header lines :" msgstr "Artikli päiseridade värv :" -#: src/lang.c:1844 +#: src/lang.c:1851 msgid "# Color of header-lines\n" msgstr "# Päiseridade värv\n" -#: src/lang.c:1849 +#: src/lang.c:1856 msgid "Color of actual news header fields :" msgstr "Artikli tegelike päiseridade värv :" -#: src/lang.c:1850 +#: src/lang.c:1857 msgid "# Color of actual news header fields\n" msgstr "# Artikli tegelike päiseridade värv\n" -#: src/lang.c:1855 +#: src/lang.c:1862 msgid "Color of article subject lines :" msgstr "Artikli teemarea värv :" -#: src/lang.c:1856 +#: src/lang.c:1863 msgid "# Color of article subject\n" msgstr "# Artikli teema värv\n" -#: src/lang.c:1861 +#: src/lang.c:1868 msgid "Color of response counter :" msgstr "Vastuste arvu loenduri värv :" -#: src/lang.c:1862 +#: src/lang.c:1869 msgid "# Color of response counter\n" msgstr "# Vastuste arvu loenduri värv\n" -#: src/lang.c:1867 +#: src/lang.c:1874 msgid "Color of sender (From:) :" msgstr "Saatja värv (From:) :" -#: src/lang.c:1868 +#: src/lang.c:1875 msgid "# Color of sender (From:)\n" msgstr "# Saatja värv (From:)\n" -#: src/lang.c:1873 +#: src/lang.c:1880 msgid "Color of help/mail sign :" msgstr "Abiinfo/kirja teate värv :" -#: src/lang.c:1874 +#: src/lang.c:1881 msgid "# Color of Help/Mail-Sign\n" msgstr "# Abiinfo/kirja teate värv\n" -#: src/lang.c:1879 +#: src/lang.c:1886 msgid "Color of signatures :" msgstr "Signatuuri värv :" -#: src/lang.c:1880 +#: src/lang.c:1887 msgid "# Color of signature\n" msgstr "# Signatuuri värv\n" -#: src/lang.c:1885 +#: src/lang.c:1892 msgid "Color of highlighting with *stars* :" msgstr "*tärnidega* esiletõstmise värv :" -#: src/lang.c:1886 +#: src/lang.c:1893 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:1892 +#: src/lang.c:1899 msgid "Color of highlighting with _dash_ :" msgstr "_alakriipsudega_ esiletõstmise värv:" # TRANSLATION TOO LONG -#: src/lang.c:1898 +#: src/lang.c:1905 msgid "Color of highlighting with /slash/ :" msgstr "/Kaldkriipsudega/ esiletõstmise värv:" -#: src/lang.c:1904 +#: src/lang.c:1911 msgid "Color of highlighting with -stroke-:" msgstr "-Kriipsudega- esiletõstmise värv :" -#: src/lang.c:1911 +#: src/lang.c:1918 msgid "Attr. of highlighting with *stars* :" msgstr "*tärnidega* esiletõstmise atribuut :" -#: src/lang.c:1912 +#: src/lang.c:1919 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5245,32 +5267,42 @@ 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:1922 +#: src/lang.c:1929 msgid "Attr. of highlighting with _dash_ :" msgstr "_alakriipsudega_ esiletõstmise atr.:" # TRANSLATION TOO LONG -#: src/lang.c:1928 +#: src/lang.c:1935 msgid "Attr. of highlighting with /slash/ :" msgstr "/Kaldkriipsudega/ esiletõstmise atr.:" -#: src/lang.c:1934 +#: src/lang.c:1941 msgid "Attr. of highlighting with -stroke-:" msgstr "-Kriipsudega- esiletõstmise atr. :" -#: src/lang.c:1940 +# TRANSLATION MISSING +#: src/lang.c:1947 +msgid "URL highlighting in message body :" +msgstr "" + +# TRANSLATION MISSING +#: src/lang.c:1948 +msgid "# Enable URL highlighting?\n" +msgstr "" + +#: src/lang.c:1953 msgid "Word highlighting in message body :" msgstr "Sõnade esiletõstmine teate kehas :" -#: src/lang.c:1941 +#: src/lang.c:1954 msgid "# Enable word highlighting?\n" msgstr "# Lubada sõnade esiletõstmine?\n" -#: src/lang.c:1946 +#: src/lang.c:1959 msgid "What to display instead of mark :" msgstr "Mida näidata märgi asemel :" -#: src/lang.c:1947 +#: src/lang.c:1960 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" @@ -5278,55 +5310,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:1953 +#: src/lang.c:1966 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:1954 +#: src/lang.c:1967 msgid "Page line wrap column :" msgstr "Rea murdmise veerg lehitsejas :" -#: src/lang.c:1955 +#: src/lang.c:1968 msgid "# Wrap article lines at column\n" msgstr "# Murra artikli read antud veerus\n" -#: src/lang.c:1960 +#: src/lang.c:1973 msgid "Wrap around threads on next unread :" msgstr "Liigu lugemata art-le ümber teemade:" -#: src/lang.c:1961 +#: src/lang.c:1974 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:1965 +#: src/lang.c:1978 msgid "Enter default mail address (and fullname). sets." msgstr "Sisestage oma e-posti aadress (ja oma nimi). seab." -#: src/lang.c:1966 +#: src/lang.c:1979 msgid "Mail address (and fullname) :" msgstr "E-posti aadress (ja teie nimi) :" -#: src/lang.c:1967 +#: src/lang.c:1980 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:1972 +#: src/lang.c:1985 msgid "Show empty Followup-To in editor :" msgstr "Näita toimetis tühja Followup-To :" -#: src/lang.c:1973 +#: src/lang.c:1986 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:1977 +#: src/lang.c:1990 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:1978 +#: src/lang.c:1991 msgid "Create signature from path/command :" msgstr "Signatuuri loomiseks tee/käsk :" -#: src/lang.c:1979 +#: src/lang.c:1992 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 " @@ -5337,49 +5369,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:1986 +#: src/lang.c:1999 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "Signatuurile eelnevale reale \"-- \". lülitab, seab." -#: src/lang.c:1987 +#: src/lang.c:2000 msgid "Prepend signature with \"-- \" :" msgstr "Lisa signatuuri ette \"-- \" :" -#: src/lang.c:1988 +#: src/lang.c:2001 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:1992 +#: src/lang.c:2005 msgid "Add signature when reposting articles. toggles & sets." msgstr "Lisa artikli uuestipostitamisel signatuur. lülitab, seab." -#: src/lang.c:1993 +#: src/lang.c:2006 msgid "Add signature when reposting :" msgstr "Lisa uuestipostitusel signatuur :" -#: src/lang.c:1994 +#: src/lang.c:2007 msgid "# If ON add signature to reposted articles\n" msgstr "# Kui väärtus on ON, lisa uuestipostitatud artiklile signatuur\n" -#: src/lang.c:1998 +#: src/lang.c:2011 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:1999 +#: src/lang.c:2012 msgid "Characters used as quote-marks :" msgstr "Tsiteerimise märgid :" -#: src/lang.c:2000 +#: src/lang.c:2013 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:2006 +#: src/lang.c:2019 msgid "Quoting behavior :" msgstr "Käitumine tsiteerimisel :" -#: src/lang.c:2007 +#: src/lang.c:2020 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5399,15 +5431,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:2019 src/lang.c:2027 src/lang.c:2033 +#: src/lang.c:2032 src/lang.c:2040 src/lang.c:2046 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:2020 +#: src/lang.c:2033 msgid "Quote line when following up :" msgstr "Tsiteerimise rida vastamisel :" -#: src/lang.c:2021 +#: src/lang.c:2034 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" @@ -5415,35 +5447,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:2028 +#: src/lang.c:2041 msgid "Quote line when cross-posting :" msgstr "Tsiteerimise rida ristpostitusel :" -#: src/lang.c:2034 +#: src/lang.c:2047 msgid "Quote line when mailing :" msgstr "Tsiteerimise rida kirjutamisel :" -#: src/lang.c:2039 +#: src/lang.c:2052 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Kasuta User-Agent: päiserida. lülitab, seab." -#: src/lang.c:2040 +#: src/lang.c:2053 msgid "Insert 'User-Agent:'-header :" msgstr "Sisestage 'User-Agent:'-päis :" -#: src/lang.c:2041 +#: src/lang.c:2054 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:2045 +#: src/lang.c:2058 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:2046 +#: src/lang.c:2059 msgid "MM_CHARSET :" msgstr "MM_CHARSET :" -#: src/lang.c:2047 +#: src/lang.c:2060 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" @@ -5459,27 +5491,27 @@ msgstr "# Lokaalselt toetatud kooditabel "# loetakse mm_charset väärtusest erinev kooditabel mitte-näidatavaks\n" "# ja näitamisel kasutatakse '?'.\n" -#: src/lang.c:2058 +#: src/lang.c:2071 msgid "MM_NETWORK_CHARSET :" msgstr "MM_NETWORK_CHARSET :" -#: src/lang.c:2059 +#: src/lang.c:2072 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Postituste MIME (Content-Type) päises kasutatav kooditabel.\n" -#: src/lang.c:2065 +#: src/lang.c:2078 msgid "Mailbox format :" msgstr "Kirjade kataloog :" -#: src/lang.c:2066 +#: src/lang.c:2079 msgid "# Format of the mailbox.\n" msgstr "# Kirjade kataloog.\n" -#: src/lang.c:2071 +#: src/lang.c:2084 msgid "MIME encoding in news messages :" msgstr "Kasuta artiklites MIME kodeerimist :" -#: src/lang.c:2072 +#: src/lang.c:2085 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" @@ -5491,15 +5523,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:2080 src/lang.c:2101 +#: src/lang.c:2093 src/lang.c:2114 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:2081 +#: src/lang.c:2094 msgid "Use 8bit characters in news headers:" msgstr "Kasuta artikli päises 8bit tähti :" -#: src/lang.c:2082 +#: src/lang.c:2095 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" @@ -5509,28 +5541,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:2089 +#: src/lang.c:2102 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "Vaata töödeldud faile automaatselt lülitab, seab, " "katkestab." -#: src/lang.c:2090 +#: src/lang.c:2103 msgid "View post-processed files :" msgstr "Vaata töödeldud faile :" -#: src/lang.c:2091 +#: src/lang.c:2104 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:2096 +#: src/lang.c:2109 msgid "MIME encoding in mail messages :" msgstr "Kasuta kirjades MIME kodeerimist :" -#: src/lang.c:2102 +#: src/lang.c:2115 msgid "Use 8bit characters in mail headers:" msgstr "Kasuta kirja päises 8bit tähti :" -#: src/lang.c:2103 +#: src/lang.c:2116 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 " @@ -5545,25 +5577,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:2113 +#: src/lang.c:2126 msgid "Strip blanks from ends of lines :" msgstr "Eemalda tühikud realõppudest :" -#: src/lang.c:2114 +#: src/lang.c:2127 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:2119 +#: src/lang.c:2132 msgid "If ON, use transliteration. toggles & sets." msgstr "Kui väärtus on ON, kasuta transliteratsiooni. lülitab, seab." -#: src/lang.c:2120 +#: src/lang.c:2133 msgid "Transliteration :" msgstr "Transliteratsioon :" -#: src/lang.c:2121 +#: src/lang.c:2134 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" @@ -5572,245 +5604,245 @@ msgstr "# Kui väärtus on ON, kasuta //TR "kasutades\n" "# üht või enamat sarnast sümbolit.\n" -#: src/lang.c:2128 +#: src/lang.c:2141 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "Saada kasutajale automaatselt koopia. lülitab, seab." -#: src/lang.c:2129 +#: src/lang.c:2142 msgid "Send you a cc automatically :" msgstr "Saada automaatselt koopia :" -#: src/lang.c:2130 +#: src/lang.c:2143 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:2134 +#: src/lang.c:2147 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "Saada automaatselt pimekoopia. lülitab, seab." -#: src/lang.c:2135 +#: src/lang.c:2148 msgid "Send you a blind cc automatically :" msgstr "Saada automaatselt pimekoopia :" -#: src/lang.c:2136 +#: src/lang.c:2149 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:2140 +#: src/lang.c:2153 msgid "Enter address elements about which you want to be warned. sets." msgstr "Sisestage aadressi komponendid, mille eest peaks hoiatama. seab." -#: src/lang.c:2141 +#: src/lang.c:2154 msgid "Spamtrap warning address parts :" msgstr "Rämpsposti hoiatus aadressi osadele:" -#: src/lang.c:2142 +#: src/lang.c:2155 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:2147 +#: src/lang.c:2160 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "Sisestage kirje kehtivuse aeg päevades. seab." -#: src/lang.c:2148 +#: src/lang.c:2161 msgid "No. of days a filter entry is valid:" msgstr "Filtri kehtivus päevades :" -#: src/lang.c:2149 +#: src/lang.c:2162 msgid "# Number of days a short term filter will be active\n" msgstr "# lühiajalise filtri kehtivus päevades\n" -#: src/lang.c:2153 +#: src/lang.c:2166 msgid "Add posted articles to filter. toggles & sets." msgstr "Lisage postitatud artikkel filtrisse. lülitab, seab." -#: src/lang.c:2154 +#: src/lang.c:2167 msgid "Add posted articles to filter :" msgstr "Lisage postitatud artikkel filtrile:" -#: src/lang.c:2155 +#: src/lang.c:2168 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:2159 +#: src/lang.c:2172 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "Kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis." -#: src/lang.c:2160 +#: src/lang.c:2173 msgid "Mail directory :" msgstr "Kirjade kataloog :" -#: src/lang.c:2161 +#: src/lang.c:2174 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis\n" -#: src/lang.c:2166 +#: src/lang.c:2179 msgid "Save articles in batch mode (-S) :" msgstr "Salvesta artiklid pakettmoodis (-S):" -#: src/lang.c:2167 +#: src/lang.c:2180 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:2172 +#: src/lang.c:2185 msgid "The directory where you want articles/threads saved." msgstr "Kataloog, kuhu te soovite artikleid salvestada." -#: src/lang.c:2173 +#: src/lang.c:2186 msgid "Directory to save arts/threads in :" msgstr "Kataloog artiklite salvestamiseks :" -#: src/lang.c:2174 +#: src/lang.c:2187 msgid "# Directory where articles/threads are saved\n" msgstr "# Kataloog, kuhu salvestatakse artiklid/teemad\n" -#: src/lang.c:2178 +#: src/lang.c:2191 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:2179 +#: src/lang.c:2192 msgid "Use Archive-name: header for save :" msgstr "Kasuta salvestamisel Archive-name: :" -#: src/lang.c:2180 +#: src/lang.c:2193 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:2185 +#: src/lang.c:2198 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "Märgi salvestatud artiklid loetuks. lülitab, seab, " "katkestab." -#: src/lang.c:2186 +#: src/lang.c:2199 msgid "Mark saved articles/threads as read:" msgstr "Märgi salvestatud artiklid loetuks :" -#: src/lang.c:2187 +#: src/lang.c:2200 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:2191 +#: src/lang.c:2204 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "Teosta salvestatud artiklitel järeltöötlemist (nt. lisade eraldamist)." -#: src/lang.c:2192 +#: src/lang.c:2205 msgid "Post process saved articles :" msgstr "Salvestatud artikl. järeltöötlemine:" -#: src/lang.c:2193 +#: src/lang.c:2206 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:2199 +#: src/lang.c:2212 msgid "Process only unread articles :" msgstr "Töötle ainult lugemata artikleid :" -#: src/lang.c:2200 +#: src/lang.c:2213 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:2205 +#: src/lang.c:2218 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:2206 +#: src/lang.c:2219 msgid "Print all headers when printing :" msgstr "Trükkimisel trüki kõik päised :" -#: src/lang.c:2207 +#: src/lang.c:2220 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:2211 +#: src/lang.c:2224 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:2212 +#: src/lang.c:2225 msgid "Printer program with options :" msgstr "Trükikäsk koos võtmetega :" -#: src/lang.c:2213 +#: src/lang.c:2226 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:2219 +#: src/lang.c:2232 msgid "Force redraw after certain commands:" msgstr "Värskenda ekraani peale käske :" -#: src/lang.c:2220 +#: src/lang.c:2233 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:2224 +#: src/lang.c:2237 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "Käivita tekstitoimeti etteantud real. lülitab, seab, " "katkestab." -#: src/lang.c:2225 +#: src/lang.c:2238 msgid "Start editor with line offset :" msgstr "Käivita tekstitoimeti reanumbril :" -#: src/lang.c:2226 +#: src/lang.c:2239 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:2231 +#: src/lang.c:2244 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:2232 +#: src/lang.c:2245 msgid "Invocation of your editor :" msgstr "Teie tekstitoimeti :" -#: src/lang.c:2233 +#: src/lang.c:2246 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:2238 +#: src/lang.c:2251 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:2239 +#: src/lang.c:2252 msgid "External inews :" msgstr "Väline inews :" -#: src/lang.c:2240 +#: src/lang.c:2253 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:2244 +#: src/lang.c:2257 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:2245 +#: src/lang.c:2258 msgid "Invocation of your mail command :" msgstr "Teie e-posti käsk :" -#: src/lang.c:2246 +#: src/lang.c:2259 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename %%U User (AmigaDOS)\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" @@ -5820,106 +5852,105 @@ 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:2254 +#: src/lang.c:2267 msgid "Use interactive mail reader :" msgstr "Kasuta interaktiivset e-posti :" -#: src/lang.c:2255 -msgid "# Interactive mailreader: if ON mailreader will be invoked earlier for\n" - "# reply so you can use more of its features (eg. MIME, pgp, ...)\n" - "# this option has to suit default_mailer_format\n" -msgstr "# Interaktiivne e-posti lugeja: kui väärtus on ON, käivitatakse vastuse\n" - "# kirjutamiseks e-posti lugeja, nii on võimalik kasutada vastavaid\n" - "# lisavõimalusi (MIME, pgp, ...)\n" - "# see omadus kasutab default_mailer_format väärtust\n" +# TRANSLATION MISSING +#: src/lang.c:2268 +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:2262 +#: src/lang.c:2276 msgid "Remove ~/.article after posting :" msgstr "Eemalda ~/.article peale postitust :" -#: src/lang.c:2263 +#: src/lang.c:2277 msgid "# If ON remove ~/.article after posting.\n" msgstr "# Kui väärtus on ON, kustuta ~/.article peale postitust.\n" -#: src/lang.c:2267 +#: src/lang.c:2281 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "Failinimi postitatud artiklitele. seab. Nime puudumisel ei salvestata." -#: src/lang.c:2268 +#: src/lang.c:2282 msgid "Filename for posted articles :" msgstr "Failinimi postitatud artiklitele :" -#: src/lang.c:2269 +#: src/lang.c:2283 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:2274 +#: src/lang.c:2288 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:2275 +#: src/lang.c:2289 msgid "Keep failed arts in ~/dead.articles:" msgstr "Vigased artiklid ~/dead.articles :" -#: src/lang.c:2276 +#: src/lang.c:2290 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:2280 +#: src/lang.c:2294 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "Kas te soovite eemaldada tellimata grupid .newsrc failist" -#: src/lang.c:2281 +#: src/lang.c:2295 msgid "No unsubscribed groups in newsrc :" msgstr "newsrcs ainult tellitud grupid :" -#: src/lang.c:2282 +#: src/lang.c:2296 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Kui väärtus on ON, eemalda tellimata grupid newsrc failist\n" -#: src/lang.c:2287 +#: src/lang.c:2301 msgid "Remove bogus groups from newsrc :" msgstr "Eemalda olematud grupid newsrcst :" -#: src/lang.c:2288 +#: src/lang.c:2302 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:2292 +#: src/lang.c:2306 msgid "Enter number of seconds until active file will be reread. sets." msgstr "Sisestage aktiivsete faili lugemise intervall sekundites. seab." -#: src/lang.c:2293 +#: src/lang.c:2307 msgid "Interval in secs to reread active :" msgstr "Aktiivsete faili lugemise intervall:" -#: src/lang.c:2294 +#: src/lang.c:2308 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:2299 +#: src/lang.c:2313 msgid "Reconnect to server automatically :" msgstr "Taasta automaatselt NNTP ühendus :" -#: src/lang.c:2300 +#: src/lang.c:2314 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:2304 +#: src/lang.c:2318 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Loo NNTP overview failidest lokaalne koopia. lülitab ja seab." -#: src/lang.c:2305 +#: src/lang.c:2319 msgid "Cache NNTP overview files locally :" msgstr "Puhverda NNTP overview lokaalselt :" -#: src/lang.c:2306 +#: src/lang.c:2320 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "# Kui väärtus on ON, loo NNTP overview failidest lokaalsed koopiad.\n" @@ -6179,7 +6210,7 @@ msgstr "Tundmatu NNTP vastusekood" msgid "couldn't expand %s\n" msgstr "ei saa laiendada %s\n" -#: src/open.c:1032 +#: src/open.c:1123 msgid "Unreachable?\n" msgstr "Kättesaamatu?\n" @@ -6188,13 +6219,13 @@ msgstr "Kättesaamatu?\n" msgid "%s is bogus" msgstr "gruppi %s pole" -#: src/post.c:1940 +#: src/post.c:1936 #, c-format msgid "Posting: %.*s ..." msgstr "Postitan: %.*s ..." #. TODO: -> lang.c -#: src/post.c:4038 +#: src/post.c:4034 #, c-format msgid "Rereading %s..." msgstr "Loen %s uuesti..." Binary files tin-1.7.0/po/fr.gmo and tin-1.7.1/po/fr.gmo differ diff -Nurp tin-1.7.0/po/fr.po tin-1.7.1/po/fr.po --- tin-1.7.0/po/fr.po Sun Aug 10 16:30:39 2003 +++ tin-1.7.1/po/fr.po Thu Sep 18 18:32:23 2003 @@ -2,8 +2,8 @@ # Matt Anton , 2003 # msgid "" -msgstr "Project-Id-Version: 1.6.0\n" - "POT-Creation-Date: 2003-08-10 16:30+0200\n" +msgstr "Project-Id-Version: 1.7.0\n" + "POT-Creation-Date: 2003-09-18 18:31+0200\n" "PO-Revision-Date: 2003-07-04 04:15+0200\n" "Last-Translator: Matt Anton \n" @@ -11,6 +11,11 @@ msgstr "Project-Id-Version: 1.6.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: src/art.c:1228 +#, c-format +msgid "%d Bad overview record (%d fields) '%s'" +msgstr "" + #: src/attrib.c:574 msgid "# Do not edit this comment block\n" "#\n" @@ -212,7 +217,7 @@ msgstr "# dans *binaries* faire traiteme msgid "# and set Followup-To: poster\n" msgstr "# et utiliser Followup-To: poster\n" -#: src/cook.c:798 +#: src/cook.c:799 msgid "(unknown)" msgstr "(inconnu)" @@ -885,7 +890,7 @@ msgstr "\n" msgid "Insecure permissions of %s (%o)" msgstr "Permissions de %s non sûres (%o)" -#: src/lang.c:199 src/open.c:1009 +#: src/lang.c:199 src/open.c:1100 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "Réponse de la commande GROUP invalide, %s" @@ -900,8 +905,8 @@ msgid "MIME parse error: Start boundary msgstr "Erreur MIME : Début de la borne lors de la lecture des en-têtes" #: src/lang.c:203 -msgid "Can't get a (fully-qualified) domain-name!\n" -msgstr "Nom de domaine (qualifié) introuvable !\n" +msgid "Can't get a (fully-qualified) domain-name!" +msgstr "Nom de domaine (qualifié) introuvable !" #: src/lang.c:204 #, c-format @@ -4197,137 +4202,153 @@ msgstr "Citer les signatures & les ligne msgid "Comp. q., quote sigs & empty lines" msgstr "Compr. les citations, citer les signatures & les lignes vides" +# TRANSLATION MISSING #: src/lang.c:1290 +msgid "no" +msgstr "" + +# TRANSLATION MISSING +#: src/lang.c:1291 +msgid "with headers" +msgstr "" + +# TRANSLATION MISSING +#: src/lang.c:1292 +msgid "without headers" +msgstr "" + +#: src/lang.c:1297 msgid "Display Options" msgstr "Options d'affichage" -#: src/lang.c:1296 +#: src/lang.c:1303 msgid "Color Options" msgstr "Options des couleurs" -#: src/lang.c:1302 +#: src/lang.c:1309 msgid "Article-Limiting Options" msgstr "Options des articles" -#: src/lang.c:1308 +#: src/lang.c:1315 msgid "Posting/Mailing Options" msgstr "Options de postage/messagerie" -#: src/lang.c:1314 +#: src/lang.c:1321 msgid "Saving/Printing Options" msgstr "Options d'enregistrement/d'impression" -#: src/lang.c:1320 +#: src/lang.c:1327 msgid "Expert Options" msgstr "Options avancées" -#: src/lang.c:1326 +#: src/lang.c:1333 msgid "Filtering Options" msgstr "Options de filtrage" -#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 src/lang.c:1402 -#: src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 src/lang.c:1511 src/lang.c:1673 -#: src/lang.c:1679 src/lang.c:1685 src/lang.c:1691 src/lang.c:1703 src/lang.c:1710 -#: src/lang.c:1761 src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788 -#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 src/lang.c:1818 -#: src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 src/lang.c:1842 src/lang.c:1848 -#: src/lang.c:1854 src/lang.c:1860 src/lang.c:1866 src/lang.c:1872 src/lang.c:1878 -#: src/lang.c:1884 src/lang.c:1891 src/lang.c:1897 src/lang.c:1903 src/lang.c:1910 -#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 src/lang.c:1945 -#: src/lang.c:1959 src/lang.c:1971 src/lang.c:2005 src/lang.c:2057 src/lang.c:2064 -#: src/lang.c:2070 src/lang.c:2095 src/lang.c:2112 src/lang.c:2165 src/lang.c:2198 -#: src/lang.c:2218 src/lang.c:2253 src/lang.c:2261 src/lang.c:2286 src/lang.c:2298 +#: src/lang.c:1338 src/lang.c:1364 src/lang.c:1370 src/lang.c:1377 src/lang.c:1409 +#: src/lang.c:1415 src/lang.c:1423 src/lang.c:1443 src/lang.c:1518 src/lang.c:1680 +#: src/lang.c:1686 src/lang.c:1692 src/lang.c:1698 src/lang.c:1710 src/lang.c:1717 +#: src/lang.c:1768 src/lang.c:1777 src/lang.c:1783 src/lang.c:1789 src/lang.c:1795 +#: src/lang.c:1801 src/lang.c:1807 src/lang.c:1813 src/lang.c:1819 src/lang.c:1825 +#: src/lang.c:1831 src/lang.c:1837 src/lang.c:1843 src/lang.c:1849 src/lang.c:1855 +#: src/lang.c:1861 src/lang.c:1867 src/lang.c:1873 src/lang.c:1879 src/lang.c:1885 +#: src/lang.c:1891 src/lang.c:1898 src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 +#: src/lang.c:1928 src/lang.c:1934 src/lang.c:1940 src/lang.c:1946 src/lang.c:1952 +#: src/lang.c:1958 src/lang.c:1972 src/lang.c:1984 src/lang.c:2018 src/lang.c:2070 +#: src/lang.c:2077 src/lang.c:2083 src/lang.c:2108 src/lang.c:2125 src/lang.c:2178 +#: src/lang.c:2211 src/lang.c:2231 src/lang.c:2266 src/lang.c:2275 src/lang.c:2300 +#: src/lang.c:2312 msgid " toggles, sets, cancels." msgstr " changer, régler, annuler." -#: src/lang.c:1332 +#: src/lang.c:1339 msgid "Show mini menu & posting etiquette :" msgstr "Afficher menu & intitulé du postage:" -#: src/lang.c:1333 +#: src/lang.c:1340 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:1338 +#: src/lang.c:1345 msgid "Show short description for each newsgroup. toggles & sets." msgstr "Afficher une brève description pour chaque groupe. changer & " "régler." -#: src/lang.c:1339 +#: src/lang.c:1346 msgid "Show description of each newsgroup :" msgstr "Voir description de chaque groupe :" -#: src/lang.c:1340 +#: src/lang.c:1347 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:1345 +#: src/lang.c:1352 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "Afficher les champs Sujet & De (auteur) dans le menu groupe. change " "& règle." -#: src/lang.c:1346 +#: src/lang.c:1353 msgid "In group menu, show author by :" msgstr "Dans vue groupe, voir auteur par :" -#: src/lang.c:1347 +#: src/lang.c:1354 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:1351 +#: src/lang.c:1358 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "Afficher -> ou une ligne pour la sélection. change & règle." -#: src/lang.c:1352 +#: src/lang.c:1359 msgid "Draw -> instead of highlighted bar :" msgstr "Afficher -> plutôt qu'une ligne :" -#: src/lang.c:1353 +#: src/lang.c:1360 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:1358 +#: src/lang.c:1365 msgid "Use inverse video for page headers :" msgstr "Vidéo inversée pour les en-têtes :" -#: src/lang.c:1359 +#: src/lang.c:1366 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:1364 +#: src/lang.c:1371 msgid "Thread articles by :" msgstr "Regrouper les articles par :" -#: src/lang.c:1365 +#: src/lang.c:1372 msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" msgstr "# Regrouper les articles sur 0=(rien) 1=(Sujet) 2=(Références) 3=(Les deux)\n" "# 4=(Sujet multi-parties).\n" -#: src/lang.c:1371 +#: src/lang.c:1378 msgid "Score of a thread :" msgstr "Score d'un fil :" -#: src/lang.c:1372 +#: src/lang.c:1379 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "# Score d'un fil 0=(Max) 1=(Sum) 2=(Moyen)\n" -#: src/lang.c:1376 +#: src/lang.c:1383 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "Trier les articles par Sujet, De, Date ou Score. change & règle." -#: src/lang.c:1377 +#: src/lang.c:1384 msgid "Sort articles by :" msgstr "Trier les articles par :" -#: src/lang.c:1378 +#: src/lang.c:1385 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" @@ -4336,56 +4357,56 @@ msgstr "# Trie les article par 0=(rien) "# 7=(Score descendant) 8=(Score ascendant) 9=(Lignes descendant) 10=(Lignes " "ascendant)\n" -#: src/lang.c:1384 +#: src/lang.c:1391 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "Trier les fils par Rien ou Score. change & règle." -#: src/lang.c:1385 +#: src/lang.c:1392 msgid "Sort threads by :" msgstr "Trier les fils par :" -#: src/lang.c:1386 +#: src/lang.c:1393 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:1390 +#: src/lang.c:1397 msgid "Put cursor at first/last unread art in groups. toggles & sets." msgstr "Place le curseur sur le 1er article non lu. change & règle." -#: src/lang.c:1391 +#: src/lang.c:1398 msgid "Goto first unread article in group :" msgstr "Aller au 1er art. non lu du groupe :" -#: src/lang.c:1392 +#: src/lang.c:1399 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:1396 +#: src/lang.c:1403 msgid "Show all articles or only unread articles. toggles & sets." msgstr "Affiche tous les articles ou seulement ceux non lus. change & " "règle." -#: src/lang.c:1397 +#: src/lang.c:1404 msgid "Show only unread articles :" msgstr "Afficher articles non lus seulement:" -#: src/lang.c:1398 +#: src/lang.c:1405 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:1403 +#: src/lang.c:1410 msgid "Show only groups with unread arts :" msgstr "Voir groupes avec articles non lus :" -#: src/lang.c:1404 +#: src/lang.c:1411 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:1409 +#: src/lang.c:1416 msgid "Filter which articles :" msgstr "Filtrer quels articles :" -#: src/lang.c:1410 +#: src/lang.c:1417 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" @@ -4393,232 +4414,232 @@ msgstr "# 0=(Filtrer seulement les artic "# 1=(Tout filtrer et les afficher dans les fils précédés d'un K)\n" "# 2=(Tout filtrer et ne pas les afficher)\n" -#: src/lang.c:1417 +#: src/lang.c:1424 msgid "Tab goes to next unread article :" msgstr "Tab va au prochain article non lu :" -#: src/lang.c:1418 +#: src/lang.c:1425 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "# Si ON TAB ira au prochain article non lu directement depuis le visual iseur " "d'article\n" -#: src/lang.c:1422 +#: src/lang.c:1429 msgid "Scrolling with past the end of an art. jumps to the next unread one." msgstr "Défiler avec passera le fin d'un article et ira au prochain non lu." -#: src/lang.c:1423 +#: src/lang.c:1430 msgid "Space goes to next unread article :" msgstr "Espace va au prochain art. non lu :" -#: src/lang.c:1424 +#: src/lang.c:1431 msgid "# If ON the SPACE command will go to next unread article at article viewer\n" "# level when the end of the article is reached (rn-style pager)\n" msgstr "# Si ON ESPACE ira au prochain article non lu dans le visualiseur d'article\n" "# lorsque la fin d'un article sera atteinte (page style rn)\n" -#: src/lang.c:1429 +#: src/lang.c:1436 msgid "Scrolling with / past the end of an art. jumps to the unread one." msgstr "Défiler avec / passera la fin d'un article et ira au prochain non " "lu." -#: src/lang.c:1430 +#: src/lang.c:1437 msgid "PgDn goes to next unread article :" msgstr "PgDn ira au prochain article non lu:" -#: src/lang.c:1431 +#: src/lang.c:1438 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" "# pressed at end of message\n" msgstr "# Si ON PGDN ou BAS ira au prochain article non lu lorsqu'elle sera\n" "# utilisée à la fin d'un article.\n" -#: src/lang.c:1437 +#: src/lang.c:1444 msgid "List thread using right arrow key :" msgstr "Lister le fil via la flèche droite :" -#: src/lang.c:1438 +#: src/lang.c:1445 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:1442 +#: src/lang.c:1449 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "Caractère indiquant les articles effacés. règle, annule." -#: src/lang.c:1443 +#: src/lang.c:1450 msgid "Character to show deleted articles :" msgstr "Caractère pour les articles effacés:" -#: src/lang.c:1444 +#: src/lang.c:1451 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:1449 +#: src/lang.c:1456 msgid "Enter character to indicate articles in a range. sets, cancels." msgstr "Caractère indiquant les articles inclus. règle, annule." -#: src/lang.c:1450 +#: src/lang.c:1457 msgid "Character to show inrange articles :" msgstr "Caractère pour art. non inclus :" -#: src/lang.c:1451 +#: src/lang.c:1458 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:1456 +#: src/lang.c:1463 msgid "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1457 +#: src/lang.c:1464 msgid "Character to show returning arts :" msgstr "" -#: src/lang.c:1458 +#: src/lang.c:1465 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1463 +#: src/lang.c:1470 msgid "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1464 +#: src/lang.c:1471 msgid "Character to show selected articles:" msgstr "" -#: src/lang.c:1465 +#: src/lang.c:1472 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1470 +#: src/lang.c:1477 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1471 +#: src/lang.c:1478 msgid "Character to show recent articles :" msgstr "" -#: src/lang.c:1472 +#: src/lang.c:1479 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1477 +#: src/lang.c:1484 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1478 +#: src/lang.c:1485 msgid "Character to show unread articles :" msgstr "" -#: src/lang.c:1479 +#: src/lang.c:1486 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1484 +#: src/lang.c:1491 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1485 +#: src/lang.c:1492 msgid "Character to show read articles :" msgstr "" -#: src/lang.c:1486 +#: src/lang.c:1493 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1491 +#: src/lang.c:1498 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1492 +#: src/lang.c:1499 msgid "Character to show killed articles :" msgstr "" -#: src/lang.c:1493 +#: src/lang.c:1500 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:1498 +#: src/lang.c:1505 msgid "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1499 +#: src/lang.c:1506 msgid "Character to show readselected arts:" msgstr "" -#: src/lang.c:1500 +#: src/lang.c:1507 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:1505 +#: src/lang.c:1512 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1506 +#: src/lang.c:1513 msgid "Max. length of group names shown :" msgstr "" -#: src/lang.c:1507 +#: src/lang.c:1514 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1512 +#: src/lang.c:1519 msgid "Show lines/score in listings :" msgstr "" -#: src/lang.c:1513 +#: src/lang.c:1520 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:1518 +#: src/lang.c:1525 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1519 +#: src/lang.c:1526 msgid "Number of lines to scroll in pager :" msgstr "" -#: src/lang.c:1520 +#: src/lang.c:1527 msgid "# Number of lines that cursor-up/down will scroll in article pager\n" "# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n" "# -1 = the top/bottom line is carried over onto the next page,\n" "# -2 = half-page scrolling\n" msgstr "" -#: src/lang.c:1527 +#: src/lang.c:1534 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1528 +#: src/lang.c:1535 msgid "Display signatures :" msgstr "Afficher les signatures :" -#: src/lang.c:1529 +#: src/lang.c:1536 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1533 +#: src/lang.c:1540 msgid "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1534 +#: src/lang.c:1541 msgid "Display uue data as an attachment :" msgstr "Afficher donnée uue comme PJ :" -#: src/lang.c:1535 +#: src/lang.c:1542 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" @@ -4627,28 +4648,28 @@ msgid "# Handling of uuencoded data in t "# into a tag line.\n" msgstr "" -#: src/lang.c:1544 +#: src/lang.c:1551 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1545 +#: src/lang.c:1552 msgid "Display \"a as Umlaut-a :" msgstr "" -#: src/lang.c:1546 +#: src/lang.c:1553 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1551 src/lang.c:1561 +#: src/lang.c:1558 src/lang.c:1568 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1552 +#: src/lang.c:1559 msgid "Display these header fields (or *) :" msgstr "" -#: src/lang.c:1553 +#: src/lang.c:1560 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" @@ -4657,11 +4678,11 @@ msgid "# Which news headers you wish to "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1562 +#: src/lang.c:1569 msgid "Do not display these header fields :" msgstr "" -#: src/lang.c:1563 +#: src/lang.c:1570 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 " @@ -4672,511 +4693,511 @@ msgid "# Same as 'news_headers_to_displa "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1573 +#: src/lang.c:1580 msgid "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1574 +#: src/lang.c:1581 msgid "Skip multipart/alternative parts :" msgstr "" -#: src/lang.c:1575 +#: src/lang.c:1582 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1580 +#: src/lang.c:1587 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1581 +#: src/lang.c:1588 msgid "Regex used to show quoted lines :" msgstr "" -#: src/lang.c:1582 +#: src/lang.c:1589 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:1588 +#: src/lang.c:1595 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1589 +#: src/lang.c:1596 msgid "Regex used to show twice quoted l. :" msgstr "" -#: src/lang.c:1590 +#: src/lang.c:1597 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:1596 +#: src/lang.c:1603 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1597 +#: src/lang.c:1604 msgid "Regex used to show >= 3 times q.l. :" msgstr "" -#: src/lang.c:1598 +#: src/lang.c:1605 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:1605 +#: src/lang.c:1612 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1606 +#: src/lang.c:1613 msgid "Regex used to highlight /slashes/ :" msgstr "" -#: src/lang.c:1607 +#: src/lang.c:1614 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:1613 +#: src/lang.c:1620 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1614 +#: src/lang.c:1621 msgid "Regex used to highlight *stars* :" msgstr "" -#: src/lang.c:1615 +#: 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_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1621 +#: src/lang.c:1628 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1622 +#: src/lang.c:1629 msgid "Regex used to highlight -strokes- :" msgstr "" -#: src/lang.c:1623 +#: 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_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1629 +#: src/lang.c:1636 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1630 +#: src/lang.c:1637 msgid "Regex used to highlight _underline_:" msgstr "" -#: src/lang.c:1631 +#: 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_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1637 +#: src/lang.c:1644 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1638 +#: src/lang.c:1645 msgid "Regex with Subject prefixes :" msgstr "" -#: src/lang.c:1639 +#: src/lang.c:1646 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:1644 +#: src/lang.c:1651 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1645 +#: src/lang.c:1652 msgid "Regex with Subject suffixes :" msgstr "" -#: src/lang.c:1646 +#: src/lang.c:1653 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:1651 +#: src/lang.c:1658 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1652 +#: src/lang.c:1659 msgid "MIME binary content viewer :" msgstr "" -#: src/lang.c:1653 +#: src/lang.c:1660 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:1660 +#: src/lang.c:1667 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1661 +#: src/lang.c:1668 msgid "Ask before using MIME viewer :" msgstr "" -#: src/lang.c:1662 +#: src/lang.c:1669 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:1667 +#: src/lang.c:1674 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1668 +#: src/lang.c:1675 msgid "Catchup read groups when quitting :" msgstr "" -#: src/lang.c:1669 +#: src/lang.c:1676 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1674 +#: src/lang.c:1681 msgid "Catchup group using left key :" msgstr "" -#: src/lang.c:1675 +#: src/lang.c:1682 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1680 +#: src/lang.c:1687 msgid "Catchup thread by using left key :" msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1693 msgid "Which actions require confirmation :" msgstr "" -#: src/lang.c:1687 +#: src/lang.c:1694 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1692 +#: src/lang.c:1699 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1693 +#: src/lang.c:1700 msgid "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1697 +#: src/lang.c:1704 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1698 +#: src/lang.c:1705 msgid "Program that opens URL's :" msgstr "" -#: src/lang.c:1699 +#: src/lang.c:1706 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1704 +#: src/lang.c:1711 msgid "Use mouse in xterm :" msgstr "" -#: src/lang.c:1705 +#: src/lang.c:1712 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1711 +#: src/lang.c:1718 msgid "Use scroll keys on keypad :" msgstr "" -#: src/lang.c:1712 +#: src/lang.c:1719 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1724 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1718 +#: src/lang.c:1725 msgid "Number of articles to get :" msgstr "" -#: src/lang.c:1719 +#: src/lang.c:1726 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:1724 +#: src/lang.c:1731 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1725 +#: src/lang.c:1732 msgid "Article recentness time limit :" msgstr "" -#: src/lang.c:1726 +#: src/lang.c:1733 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1730 +#: src/lang.c:1737 msgid "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1738 msgid "Wildcard matching :" msgstr "" -#: src/lang.c:1732 +#: src/lang.c:1739 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1736 +#: src/lang.c:1743 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1744 msgid "Score limit (kill) :" msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1745 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1742 +#: src/lang.c:1749 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1743 +#: src/lang.c:1750 msgid "Default score to kill articles :" msgstr "" -#: src/lang.c:1744 +#: src/lang.c:1751 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1748 +#: src/lang.c:1755 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1749 +#: src/lang.c:1756 msgid "Score limit (select) :" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1757 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1754 +#: src/lang.c:1761 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1755 +#: src/lang.c:1762 msgid "Default score to select articles :" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1763 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1769 msgid "Use slrnface to show ''X-Face:''s :" msgstr "" -#: src/lang.c:1763 +#: src/lang.c:1770 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:1771 +#: src/lang.c:1778 msgid "Use ANSI color :" msgstr "" -#: src/lang.c:1772 +#: src/lang.c:1779 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:1777 +#: src/lang.c:1784 msgid "Standard foreground color :" msgstr "" -#: src/lang.c:1778 +#: src/lang.c:1785 msgid "# Standard foreground color\n" msgstr "" -#: src/lang.c:1783 +#: src/lang.c:1790 msgid "Standard background color :" msgstr "" -#: src/lang.c:1784 +#: src/lang.c:1791 msgid "# Standard-Background-Color\n" msgstr "" -#: src/lang.c:1789 +#: src/lang.c:1796 msgid "Color for inverse text (background):" msgstr "" -#: src/lang.c:1790 +#: src/lang.c:1797 msgid "# Color of background for inverse text\n" msgstr "" -#: src/lang.c:1795 +#: src/lang.c:1802 msgid "Color for inverse text (foreground):" msgstr "" -#: src/lang.c:1796 +#: src/lang.c:1803 msgid "# Color of foreground for inverse text\n" msgstr "" -#: src/lang.c:1801 +#: src/lang.c:1808 msgid "Color of text lines :" msgstr "" -#: src/lang.c:1802 +#: src/lang.c:1809 msgid "# Color of text-lines\n" msgstr "" -#: src/lang.c:1807 +#: src/lang.c:1814 msgid "Color of mini help menu :" msgstr "" -#: src/lang.c:1808 +#: src/lang.c:1815 msgid "# Color of mini help menu\n" msgstr "" -#: src/lang.c:1813 +#: src/lang.c:1820 msgid "Color of help text :" msgstr "" -#: src/lang.c:1814 +#: src/lang.c:1821 msgid "# Color of help pages\n" msgstr "" -#: src/lang.c:1819 +#: src/lang.c:1826 msgid "Color of status messages :" msgstr "" -#: src/lang.c:1820 +#: src/lang.c:1827 msgid "# Color of messages in last line\n" msgstr "" -#: src/lang.c:1825 +#: src/lang.c:1832 msgid "Color of quoted lines :" msgstr "" -#: src/lang.c:1826 +#: src/lang.c:1833 msgid "# Color of quote-lines\n" msgstr "" -#: src/lang.c:1831 +#: src/lang.c:1838 msgid "Color of twice quoted line :" msgstr "" -#: src/lang.c:1832 +#: src/lang.c:1839 msgid "# Color of twice quoted lines\n" msgstr "" -#: src/lang.c:1837 +#: src/lang.c:1844 msgid "Color of =>3 times quoted line :" msgstr "" -#: src/lang.c:1838 +#: src/lang.c:1845 msgid "# Color of >=3 times quoted lines\n" msgstr "" -#: src/lang.c:1843 +#: src/lang.c:1850 msgid "Color of article header lines :" msgstr "" -#: src/lang.c:1844 +#: src/lang.c:1851 msgid "# Color of header-lines\n" msgstr "" -#: src/lang.c:1849 +#: src/lang.c:1856 msgid "Color of actual news header fields :" msgstr "" -#: src/lang.c:1850 +#: src/lang.c:1857 msgid "# Color of actual news header fields\n" msgstr "" -#: src/lang.c:1855 +#: src/lang.c:1862 msgid "Color of article subject lines :" msgstr "" -#: src/lang.c:1856 +#: src/lang.c:1863 msgid "# Color of article subject\n" msgstr "" -#: src/lang.c:1861 +#: src/lang.c:1868 msgid "Color of response counter :" msgstr "" -#: src/lang.c:1862 +#: src/lang.c:1869 msgid "# Color of response counter\n" msgstr "" -#: src/lang.c:1867 +#: src/lang.c:1874 msgid "Color of sender (From:) :" msgstr "" -#: src/lang.c:1868 +#: src/lang.c:1875 msgid "# Color of sender (From:)\n" msgstr "" -#: src/lang.c:1873 +#: src/lang.c:1880 msgid "Color of help/mail sign :" msgstr "" -#: src/lang.c:1874 +#: src/lang.c:1881 msgid "# Color of Help/Mail-Sign\n" msgstr "" -#: src/lang.c:1879 +#: src/lang.c:1886 msgid "Color of signatures :" msgstr "" -#: src/lang.c:1880 +#: src/lang.c:1887 msgid "# Color of signature\n" msgstr "" -#: src/lang.c:1885 +#: src/lang.c:1892 msgid "Color of highlighting with *stars* :" msgstr "" -#: src/lang.c:1886 +#: src/lang.c:1893 msgid "# Color of word highlighting. There are four possibilities\n" "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" msgstr "" -#: src/lang.c:1892 +#: src/lang.c:1899 msgid "Color of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1898 +#: src/lang.c:1905 msgid "Color of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1904 +#: src/lang.c:1911 msgid "Color of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1911 +#: src/lang.c:1918 msgid "Attr. of highlighting with *stars* :" msgstr "" -#: src/lang.c:1912 +#: src/lang.c:1919 msgid "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" "# *stars*, /slashes/, _underdashes_ and -strokes-.\n" @@ -5185,85 +5206,93 @@ msgid "# Attribute of word highlighting "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1922 +#: src/lang.c:1929 msgid "Attr. of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1928 +#: src/lang.c:1935 msgid "Attr. of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1934 +#: src/lang.c:1941 msgid "Attr. of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1947 +msgid "URL highlighting in message body :" +msgstr "" + +#: src/lang.c:1948 +msgid "# Enable URL highlighting?\n" +msgstr "" + +#: src/lang.c:1953 msgid "Word highlighting in message body :" msgstr "" -#: src/lang.c:1941 +#: src/lang.c:1954 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1959 msgid "What to display instead of mark :" msgstr "" -#: src/lang.c:1947 +#: src/lang.c:1960 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:1953 +#: src/lang.c:1966 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1967 msgid "Page line wrap column :" msgstr "" -#: src/lang.c:1955 +#: src/lang.c:1968 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1960 +#: src/lang.c:1973 msgid "Wrap around threads on next unread :" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:1974 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1965 +#: src/lang.c:1978 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1966 +#: src/lang.c:1979 msgid "Mail address (and fullname) :" msgstr "" -#: src/lang.c:1967 +#: src/lang.c:1980 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:1972 +#: src/lang.c:1985 msgid "Show empty Followup-To in editor :" msgstr "" -#: src/lang.c:1973 +#: src/lang.c:1986 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:1977 +#: src/lang.c:1990 msgid "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:1978 +#: src/lang.c:1991 msgid "Create signature from path/command :" msgstr "" -#: src/lang.c:1979 +#: src/lang.c:1992 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 " @@ -5271,48 +5300,48 @@ msgid "# Signature path (random sigs)/fi "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1999 msgid "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:1987 +#: src/lang.c:2000 msgid "Prepend signature with \"-- \" :" msgstr "" -#: src/lang.c:1988 +#: src/lang.c:2001 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:2005 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:2006 msgid "Add signature when reposting :" msgstr "" -#: src/lang.c:1994 +#: src/lang.c:2007 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:1998 +#: src/lang.c:2011 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:1999 +#: src/lang.c:2012 msgid "Characters used as quote-marks :" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2013 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:2006 +#: src/lang.c:2019 msgid "Quoting behavior :" msgstr "" -#: src/lang.c:2007 +#: src/lang.c:2020 msgid "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" "# 1 = Compress quotes\n" @@ -5324,49 +5353,49 @@ msgid "# How quoting should be handled w "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2019 src/lang.c:2027 src/lang.c:2033 +#: src/lang.c:2032 src/lang.c:2040 src/lang.c:2046 msgid "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2020 +#: src/lang.c:2033 msgid "Quote line when following up :" msgstr "" -#: src/lang.c:2021 +#: src/lang.c:2034 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:2028 +#: src/lang.c:2041 msgid "Quote line when cross-posting :" msgstr "" -#: src/lang.c:2034 +#: src/lang.c:2047 msgid "Quote line when mailing :" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2052 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2040 +#: src/lang.c:2053 msgid "Insert 'User-Agent:'-header :" msgstr "" -#: src/lang.c:2041 +#: src/lang.c:2054 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2058 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2046 +#: src/lang.c:2059 msgid "MM_CHARSET :" msgstr "" -#: src/lang.c:2047 +#: src/lang.c:2060 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" @@ -5375,27 +5404,27 @@ msgid "# Charset supported locally which "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2058 +#: src/lang.c:2071 msgid "MM_NETWORK_CHARSET :" msgstr "" -#: src/lang.c:2059 +#: src/lang.c:2072 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2065 +#: src/lang.c:2078 msgid "Mailbox format :" msgstr "" -#: src/lang.c:2066 +#: src/lang.c:2079 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2084 msgid "MIME encoding in news messages :" msgstr "" -#: src/lang.c:2072 +#: src/lang.c:2085 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" @@ -5403,42 +5432,42 @@ msgid "# MIME encoding (8bit, base64, qu "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2080 src/lang.c:2101 +#: src/lang.c:2093 src/lang.c:2114 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2081 +#: src/lang.c:2094 msgid "Use 8bit characters in news headers:" msgstr "" -#: src/lang.c:2082 +#: src/lang.c:2095 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:2089 +#: src/lang.c:2102 msgid "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2103 msgid "View post-processed files :" msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2104 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2096 +#: src/lang.c:2109 msgid "MIME encoding in mail messages :" msgstr "" -#: src/lang.c:2102 +#: src/lang.c:2115 msgid "Use 8bit characters in mail headers:" msgstr "" -#: src/lang.c:2103 +#: src/lang.c:2116 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 " @@ -5448,351 +5477,352 @@ msgid "# If ON, 8bit characters in mail "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2113 +#: src/lang.c:2126 msgid "Strip blanks from ends of lines :" msgstr "" -#: src/lang.c:2114 +#: src/lang.c:2127 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2119 +#: src/lang.c:2132 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2120 +#: src/lang.c:2133 msgid "Transliteration :" msgstr "" -#: src/lang.c:2121 +#: src/lang.c:2134 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:2128 +#: src/lang.c:2141 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2129 +#: src/lang.c:2142 msgid "Send you a cc automatically :" msgstr "" -#: src/lang.c:2130 +#: src/lang.c:2143 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2147 msgid "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2135 +#: src/lang.c:2148 msgid "Send you a blind cc automatically :" msgstr "" -#: src/lang.c:2136 +#: src/lang.c:2149 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2153 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2141 +#: src/lang.c:2154 msgid "Spamtrap warning address parts :" msgstr "" -#: src/lang.c:2142 +#: src/lang.c:2155 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:2147 +#: src/lang.c:2160 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2148 +#: src/lang.c:2161 msgid "No. of days a filter entry is valid:" msgstr "" -#: src/lang.c:2149 +#: src/lang.c:2162 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2153 +#: src/lang.c:2166 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2154 +#: src/lang.c:2167 msgid "Add posted articles to filter :" msgstr "" -#: src/lang.c:2155 +#: src/lang.c:2168 msgid "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2159 +#: src/lang.c:2172 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2160 +#: src/lang.c:2173 msgid "Mail directory :" msgstr "" -#: src/lang.c:2161 +#: src/lang.c:2174 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2166 +#: src/lang.c:2179 msgid "Save articles in batch mode (-S) :" msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2180 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:2172 +#: src/lang.c:2185 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2186 msgid "Directory to save arts/threads in :" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2187 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2178 +#: src/lang.c:2191 msgid "Auto save article/thread by Archive-name: header. toggles & sets." msgstr "" -#: src/lang.c:2179 +#: src/lang.c:2192 msgid "Use Archive-name: header for save :" msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2193 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:2185 +#: src/lang.c:2198 msgid "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2186 +#: src/lang.c:2199 msgid "Mark saved articles/threads as read:" msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2200 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2204 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2192 +#: src/lang.c:2205 msgid "Post process saved articles :" msgstr "" -#: src/lang.c:2193 +#: src/lang.c:2206 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:2199 +#: src/lang.c:2212 msgid "Process only unread articles :" msgstr "" -#: src/lang.c:2200 +#: src/lang.c:2213 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" msgstr "" -#: src/lang.c:2205 +#: src/lang.c:2218 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2206 +#: src/lang.c:2219 msgid "Print all headers when printing :" msgstr "" -#: src/lang.c:2207 +#: src/lang.c:2220 msgid "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2224 msgid "The printer program with options that is to be used to print articles/threads." msgstr "" -#: src/lang.c:2212 +#: src/lang.c:2225 msgid "Printer program with options :" msgstr "" -#: src/lang.c:2213 +#: src/lang.c:2226 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2219 +#: src/lang.c:2232 msgid "Force redraw after certain commands:" msgstr "" -#: src/lang.c:2220 +#: src/lang.c:2233 msgid "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2237 msgid "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2225 +#: src/lang.c:2238 msgid "Start editor with line offset :" msgstr "" -#: src/lang.c:2226 +#: src/lang.c:2239 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:2231 +#: src/lang.c:2244 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2232 +#: src/lang.c:2245 msgid "Invocation of your editor :" msgstr "" -#: src/lang.c:2233 +#: src/lang.c:2246 msgid "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2238 +#: src/lang.c:2251 msgid "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2239 +#: src/lang.c:2252 msgid "External inews :" msgstr "" -#: src/lang.c:2240 +#: src/lang.c:2253 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:2244 +#: src/lang.c:2257 msgid "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2245 +#: src/lang.c:2258 msgid "Invocation of your mail command :" msgstr "" -#: src/lang.c:2246 +#: src/lang.c:2259 msgid "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename %%U User (AmigaDOS)\n" "# ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" msgstr "" -#: src/lang.c:2254 +#: src/lang.c:2267 msgid "Use interactive mail reader :" msgstr "" -#: src/lang.c:2255 -msgid "# Interactive mailreader: if ON mailreader will be invoked earlier for\n" - "# reply so you can use more of its features (eg. MIME, pgp, ...)\n" - "# this option has to suit default_mailer_format\n" +#: src/lang.c:2268 +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:2262 +#: src/lang.c:2276 msgid "Remove ~/.article after posting :" msgstr "" -#: src/lang.c:2263 +#: src/lang.c:2277 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2267 +#: src/lang.c:2281 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2268 +#: src/lang.c:2282 msgid "Filename for posted articles :" msgstr "" -#: src/lang.c:2269 +#: src/lang.c:2283 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:2274 +#: src/lang.c:2288 msgid "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2275 +#: src/lang.c:2289 msgid "Keep failed arts in ~/dead.articles:" msgstr "" -#: src/lang.c:2276 +#: src/lang.c:2290 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2280 +#: src/lang.c:2294 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2281 +#: src/lang.c:2295 msgid "No unsubscribed groups in newsrc :" msgstr "" -#: src/lang.c:2282 +#: src/lang.c:2296 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2287 +#: src/lang.c:2301 msgid "Remove bogus groups from newsrc :" msgstr "" -#: src/lang.c:2288 +#: src/lang.c:2302 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:2292 +#: src/lang.c:2306 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2293 +#: src/lang.c:2307 msgid "Interval in secs to reread active :" msgstr "" -#: src/lang.c:2294 +#: src/lang.c:2308 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2299 +#: src/lang.c:2313 msgid "Reconnect to server automatically :" msgstr "Reconnexion automatique au serveur :" -#: src/lang.c:2300 +#: src/lang.c:2314 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2304 +#: src/lang.c:2318 msgid "Create local copies of NNTP overview files. toggles & sets." msgstr "Créer des copies locales des en-têtes NNTP. change & choisi." -#: src/lang.c:2305 +#: src/lang.c:2319 msgid "Cache NNTP overview files locally :" msgstr "Cache local des en-têtes NNTP :" -#: src/lang.c:2306 +#: src/lang.c:2320 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" @@ -6052,7 +6082,7 @@ msgstr "Code NNTP donné inconnu" msgid "couldn't expand %s\n" msgstr "impossible de décompacter %s\n" -#: src/open.c:1032 +#: src/open.c:1123 msgid "Unreachable?\n" msgstr "Inacessible ?\n" @@ -6061,14 +6091,14 @@ msgstr "Inacessible ?\n" msgid "%s is bogus" msgstr "%s pose problème" -#: src/post.c:1940 +#: src/post.c:1936 #, c-format msgid "Posting: %.*s ..." msgstr "Postage : %.*s ..." # TRANSLATION MISSING #. TODO: -> lang.c -#: src/post.c:4038 +#: src/post.c:4034 #, c-format msgid "Rereading %s..." msgstr "" Binary files tin-1.7.0/po/messages and tin-1.7.1/po/messages differ diff -Nurp tin-1.7.0/po/tin.pot tin-1.7.1/po/tin.pot --- tin-1.7.0/po/tin.pot Sun Aug 10 16:30:27 2003 +++ tin-1.7.1/po/tin.pot Thu Sep 18 18:32:06 2003 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-08-10 16:30+0200\n" +"POT-Creation-Date: 2003-09-18 18:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,6 +13,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" +#: src/art.c:1228 +#, c-format +msgid "%d Bad overview record (%d fields) '%s'" +msgstr "" + #: src/attrib.c:574 msgid "" "# Do not edit this comment block\n" @@ -214,7 +219,7 @@ msgstr "" msgid "# and set Followup-To: poster\n" msgstr "" -#: src/cook.c:798 +#: src/cook.c:799 msgid "(unknown)" msgstr "" @@ -872,7 +877,7 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "" -#: src/lang.c:199 src/open.c:1009 +#: src/lang.c:199 src/open.c:1100 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "" @@ -887,7 +892,7 @@ msgid "MIME parse error: Start boundary msgstr "" #: src/lang.c:203 -msgid "Can't get a (fully-qualified) domain-name!\n" +msgid "Can't get a (fully-qualified) domain-name!" msgstr "" #: src/lang.c:204 @@ -4064,413 +4069,426 @@ msgid "Comp. q., quote sigs & empty line msgstr "" #: src/lang.c:1290 +msgid "no" +msgstr "" + +#: src/lang.c:1291 +msgid "with headers" +msgstr "" + +#: src/lang.c:1292 +msgid "without headers" +msgstr "" + +#: src/lang.c:1297 msgid "Display Options" msgstr "" -#: src/lang.c:1296 +#: src/lang.c:1303 msgid "Color Options" msgstr "" -#: src/lang.c:1302 +#: src/lang.c:1309 msgid "Article-Limiting Options" msgstr "" -#: src/lang.c:1308 +#: src/lang.c:1315 msgid "Posting/Mailing Options" msgstr "" -#: src/lang.c:1314 +#: src/lang.c:1321 msgid "Saving/Printing Options" msgstr "" -#: src/lang.c:1320 +#: src/lang.c:1327 msgid "Expert Options" msgstr "" -#: src/lang.c:1326 +#: src/lang.c:1333 msgid "Filtering Options" msgstr "" -#: src/lang.c:1331 src/lang.c:1357 src/lang.c:1363 src/lang.c:1370 -#: src/lang.c:1402 src/lang.c:1408 src/lang.c:1416 src/lang.c:1436 -#: src/lang.c:1511 src/lang.c:1673 src/lang.c:1679 src/lang.c:1685 -#: src/lang.c:1691 src/lang.c:1703 src/lang.c:1710 src/lang.c:1761 -#: src/lang.c:1770 src/lang.c:1776 src/lang.c:1782 src/lang.c:1788 -#: src/lang.c:1794 src/lang.c:1800 src/lang.c:1806 src/lang.c:1812 -#: src/lang.c:1818 src/lang.c:1824 src/lang.c:1830 src/lang.c:1836 -#: src/lang.c:1842 src/lang.c:1848 src/lang.c:1854 src/lang.c:1860 -#: src/lang.c:1866 src/lang.c:1872 src/lang.c:1878 src/lang.c:1884 -#: src/lang.c:1891 src/lang.c:1897 src/lang.c:1903 src/lang.c:1910 -#: src/lang.c:1921 src/lang.c:1927 src/lang.c:1933 src/lang.c:1939 -#: src/lang.c:1945 src/lang.c:1959 src/lang.c:1971 src/lang.c:2005 -#: src/lang.c:2057 src/lang.c:2064 src/lang.c:2070 src/lang.c:2095 -#: src/lang.c:2112 src/lang.c:2165 src/lang.c:2198 src/lang.c:2218 -#: src/lang.c:2253 src/lang.c:2261 src/lang.c:2286 src/lang.c:2298 +#: src/lang.c:1338 src/lang.c:1364 src/lang.c:1370 src/lang.c:1377 +#: src/lang.c:1409 src/lang.c:1415 src/lang.c:1423 src/lang.c:1443 +#: src/lang.c:1518 src/lang.c:1680 src/lang.c:1686 src/lang.c:1692 +#: src/lang.c:1698 src/lang.c:1710 src/lang.c:1717 src/lang.c:1768 +#: src/lang.c:1777 src/lang.c:1783 src/lang.c:1789 src/lang.c:1795 +#: src/lang.c:1801 src/lang.c:1807 src/lang.c:1813 src/lang.c:1819 +#: src/lang.c:1825 src/lang.c:1831 src/lang.c:1837 src/lang.c:1843 +#: src/lang.c:1849 src/lang.c:1855 src/lang.c:1861 src/lang.c:1867 +#: src/lang.c:1873 src/lang.c:1879 src/lang.c:1885 src/lang.c:1891 +#: src/lang.c:1898 src/lang.c:1904 src/lang.c:1910 src/lang.c:1917 +#: src/lang.c:1928 src/lang.c:1934 src/lang.c:1940 src/lang.c:1946 +#: src/lang.c:1952 src/lang.c:1958 src/lang.c:1972 src/lang.c:1984 +#: src/lang.c:2018 src/lang.c:2070 src/lang.c:2077 src/lang.c:2083 +#: src/lang.c:2108 src/lang.c:2125 src/lang.c:2178 src/lang.c:2211 +#: src/lang.c:2231 src/lang.c:2266 src/lang.c:2275 src/lang.c:2300 +#: src/lang.c:2312 msgid " toggles, sets, cancels." msgstr "" -#: src/lang.c:1332 +#: src/lang.c:1339 msgid "Show mini menu & posting etiquette :" msgstr "" -#: src/lang.c:1333 +#: src/lang.c:1340 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:1338 +#: src/lang.c:1345 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" -#: src/lang.c:1339 +#: src/lang.c:1346 msgid "Show description of each newsgroup :" msgstr "" -#: src/lang.c:1340 +#: src/lang.c:1347 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" -#: src/lang.c:1345 +#: src/lang.c:1352 msgid "" "Show Subject & From (author) fields in group menu. toggles & " "sets." msgstr "" -#: src/lang.c:1346 +#: src/lang.c:1353 msgid "In group menu, show author by :" msgstr "" -#: src/lang.c:1347 +#: src/lang.c:1354 msgid "" "# Part of from field to display 0) none 1) address 2) full name 3) both\n" msgstr "" -#: src/lang.c:1351 +#: src/lang.c:1358 msgid "Draw -> or highlighted bar for selection. toggles & sets." msgstr "" -#: src/lang.c:1352 +#: src/lang.c:1359 msgid "Draw -> instead of highlighted bar :" msgstr "" -#: src/lang.c:1353 +#: src/lang.c:1360 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "" -#: src/lang.c:1358 +#: src/lang.c:1365 msgid "Use inverse video for page headers :" msgstr "" -#: src/lang.c:1359 +#: src/lang.c:1366 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "" -#: src/lang.c:1364 +#: src/lang.c:1371 msgid "Thread articles by :" msgstr "" -#: src/lang.c:1365 +#: src/lang.c:1372 msgid "" "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" msgstr "" -#: src/lang.c:1371 +#: src/lang.c:1378 msgid "Score of a thread :" msgstr "" -#: src/lang.c:1372 +#: src/lang.c:1379 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" msgstr "" -#: src/lang.c:1376 +#: src/lang.c:1383 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" -#: src/lang.c:1377 +#: src/lang.c:1384 msgid "Sort articles by :" msgstr "" -#: src/lang.c:1378 +#: src/lang.c:1385 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:1384 +#: src/lang.c:1391 msgid "Sort threads by Nothing or Score. toggles & sets." msgstr "" -#: src/lang.c:1385 +#: src/lang.c:1392 msgid "Sort threads by :" msgstr "" -#: src/lang.c:1386 +#: src/lang.c:1393 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" msgstr "" -#: src/lang.c:1390 +#: src/lang.c:1397 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" -#: src/lang.c:1391 +#: src/lang.c:1398 msgid "Goto first unread article in group :" msgstr "" -#: src/lang.c:1392 +#: src/lang.c:1399 msgid "# If ON put cursor at first unread art in group otherwise last art\n" msgstr "" -#: src/lang.c:1396 +#: src/lang.c:1403 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" -#: src/lang.c:1397 +#: src/lang.c:1404 msgid "Show only unread articles :" msgstr "" -#: src/lang.c:1398 +#: src/lang.c:1405 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "" -#: src/lang.c:1403 +#: src/lang.c:1410 msgid "Show only groups with unread arts :" msgstr "" -#: src/lang.c:1404 +#: src/lang.c:1411 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "" -#: src/lang.c:1409 +#: src/lang.c:1416 msgid "Filter which articles :" msgstr "" -#: src/lang.c:1410 +#: src/lang.c:1417 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:1417 +#: src/lang.c:1424 msgid "Tab goes to next unread article :" msgstr "" -#: src/lang.c:1418 +#: src/lang.c:1425 msgid "" "# If ON the TAB command will go to next unread article at article viewer " "level\n" msgstr "" -#: src/lang.c:1422 +#: src/lang.c:1429 msgid "" "Scrolling with past the end of an art. jumps to the next unread one." msgstr "" -#: src/lang.c:1423 +#: src/lang.c:1430 msgid "Space goes to next unread article :" msgstr "" -#: src/lang.c:1424 +#: src/lang.c:1431 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:1429 +#: src/lang.c:1436 msgid "" "Scrolling with / past the end of an art. jumps to the unread one." msgstr "" -#: src/lang.c:1430 +#: src/lang.c:1437 msgid "PgDn goes to next unread article :" msgstr "" -#: src/lang.c:1431 +#: src/lang.c:1438 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:1437 +#: src/lang.c:1444 msgid "List thread using right arrow key :" msgstr "" -#: src/lang.c:1438 +#: src/lang.c:1445 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" -#: src/lang.c:1442 +#: src/lang.c:1449 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" -#: src/lang.c:1443 +#: src/lang.c:1450 msgid "Character to show deleted articles :" msgstr "" -#: src/lang.c:1444 +#: src/lang.c:1451 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1449 +#: src/lang.c:1456 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" -#: src/lang.c:1450 +#: src/lang.c:1457 msgid "Character to show inrange articles :" msgstr "" -#: src/lang.c:1451 +#: src/lang.c:1458 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1456 +#: src/lang.c:1463 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" -#: src/lang.c:1457 +#: src/lang.c:1464 msgid "Character to show returning arts :" msgstr "" -#: src/lang.c:1458 +#: src/lang.c:1465 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1463 +#: src/lang.c:1470 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" -#: src/lang.c:1464 +#: src/lang.c:1471 msgid "Character to show selected articles:" msgstr "" -#: src/lang.c:1465 +#: src/lang.c:1472 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1470 +#: src/lang.c:1477 msgid "Enter character to indicate recent articles. sets, cancels." msgstr "" -#: src/lang.c:1471 +#: src/lang.c:1478 msgid "Character to show recent articles :" msgstr "" -#: src/lang.c:1472 +#: src/lang.c:1479 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1477 +#: src/lang.c:1484 msgid "Enter character to indicate unread articles. sets, cancels." msgstr "" -#: src/lang.c:1478 +#: src/lang.c:1485 msgid "Character to show unread articles :" msgstr "" -#: src/lang.c:1479 +#: src/lang.c:1486 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1484 +#: src/lang.c:1491 msgid "Enter character to indicate read articles. sets, cancels." msgstr "" -#: src/lang.c:1485 +#: src/lang.c:1492 msgid "Character to show read articles :" msgstr "" -#: src/lang.c:1486 +#: src/lang.c:1493 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" -#: src/lang.c:1491 +#: src/lang.c:1498 msgid "Enter character to indicate killed articles. sets, cancels." msgstr "" -#: src/lang.c:1492 +#: src/lang.c:1499 msgid "Character to show killed articles :" msgstr "" -#: src/lang.c:1493 +#: src/lang.c:1500 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:1498 +#: src/lang.c:1505 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" -#: src/lang.c:1499 +#: src/lang.c:1506 msgid "Character to show readselected arts:" msgstr "" -#: src/lang.c:1500 +#: src/lang.c:1507 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:1505 +#: src/lang.c:1512 msgid "Enter maximum length of newsgroup names displayed. sets." msgstr "" -#: src/lang.c:1506 +#: src/lang.c:1513 msgid "Max. length of group names shown :" msgstr "" -#: src/lang.c:1507 +#: src/lang.c:1514 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "" -#: src/lang.c:1512 +#: src/lang.c:1519 msgid "Show lines/score in listings :" msgstr "" -#: src/lang.c:1513 +#: src/lang.c:1520 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:1518 +#: src/lang.c:1525 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" -#: src/lang.c:1519 +#: src/lang.c:1526 msgid "Number of lines to scroll in pager :" msgstr "" -#: src/lang.c:1520 +#: src/lang.c:1527 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" @@ -4478,28 +4496,28 @@ msgid "" "# -2 = half-page scrolling\n" msgstr "" -#: src/lang.c:1527 +#: src/lang.c:1534 msgid "Display signatures. toggles & sets." msgstr "" -#: src/lang.c:1528 +#: src/lang.c:1535 msgid "Display signatures :" msgstr "" -#: src/lang.c:1529 +#: src/lang.c:1536 msgid "# If OFF don't show signatures when displaying articles\n" msgstr "" -#: src/lang.c:1533 +#: src/lang.c:1540 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" -#: src/lang.c:1534 +#: src/lang.c:1541 msgid "Display uue data as an attachment :" msgstr "" -#: src/lang.c:1535 +#: src/lang.c:1542 msgid "" "# Handling of uuencoded data in the pager\n" "# 0 = display raw uuencoded data\n" @@ -4509,30 +4527,30 @@ msgid "" "# into a tag line.\n" msgstr "" -#: src/lang.c:1544 +#: src/lang.c:1551 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" -#: src/lang.c:1545 +#: src/lang.c:1552 msgid "Display \"a as Umlaut-a :" msgstr "" -#: src/lang.c:1546 +#: src/lang.c:1553 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" -#: src/lang.c:1551 src/lang.c:1561 +#: src/lang.c:1558 src/lang.c:1568 msgid "Space separated list of header fields" msgstr "" -#: src/lang.c:1552 +#: src/lang.c:1559 msgid "Display these header fields (or *) :" msgstr "" -#: src/lang.c:1553 +#: src/lang.c:1560 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" @@ -4542,11 +4560,11 @@ msgid "" "# spaces. Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1562 +#: src/lang.c:1569 msgid "Do not display these header fields :" msgstr "" -#: src/lang.c:1563 +#: src/lang.c:1570 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" @@ -4558,163 +4576,163 @@ msgid "" "# Not defining anything turns off this option.\n" msgstr "" -#: src/lang.c:1573 +#: src/lang.c:1580 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" -#: src/lang.c:1574 +#: src/lang.c:1581 msgid "Skip multipart/alternative parts :" msgstr "" -#: src/lang.c:1575 +#: src/lang.c:1582 msgid "# If ON strip multipart/alternative messages automatically\n" msgstr "" -#: src/lang.c:1580 +#: src/lang.c:1587 msgid "A regex used to decide which lines to show in col_quote." msgstr "" -#: src/lang.c:1581 +#: src/lang.c:1588 msgid "Regex used to show quoted lines :" msgstr "" -#: src/lang.c:1582 +#: src/lang.c:1589 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:1588 +#: src/lang.c:1595 msgid "A regex used to decide which lines to show in col_quote2." msgstr "" -#: src/lang.c:1589 +#: src/lang.c:1596 msgid "Regex used to show twice quoted l. :" msgstr "" -#: src/lang.c:1590 +#: src/lang.c:1597 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:1596 +#: src/lang.c:1603 msgid "A regex used to decide which lines to show in col_quote3." msgstr "" -#: src/lang.c:1597 +#: src/lang.c:1604 msgid "Regex used to show >= 3 times q.l. :" msgstr "" -#: src/lang.c:1598 +#: src/lang.c:1605 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:1605 +#: src/lang.c:1612 msgid "A regex used to decide which words to show in col_markslashes." msgstr "" -#: src/lang.c:1606 +#: src/lang.c:1613 msgid "Regex used to highlight /slashes/ :" msgstr "" -#: src/lang.c:1607 +#: src/lang.c:1614 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:1613 +#: src/lang.c:1620 msgid "A regex used to decide which words to show in col_markstars." msgstr "" -#: src/lang.c:1614 +#: src/lang.c:1621 msgid "Regex used to highlight *stars* :" msgstr "" -#: src/lang.c:1615 +#: 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_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1621 +#: src/lang.c:1628 msgid "A regex used to decide which words to show in col_markstroke." msgstr "" -#: src/lang.c:1622 +#: src/lang.c:1629 msgid "Regex used to highlight -strokes- :" msgstr "" -#: src/lang.c:1623 +#: 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_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1629 +#: src/lang.c:1636 msgid "A regex used to decide which words to show in col_markdash." msgstr "" -#: src/lang.c:1630 +#: src/lang.c:1637 msgid "Regex used to highlight _underline_:" msgstr "" -#: src/lang.c:1631 +#: 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_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" -#: src/lang.c:1637 +#: src/lang.c:1644 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1638 +#: src/lang.c:1645 msgid "Regex with Subject prefixes :" msgstr "" -#: src/lang.c:1639 +#: src/lang.c:1646 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:1644 +#: src/lang.c:1651 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" -#: src/lang.c:1645 +#: src/lang.c:1652 msgid "Regex with Subject suffixes :" msgstr "" -#: src/lang.c:1646 +#: src/lang.c:1653 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:1651 +#: src/lang.c:1658 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" -#: src/lang.c:1652 +#: src/lang.c:1659 msgid "MIME binary content viewer :" msgstr "" -#: src/lang.c:1653 +#: src/lang.c:1660 msgid "" "# If --internal automatically use the built in MIME viewer for non-text\n" "# parts of articles.\n" @@ -4723,365 +4741,365 @@ msgid "" "# for no automatic viewing\n" msgstr "" -#: src/lang.c:1660 +#: src/lang.c:1667 msgid "Confirm before starting non-text viewing program" msgstr "" -#: src/lang.c:1661 +#: src/lang.c:1668 msgid "Ask before using MIME viewer :" msgstr "" -#: src/lang.c:1662 +#: src/lang.c:1669 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:1667 +#: src/lang.c:1674 msgid "Ask to mark groups read when quitting. toggles & sets." msgstr "" -#: src/lang.c:1668 +#: src/lang.c:1675 msgid "Catchup read groups when quitting :" msgstr "" -#: src/lang.c:1669 +#: src/lang.c:1676 msgid "# If ON ask user if read groups should all be marked read\n" msgstr "" -#: src/lang.c:1674 +#: src/lang.c:1681 msgid "Catchup group using left key :" msgstr "" -#: src/lang.c:1675 +#: src/lang.c:1682 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" msgstr "" -#: src/lang.c:1680 +#: src/lang.c:1687 msgid "Catchup thread by using left key :" msgstr "" -#: src/lang.c:1686 +#: src/lang.c:1693 msgid "Which actions require confirmation :" msgstr "" -#: src/lang.c:1687 +#: src/lang.c:1694 msgid "# What should we ask confirmation for.\n" msgstr "" -#: src/lang.c:1692 +#: src/lang.c:1699 msgid "'Mark article read' ignores tags :" msgstr "" -#: src/lang.c:1693 +#: src/lang.c:1700 msgid "" "# If ON the 'Mark article read' function marks only the current article.\n" msgstr "" -#: src/lang.c:1697 +#: src/lang.c:1704 msgid "Program to run to open URL's, sets, cancels." msgstr "" -#: src/lang.c:1698 +#: src/lang.c:1705 msgid "Program that opens URL's :" msgstr "" -#: src/lang.c:1699 +#: src/lang.c:1706 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" -#: src/lang.c:1704 +#: src/lang.c:1711 msgid "Use mouse in xterm :" msgstr "" -#: src/lang.c:1705 +#: src/lang.c:1712 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "" -#: src/lang.c:1711 +#: src/lang.c:1718 msgid "Use scroll keys on keypad :" msgstr "" -#: src/lang.c:1712 +#: src/lang.c:1719 msgid "# If ON enable scroll keys on terminals that support it\n" msgstr "" -#: src/lang.c:1717 +#: src/lang.c:1724 msgid "Enter maximum number of article to get. sets." msgstr "" -#: src/lang.c:1718 +#: src/lang.c:1725 msgid "Number of articles to get :" msgstr "" -#: src/lang.c:1719 +#: src/lang.c:1726 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:1724 +#: src/lang.c:1731 msgid "Enter number of days article is considered recent. sets." msgstr "" -#: src/lang.c:1725 +#: src/lang.c:1732 msgid "Article recentness time limit :" msgstr "" -#: src/lang.c:1726 +#: src/lang.c:1733 msgid "# Number of days in which article is considered recent, (0=OFF)\n" msgstr "" -#: src/lang.c:1730 +#: src/lang.c:1737 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" -#: src/lang.c:1731 +#: src/lang.c:1738 msgid "Wildcard matching :" msgstr "" -#: src/lang.c:1732 +#: src/lang.c:1739 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" msgstr "" -#: src/lang.c:1736 +#: src/lang.c:1743 msgid "Enter minimal score before an article is marked killed. sets." msgstr "" -#: src/lang.c:1737 +#: src/lang.c:1744 msgid "Score limit (kill) :" msgstr "" -#: src/lang.c:1738 +#: src/lang.c:1745 msgid "# Score limit before an article is marked killed\n" msgstr "" -#: src/lang.c:1742 +#: src/lang.c:1749 msgid "Enter default score to kill articles. sets." msgstr "" -#: src/lang.c:1743 +#: src/lang.c:1750 msgid "Default score to kill articles :" msgstr "" -#: src/lang.c:1744 +#: src/lang.c:1751 msgid "# Default score to kill articles\n" msgstr "" -#: src/lang.c:1748 +#: src/lang.c:1755 msgid "Enter minimal score before an article is marked hot. sets." msgstr "" -#: src/lang.c:1749 +#: src/lang.c:1756 msgid "Score limit (select) :" msgstr "" -#: src/lang.c:1750 +#: src/lang.c:1757 msgid "# Score limit before an article is marked hot\n" msgstr "" -#: src/lang.c:1754 +#: src/lang.c:1761 msgid "Enter default score to select articles. sets." msgstr "" -#: src/lang.c:1755 +#: src/lang.c:1762 msgid "Default score to select articles :" msgstr "" -#: src/lang.c:1756 +#: src/lang.c:1763 msgid "# Default score to select articles\n" msgstr "" -#: src/lang.c:1762 +#: src/lang.c:1769 msgid "Use slrnface to show ''X-Face:''s :" msgstr "" -#: src/lang.c:1763 +#: src/lang.c:1770 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:1771 +#: src/lang.c:1778 msgid "Use ANSI color :" msgstr "" -#: src/lang.c:1772 +#: src/lang.c:1779 msgid "# If ON using ANSI-color\n" msgstr "" -#: src/lang.c:1777 +#: src/lang.c:1784 msgid "Standard foreground color :" msgstr "" -#: src/lang.c:1778 +#: src/lang.c:1785 msgid "# Standard foreground color\n" msgstr "" -#: src/lang.c:1783 +#: src/lang.c:1790 msgid "Standard background color :" msgstr "" -#: src/lang.c:1784 +#: src/lang.c:1791 msgid "# Standard-Background-Color\n" msgstr "" -#: src/lang.c:1789 +#: src/lang.c:1796 msgid "Color for inverse text (background):" msgstr "" -#: src/lang.c:1790 +#: src/lang.c:1797 msgid "# Color of background for inverse text\n" msgstr "" -#: src/lang.c:1795 +#: src/lang.c:1802 msgid "Color for inverse text (foreground):" msgstr "" -#: src/lang.c:1796 +#: src/lang.c:1803 msgid "# Color of foreground for inverse text\n" msgstr "" -#: src/lang.c:1801 +#: src/lang.c:1808 msgid "Color of text lines :" msgstr "" -#: src/lang.c:1802 +#: src/lang.c:1809 msgid "# Color of text-lines\n" msgstr "" -#: src/lang.c:1807 +#: src/lang.c:1814 msgid "Color of mini help menu :" msgstr "" -#: src/lang.c:1808 +#: src/lang.c:1815 msgid "# Color of mini help menu\n" msgstr "" -#: src/lang.c:1813 +#: src/lang.c:1820 msgid "Color of help text :" msgstr "" -#: src/lang.c:1814 +#: src/lang.c:1821 msgid "# Color of help pages\n" msgstr "" -#: src/lang.c:1819 +#: src/lang.c:1826 msgid "Color of status messages :" msgstr "" -#: src/lang.c:1820 +#: src/lang.c:1827 msgid "# Color of messages in last line\n" msgstr "" -#: src/lang.c:1825 +#: src/lang.c:1832 msgid "Color of quoted lines :" msgstr "" -#: src/lang.c:1826 +#: src/lang.c:1833 msgid "# Color of quote-lines\n" msgstr "" -#: src/lang.c:1831 +#: src/lang.c:1838 msgid "Color of twice quoted line :" msgstr "" -#: src/lang.c:1832 +#: src/lang.c:1839 msgid "# Color of twice quoted lines\n" msgstr "" -#: src/lang.c:1837 +#: src/lang.c:1844 msgid "Color of =>3 times quoted line :" msgstr "" -#: src/lang.c:1838 +#: src/lang.c:1845 msgid "# Color of >=3 times quoted lines\n" msgstr "" -#: src/lang.c:1843 +#: src/lang.c:1850 msgid "Color of article header lines :" msgstr "" -#: src/lang.c:1844 +#: src/lang.c:1851 msgid "# Color of header-lines\n" msgstr "" -#: src/lang.c:1849 +#: src/lang.c:1856 msgid "Color of actual news header fields :" msgstr "" -#: src/lang.c:1850 +#: src/lang.c:1857 msgid "# Color of actual news header fields\n" msgstr "" -#: src/lang.c:1855 +#: src/lang.c:1862 msgid "Color of article subject lines :" msgstr "" -#: src/lang.c:1856 +#: src/lang.c:1863 msgid "# Color of article subject\n" msgstr "" -#: src/lang.c:1861 +#: src/lang.c:1868 msgid "Color of response counter :" msgstr "" -#: src/lang.c:1862 +#: src/lang.c:1869 msgid "# Color of response counter\n" msgstr "" -#: src/lang.c:1867 +#: src/lang.c:1874 msgid "Color of sender (From:) :" msgstr "" -#: src/lang.c:1868 +#: src/lang.c:1875 msgid "# Color of sender (From:)\n" msgstr "" -#: src/lang.c:1873 +#: src/lang.c:1880 msgid "Color of help/mail sign :" msgstr "" -#: src/lang.c:1874 +#: src/lang.c:1881 msgid "# Color of Help/Mail-Sign\n" msgstr "" -#: src/lang.c:1879 +#: src/lang.c:1886 msgid "Color of signatures :" msgstr "" -#: src/lang.c:1880 +#: src/lang.c:1887 msgid "# Color of signature\n" msgstr "" -#: src/lang.c:1885 +#: src/lang.c:1892 msgid "Color of highlighting with *stars* :" msgstr "" -#: src/lang.c:1886 +#: src/lang.c:1893 msgid "" "# Color of word highlighting. There are four possibilities\n" "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" msgstr "" -#: src/lang.c:1892 +#: src/lang.c:1899 msgid "Color of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1898 +#: src/lang.c:1905 msgid "Color of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1904 +#: src/lang.c:1911 msgid "Color of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1911 +#: src/lang.c:1918 msgid "Attr. of highlighting with *stars* :" msgstr "" -#: src/lang.c:1912 +#: src/lang.c:1919 msgid "" "# Attribute of word highlighting on mono terminals.\n" "# There are four possibilities in articles:\n" @@ -5091,87 +5109,95 @@ msgid "" "# 3 - Reverse video, 4 - Blinking, 5 - Half bright, 6 - Bold\n" msgstr "" -#: src/lang.c:1922 +#: src/lang.c:1929 msgid "Attr. of highlighting with _dash_ :" msgstr "" -#: src/lang.c:1928 +#: src/lang.c:1935 msgid "Attr. of highlighting with /slash/ :" msgstr "" -#: src/lang.c:1934 +#: src/lang.c:1941 msgid "Attr. of highlighting with -stroke-:" msgstr "" -#: src/lang.c:1940 +#: src/lang.c:1947 +msgid "URL highlighting in message body :" +msgstr "" + +#: src/lang.c:1948 +msgid "# Enable URL highlighting?\n" +msgstr "" + +#: src/lang.c:1953 msgid "Word highlighting in message body :" msgstr "" -#: src/lang.c:1941 +#: src/lang.c:1954 msgid "# Enable word highlighting?\n" msgstr "" -#: src/lang.c:1946 +#: src/lang.c:1959 msgid "What to display instead of mark :" msgstr "" -#: src/lang.c:1947 +#: src/lang.c:1960 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:1953 +#: src/lang.c:1966 msgid "Enter column number to wrap article lines to in the pager. sets." msgstr "" -#: src/lang.c:1954 +#: src/lang.c:1967 msgid "Page line wrap column :" msgstr "" -#: src/lang.c:1955 +#: src/lang.c:1968 msgid "# Wrap article lines at column\n" msgstr "" -#: src/lang.c:1960 +#: src/lang.c:1973 msgid "Wrap around threads on next unread :" msgstr "" -#: src/lang.c:1961 +#: src/lang.c:1974 msgid "# If ON wrap around threads on searching next unread article\n" msgstr "" -#: src/lang.c:1965 +#: src/lang.c:1978 msgid "Enter default mail address (and fullname). sets." msgstr "" -#: src/lang.c:1966 +#: src/lang.c:1979 msgid "Mail address (and fullname) :" msgstr "" -#: src/lang.c:1967 +#: src/lang.c:1980 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" -#: src/lang.c:1972 +#: src/lang.c:1985 msgid "Show empty Followup-To in editor :" msgstr "" -#: src/lang.c:1973 +#: src/lang.c:1986 msgid "# If ON show empty Followup-To header when editing an article\n" msgstr "" -#: src/lang.c:1977 +#: src/lang.c:1990 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" -#: src/lang.c:1978 +#: src/lang.c:1991 msgid "Create signature from path/command :" msgstr "" -#: src/lang.c:1979 +#: src/lang.c:1992 msgid "" "# Signature path (random sigs)/file to be used when posting/replying\n" "# default_sigfile=file appends file as signature\n" @@ -5180,50 +5206,50 @@ msgid "" "# default_sigfile=--none don't append a signature\n" msgstr "" -#: src/lang.c:1986 +#: src/lang.c:1999 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" -#: src/lang.c:1987 +#: src/lang.c:2000 msgid "Prepend signature with \"-- \" :" msgstr "" -#: src/lang.c:1988 +#: src/lang.c:2001 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" msgstr "" -#: src/lang.c:1992 +#: src/lang.c:2005 msgid "Add signature when reposting articles. toggles & sets." msgstr "" -#: src/lang.c:1993 +#: src/lang.c:2006 msgid "Add signature when reposting :" msgstr "" -#: src/lang.c:1994 +#: src/lang.c:2007 msgid "# If ON add signature to reposted articles\n" msgstr "" -#: src/lang.c:1998 +#: src/lang.c:2011 msgid "Enter quotation marks, %s or %S for author's initials." msgstr "" -#: src/lang.c:1999 +#: src/lang.c:2012 msgid "Characters used as quote-marks :" msgstr "" -#: src/lang.c:2000 +#: src/lang.c:2013 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:2006 +#: src/lang.c:2019 msgid "Quoting behavior :" msgstr "" -#: src/lang.c:2007 +#: src/lang.c:2020 msgid "" "# How quoting should be handled when following up or replying.\n" "# 0 = Nothing special\n" @@ -5236,52 +5262,52 @@ msgid "" "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" -#: src/lang.c:2019 src/lang.c:2027 src/lang.c:2033 +#: src/lang.c:2032 src/lang.c:2040 src/lang.c:2046 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" -#: src/lang.c:2020 +#: src/lang.c:2033 msgid "Quote line when following up :" msgstr "" -#: src/lang.c:2021 +#: src/lang.c:2034 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:2028 +#: src/lang.c:2041 msgid "Quote line when cross-posting :" msgstr "" -#: src/lang.c:2034 +#: src/lang.c:2047 msgid "Quote line when mailing :" msgstr "" -#: src/lang.c:2039 +#: src/lang.c:2052 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "" -#: src/lang.c:2040 +#: src/lang.c:2053 msgid "Insert 'User-Agent:'-header :" msgstr "" -#: src/lang.c:2041 +#: src/lang.c:2054 msgid "# If ON include advertising User-Agent: header\n" msgstr "" -#: src/lang.c:2045 +#: src/lang.c:2058 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" -#: src/lang.c:2046 +#: src/lang.c:2059 msgid "MM_CHARSET :" msgstr "" -#: src/lang.c:2047 +#: src/lang.c:2060 msgid "" "# Charset supported locally which is also used for MIME header and\n" "# Content-Type header.\n" @@ -5291,27 +5317,27 @@ msgid "" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" -#: src/lang.c:2058 +#: src/lang.c:2071 msgid "MM_NETWORK_CHARSET :" msgstr "" -#: src/lang.c:2059 +#: src/lang.c:2072 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "" -#: src/lang.c:2065 +#: src/lang.c:2078 msgid "Mailbox format :" msgstr "" -#: src/lang.c:2066 +#: src/lang.c:2079 msgid "# Format of the mailbox.\n" msgstr "" -#: src/lang.c:2071 +#: src/lang.c:2084 msgid "MIME encoding in news messages :" msgstr "" -#: src/lang.c:2072 +#: src/lang.c:2085 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" @@ -5320,15 +5346,15 @@ msgid "" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" -#: src/lang.c:2080 src/lang.c:2101 +#: src/lang.c:2093 src/lang.c:2114 msgid "Don't change unless you know what you are doing. cancels." msgstr "" -#: src/lang.c:2081 +#: src/lang.c:2094 msgid "Use 8bit characters in news headers:" msgstr "" -#: src/lang.c:2082 +#: src/lang.c:2095 msgid "" "# If ON, 8bit characters in news headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -5336,28 +5362,28 @@ msgid "" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" -#: src/lang.c:2089 +#: src/lang.c:2102 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" -#: src/lang.c:2090 +#: src/lang.c:2103 msgid "View post-processed files :" msgstr "" -#: src/lang.c:2091 +#: src/lang.c:2104 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "" -#: src/lang.c:2096 +#: src/lang.c:2109 msgid "MIME encoding in mail messages :" msgstr "" -#: src/lang.c:2102 +#: src/lang.c:2115 msgid "Use 8bit characters in mail headers:" msgstr "" -#: src/lang.c:2103 +#: src/lang.c:2116 msgid "" "# If ON, 8bit characters in mail headers are NOT encoded.\n" "# default is OFF. Thus 8bit characters are encoded by default.\n" @@ -5368,278 +5394,278 @@ msgid "" "# turn it ON unless you have some compelling reason.\n" msgstr "" -#: src/lang.c:2113 +#: src/lang.c:2126 msgid "Strip blanks from ends of lines :" msgstr "" -#: src/lang.c:2114 +#: src/lang.c:2127 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" -#: src/lang.c:2119 +#: src/lang.c:2132 msgid "If ON, use transliteration. toggles & sets." msgstr "" -#: src/lang.c:2120 +#: src/lang.c:2133 msgid "Transliteration :" msgstr "" -#: src/lang.c:2121 +#: src/lang.c:2134 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:2128 +#: src/lang.c:2141 msgid "Send you a carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2129 +#: src/lang.c:2142 msgid "Send you a cc automatically :" msgstr "" -#: src/lang.c:2130 +#: src/lang.c:2143 msgid "" "# If ON automatically put your name in the Cc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2134 +#: src/lang.c:2147 msgid "" "Send you a blind carbon copy automatically. toggles & sets." msgstr "" -#: src/lang.c:2135 +#: src/lang.c:2148 msgid "Send you a blind cc automatically :" msgstr "" -#: src/lang.c:2136 +#: src/lang.c:2149 msgid "" "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" msgstr "" -#: src/lang.c:2140 +#: src/lang.c:2153 msgid "Enter address elements about which you want to be warned. sets." msgstr "" -#: src/lang.c:2141 +#: src/lang.c:2154 msgid "Spamtrap warning address parts :" msgstr "" -#: src/lang.c:2142 +#: src/lang.c:2155 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:2147 +#: src/lang.c:2160 msgid "Enter default number of days a filter entry will be valid. sets." msgstr "" -#: src/lang.c:2148 +#: src/lang.c:2161 msgid "No. of days a filter entry is valid:" msgstr "" -#: src/lang.c:2149 +#: src/lang.c:2162 msgid "# Number of days a short term filter will be active\n" msgstr "" -#: src/lang.c:2153 +#: src/lang.c:2166 msgid "Add posted articles to filter. toggles & sets." msgstr "" -#: src/lang.c:2154 +#: src/lang.c:2167 msgid "Add posted articles to filter :" msgstr "" -#: src/lang.c:2155 +#: src/lang.c:2168 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" -#: src/lang.c:2159 +#: src/lang.c:2172 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" -#: src/lang.c:2160 +#: src/lang.c:2173 msgid "Mail directory :" msgstr "" -#: src/lang.c:2161 +#: src/lang.c:2174 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "" -#: src/lang.c:2166 +#: src/lang.c:2179 msgid "Save articles in batch mode (-S) :" msgstr "" -#: src/lang.c:2167 +#: src/lang.c:2180 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:2172 +#: src/lang.c:2185 msgid "The directory where you want articles/threads saved." msgstr "" -#: src/lang.c:2173 +#: src/lang.c:2186 msgid "Directory to save arts/threads in :" msgstr "" -#: src/lang.c:2174 +#: src/lang.c:2187 msgid "# Directory where articles/threads are saved\n" msgstr "" -#: src/lang.c:2178 +#: src/lang.c:2191 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" -#: src/lang.c:2179 +#: src/lang.c:2192 msgid "Use Archive-name: header for save :" msgstr "" -#: src/lang.c:2180 +#: src/lang.c:2193 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:2185 +#: src/lang.c:2198 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" -#: src/lang.c:2186 +#: src/lang.c:2199 msgid "Mark saved articles/threads as read:" msgstr "" -#: src/lang.c:2187 +#: src/lang.c:2200 msgid "# If ON mark articles that are saved as read\n" msgstr "" -#: src/lang.c:2191 +#: src/lang.c:2204 msgid "Do post processing (eg. extract attachments) for saved articles." msgstr "" -#: src/lang.c:2192 +#: src/lang.c:2205 msgid "Post process saved articles :" msgstr "" -#: src/lang.c:2193 +#: src/lang.c:2206 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:2199 +#: src/lang.c:2212 msgid "Process only unread articles :" msgstr "" -#: src/lang.c:2200 +#: src/lang.c:2213 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" -#: src/lang.c:2205 +#: src/lang.c:2218 msgid "Print all or just part of header. toggles & sets." msgstr "" -#: src/lang.c:2206 +#: src/lang.c:2219 msgid "Print all headers when printing :" msgstr "" -#: src/lang.c:2207 +#: src/lang.c:2220 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" -#: src/lang.c:2211 +#: src/lang.c:2224 msgid "" "The printer program with options that is to be used to print " "articles/threads." msgstr "" -#: src/lang.c:2212 +#: src/lang.c:2225 msgid "Printer program with options :" msgstr "" -#: src/lang.c:2213 +#: src/lang.c:2226 msgid "# Print program with parameters used to print articles/threads\n" msgstr "" -#: src/lang.c:2219 +#: src/lang.c:2232 msgid "Force redraw after certain commands:" msgstr "" -#: src/lang.c:2220 +#: src/lang.c:2233 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" -#: src/lang.c:2224 +#: src/lang.c:2237 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" -#: src/lang.c:2225 +#: src/lang.c:2238 msgid "Start editor with line offset :" msgstr "" -#: src/lang.c:2226 +#: src/lang.c:2239 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:2231 +#: src/lang.c:2244 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." msgstr "" -#: src/lang.c:2232 +#: src/lang.c:2245 msgid "Invocation of your editor :" msgstr "" -#: src/lang.c:2233 +#: src/lang.c:2246 msgid "" "# Format of editor line including parameters\n" "# %%E Editor %%F Filename %%N Linenumber\n" msgstr "" -#: src/lang.c:2238 +#: src/lang.c:2251 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" -#: src/lang.c:2239 +#: src/lang.c:2252 msgid "External inews :" msgstr "" -#: src/lang.c:2240 +#: src/lang.c:2253 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:2244 +#: src/lang.c:2257 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" -#: src/lang.c:2245 +#: src/lang.c:2258 msgid "Invocation of your mail command :" msgstr "" -#: src/lang.c:2246 +#: src/lang.c:2259 msgid "" "# Format of mailer line including parameters\n" "# %%M Mailer %%S Subject %%T To %%F Filename %%U User (AmigaDOS)\n" @@ -5647,106 +5673,107 @@ msgid "" "# ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n" msgstr "" -#: src/lang.c:2254 +#: src/lang.c:2267 msgid "Use interactive mail reader :" msgstr "" -#: src/lang.c:2255 +#: src/lang.c:2268 msgid "" -"# Interactive mailreader: if ON mailreader will be invoked earlier for\n" -"# reply so you can use more of its features (eg. MIME, pgp, ...)\n" -"# this option has to suit default_mailer_format\n" +"# 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:2262 +#: src/lang.c:2276 msgid "Remove ~/.article after posting :" msgstr "" -#: src/lang.c:2263 +#: src/lang.c:2277 msgid "# If ON remove ~/.article after posting.\n" msgstr "" -#: src/lang.c:2267 +#: src/lang.c:2281 msgid "Filename for all posted articles, sets, no filename=do not save." msgstr "" -#: src/lang.c:2268 +#: src/lang.c:2282 msgid "Filename for posted articles :" msgstr "" -#: src/lang.c:2269 +#: src/lang.c:2283 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:2274 +#: src/lang.c:2288 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" -#: src/lang.c:2275 +#: src/lang.c:2289 msgid "Keep failed arts in ~/dead.articles:" msgstr "" -#: src/lang.c:2276 +#: src/lang.c:2290 msgid "# If ON keep all failed postings in ~/dead.articles\n" msgstr "" -#: src/lang.c:2280 +#: src/lang.c:2294 msgid "Do you want to strip unsubscribed groups from .newsrc" msgstr "" -#: src/lang.c:2281 +#: src/lang.c:2295 msgid "No unsubscribed groups in newsrc :" msgstr "" -#: src/lang.c:2282 +#: src/lang.c:2296 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "" -#: src/lang.c:2287 +#: src/lang.c:2301 msgid "Remove bogus groups from newsrc :" msgstr "" -#: src/lang.c:2288 +#: src/lang.c:2302 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:2292 +#: src/lang.c:2306 msgid "Enter number of seconds until active file will be reread. sets." msgstr "" -#: src/lang.c:2293 +#: src/lang.c:2307 msgid "Interval in secs to reread active :" msgstr "" -#: src/lang.c:2294 +#: src/lang.c:2308 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" -#: src/lang.c:2299 +#: src/lang.c:2313 msgid "Reconnect to server automatically :" msgstr "" -#: src/lang.c:2300 +#: src/lang.c:2314 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" -#: src/lang.c:2304 +#: src/lang.c:2318 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" -#: src/lang.c:2305 +#: src/lang.c:2319 msgid "Cache NNTP overview files locally :" msgstr "" -#: src/lang.c:2306 +#: src/lang.c:2320 msgid "# If ON, create local copies of NNTP overview files.\n" msgstr "" @@ -6006,7 +6033,7 @@ msgstr "" msgid "couldn't expand %s\n" msgstr "" -#: src/open.c:1032 +#: src/open.c:1123 msgid "Unreachable?\n" msgstr "" @@ -6015,13 +6042,13 @@ msgstr "" msgid "%s is bogus" msgstr "" -#: src/post.c:1940 +#: src/post.c:1936 #, c-format msgid "Posting: %.*s ..." msgstr "" #. TODO: -> lang.c -#: src/post.c:4038 +#: src/post.c:4034 #, c-format msgid "Rereading %s..." msgstr "" diff -Nurp tin-1.7.0/src/active.c tin-1.7.1/src/active.c --- tin-1.7.0/src/active.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/active.c Mon Aug 25 01:17:53 2003 @@ -3,7 +3,7 @@ * Module : active.c * Author : I. Lea * Created : 1992-02-16 - * Updated : 2003-06-29 + * Updated : 2003-08-16 * Notes : * * Copyright (c) 1992-2003 Iain Lea @@ -317,7 +317,7 @@ read_newsrc_active_file( char line[NNTP_STRLEN]; if (window < NUM_SIMULTANEOUS_GROUP_COMMAND && ptr) { ngnames[index_i] = my_strdup(ptr); - sprintf(buf, "GROUP %s", ngnames[index_i]); + snprintf(buf, sizeof(buf), "GROUP %s", ngnames[index_i]); # ifdef DEBUG debug_nntp("read_newsrc_active_file", buf); # endif /* DEBUG */ @@ -338,7 +338,7 @@ read_newsrc_active_file( int i; int j = index_o; for (i = 0; i < window - 1; i++) { - sprintf(buf, "GROUP %s", ngnames[j]); + snprintf(buf, sizeof(buf), "GROUP %s", ngnames[j]); # ifdef DEBUG debug_nntp("read_newsrc_active_file", buf); # endif /* DEBUG */ @@ -359,8 +359,7 @@ read_newsrc_active_file( { char fmt[20]; - sprintf(fmt, "%%ld %%ld %%ld %%%ds", NNTP_STRLEN); - + snprintf(fmt, sizeof(fmt), "%%ld %%ld %%ld %%%ds", NNTP_STRLEN); if (sscanf(line, fmt, &count, &min, &max, ngname) != 4) error_message(_(txt_error_invalid_response_to_group), line); if (strcmp(ngname, ngnames[index_o]) != 0) @@ -483,7 +482,7 @@ read_active_file( # ifndef NNTP_ONLY else error_message(_(txt_cannot_open_active_file), news_active_file, tin_progname); -# endif /* NNTP_ONLY */ +# endif /* !NNTP_ONLY */ #else error_message(_(txt_cannot_open), news_active_file); #endif /* NNTP_ABLE */ @@ -670,7 +669,7 @@ check_for_any_new_groups( if (newnews_index >= 0) newnews[newnews_index].time = new_newnews_time; else { - sprintf(buf, "%s %lu", nntp_server, (unsigned long int) new_newnews_time); + snprintf(buf, sizeof(buf), "%s %lu", nntp_server, (unsigned long int) new_newnews_time); load_newnews_info(buf); } } diff -Nurp tin-1.7.0/src/art.c tin-1.7.1/src/art.c --- tin-1.7.0/src/art.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/art.c Fri Aug 29 01:11:46 2003 @@ -3,7 +3,7 @@ * Module : art.c * Author : I.Lea & R.Skrenta * Created : 1991-04-01 - * Updated : 2003-06-29 + * Updated : 2003-08-25 * Notes : * * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta @@ -42,11 +42,9 @@ # include "tcurses.h" #endif /* !TCURSES_H */ -#ifdef PROFILE -# ifndef STPWATCH_H -# include "stpwatch.h" -# endif /* !STPWATCH_H */ -#endif /* PROFILE */ +#ifndef STPWATCH_H +# include "stpwatch.h" +#endif /* !STPWATCH_H */ /* * TODO: fixup to remove CURR_GROUP dependency in all sort funcs @@ -192,17 +190,13 @@ index_group( * and then create base[] article numbers from loaded articles. * If nov file does not exist then create base[] with setup_hard_base(). */ -#ifdef PROFILE BegStopWatch("setup_hard_base"); -#endif /* PROFILE */ if (setup_hard_base(group) < 0) return FALSE; -#ifdef PROFILE EndStopWatch(); PrintStopWatch(); -#endif /* PROFILE */ #ifdef DEBUG_NEWSRC debug_print_comment("Before read_nov_file"); @@ -304,16 +298,12 @@ index_group( */ filtered = filter_articles(group); -#ifdef PROFILE BegStopWatch("make_thread"); -#endif /* PROFILE */ make_threads(group, FALSE); -#ifdef PROFILE EndStopWatch(); PrintStopWatch(); -#endif /* PROFILE */ if ((modified || filtered) && !batch_mode) clear_message(); @@ -403,12 +393,12 @@ read_group( * arts[].thread from ART_EXPIRED to ART_NORMAL and skip * reading the header. */ - if ((respnum = valid_artnum(art)) >= 0 || art <= last_read_article) { - if (respnum >= 0) - arts[respnum].thread = ART_NORMAL; - + if ((respnum = valid_artnum(art)) >= 0) { + arts[respnum].thread = ART_NORMAL; continue; } + if (art <= last_read_article) + continue; /* * Try and open the article @@ -442,7 +432,7 @@ read_group( } if (!res) { - sprintf(buf, "FAILED parse_headers(%ld)", art); + snprintf(buf, sizeof(buf), "FAILED parse_headers(%ld)", art); #ifdef DEBUG debug_nntp("read_group", buf); #endif /* DEBUG */ @@ -1067,24 +1057,28 @@ parse_headers( } +#ifdef DEBUG +# define handle_overview_fmt_error() else oerror += 1<) [mandatory] - * 6. References: (ie. ....) [optional] - * 7. Byte count (Skipped - not used) [mandatory] - * 8. Lines: line (ie. 23) [mandatory] - * 9. Xref: line (ie. alt.test:389) [optional] + * Format (mandatory as far as line count [RFC2980]): + * 1. article number (ie. 183) [mandatory] + * 2. Subject: line (ie. Which newsreader?) [mandatory] + * 3. From: line (ie. iain@ecrc.de) [mandatory] + * 4. Date: line (rfc822 format) [mandatory] + * 5. MessageID: (ie. <123@ether.net>) [mandatory] + * 6. References: (ie. ....) [optional] + * 7. Byte count (Skipped - not used) [mandatory] + * 8. Lines: line (ie. 23) [mandatory] + * 9. Xref: line (ie. alt.test:389) [optional] */ static int read_nov_file( @@ -1095,11 +1089,16 @@ read_nov_file( t_bool local) { FILE *fp; - char *p, *q; + char *ptr; char *buf; char art_full_name[HEADER_LEN]; char art_from_addr[HEADER_LEN]; + unsigned int count; long artnum; + struct t_article *art; +#ifdef DEBUG + unsigned int oerror = 0; +#endif /* DEBUG */ *expired = 0; @@ -1117,23 +1116,18 @@ read_nov_file( handle_resize((need_resize == cRedraw) ? TRUE : FALSE); need_resize = cNo; } - #ifdef DEBUG debug_nntp("read_nov_file", buf); #endif /* DEBUG */ - if (top_art >= max_art) - expand_art(); - - p = buf; - /* * read the article number, guaranteed to be the first field */ - artnum = atol(p); + artnum = atol(buf); - /* catches case of 1st line being groupname (i.e. local cached overviews) */ - /* TODO: so test the group name properly then ? */ + /* + * 1st line of local cached overview is group name + */ if (artnum <= 0) continue; @@ -1155,174 +1149,97 @@ read_nov_file( if (artnum > group->xmax) continue; - set_article(&arts[top_art]); - arts[top_art].artnum = last_read_article = artnum; - - if ((q = strchr(p, '\t')) == NULL) { -#ifdef DEBUG - error_message("Bad overview record (Artnum) '%s'", buf); - debug_nntp("read_nov_file", "Bad overview record (Artnum)"); -#endif /* DEBUG */ - continue; - } else - p = q + 1; + if (top_art >= max_art) + expand_art(); - /* - * TODO: rewrite the code below as the field order is not fixed, - * but defined in "LIST OVERVIEW.FMT" - */ + art = &arts[top_art]; + set_article(art); + art->artnum = last_read_article = artnum; /* - * read Subject + * Note: Fields after line count are not mandatory, use "LIST OVERVIEW.FMT" + * to check for additions like we do with xref_supported */ - if ((q = strchr(p, '\t')) == NULL) { -#ifdef DEBUG - error_message("Bad overview record (Subject) [%s]", p); - debug_nntp("read_nov_file", "Bad overview record (Subject)"); -#endif /* DEBUG */ + if ((ptr = tin_strtok(buf, "\t")) == NULL) /* Skip past artnum */ continue; - } else - *q = '\0'; - - arts[top_art].subject = hash_str(eat_re(eat_tab(rfc1522_decode(p)), FALSE)); - p = q + 1; - /* - * read From - */ - if ((q = strchr(p, '\t')) == NULL) { -#ifdef DEBUG - error_message("Bad overview record (From) [%s]", p); - debug_nntp("read_nov_file", "Bad overview record (From)"); -#endif /* DEBUG */ - continue; - } else - *q = '\0'; + for (count = 1; (ptr = tin_strtok(NULL, "\t")) != NULL; count++) { + switch (count) { + case 1: /* Subject */ + art->subject = hash_str(eat_re(eat_tab(rfc1522_decode(ptr)), FALSE)); + break; - arts[top_art].gnksa_code = parse_from(p, art_from_addr, art_full_name); - arts[top_art].from = hash_str(art_from_addr); + case 2: /* From */ + art->gnksa_code = parse_from(ptr, art_from_addr, art_full_name); + art->from = hash_str(art_from_addr); - if (*art_full_name) - arts[top_art].name = hash_str(eat_tab(rfc1522_decode(art_full_name))); + if (*art_full_name) + art->name = hash_str(eat_tab(rfc1522_decode(art_full_name))); + break; - p = q + 1; - /* - * read Date - */ - if ((q = strchr(p, '\t')) == NULL) { + case 3: /* Date */ + art->date = parsedate(ptr, (TIMEINFO *) 0); #ifdef DEBUG - error_message("Bad overview record (Date) [%s]", p); - debug_nntp("read_nov_file", "Bad overview record (Date)"); + if (art->date == (time_t) -1) + oerror += 1<msgid = my_strdup(ptr); + handle_overview_fmt_error(); + break; + + case 5: /* References */ + if (*ptr) + art->refs = my_strdup(ptr); + break; - /* - * read Message-ID - */ - q = strchr(p, '\t'); - if (q == NULL || p == q) { /* Empty msgid's */ + case 6: /* Bytes */ #ifdef DEBUG - error_message("Bad overview record (Msg-id) [%s]", p); - debug_nntp("read_nov_file", "Bad overview record (Msg-id)"); + if (!isdigit((unsigned char) *ptr)) + oerror += 1<type == GROUP_TYPE_NEWS - * - * draft-ietf-nntpext-base-13.txt, section 9.2.1.1 - * comes up with "<0>" - should we use it instead of '\0'? - */ - arts[top_art].msgid = (*p ? my_strdup(p) : '\0'); - - p = q + 1; + case 7: /* Lines */ + if (isdigit((unsigned char) *ptr)) + art->line_count = atoi(ptr); + handle_overview_fmt_error(); + break; + + case 8: /* Xref: */ + if (!xref_supported) + continue; + /* TODO: crosscheck artnum against Xref:-line (if Xref:full) */ + if ((ptr = parse_header(ptr, "Xref", FALSE, FALSE)) != NULL) + art->xref = my_strdup(ptr); + handle_overview_fmt_error(); + break; + } + } - /* - * read References - */ - if ((q = strchr(p, '\t')) == NULL) { #ifdef DEBUG - error_message("Bad overview record (References) [%s]", p); - debug_nntp("read_nov_file", "Bad overview record (References)"); + /* Complain if incorrect # of fields */ + if (count < (xref_supported ? 8 : 7) || oerror) { + char errbuf[LEN]; + + error_message(_("%d Bad overview record (%d fields) '%s'"), oerror, count, BlankIfNull(ptr)); /* TODO move to lang.c */ + snprintf(errbuf, sizeof(errbuf), "%d Bad overview record (%d fields)", oerror, count); + debug_nntp("read_nov_file", errbuf); + } + debug_print_header(art); + oerror = 0; #endif /* DEBUG */ - continue; - } else - *q = '\0'; - - arts[top_art].refs = (*p ? my_strdup(p) : '\0'); - - p = q + 1; /* - * skip Bytes + * RFC says Message-ID is mandatory in newsgroups (but not in + * mailgroups etc..) NB. a NULL Message-ID would abort if we ever do + * threading in mailgroups */ - if ((q = strchr(p, '\t')) == NULL) { -#ifdef DEBUG - error_message("Bad overview record (Bytes) [%s]", p); - debug_nntp("read_nov_file", "Bad overview record (Bytes)"); -#endif /* DEBUG */ + if (!art->msgid && group->type == GROUP_TYPE_NEWS) continue; - } else - *q = '\0'; - - p = (q == NULL ? (char *) 0 : q + 1); - - /* - * read Lines - */ - if (p != NULL) { - if ((q = strchr(p, '\t')) != NULL) - *q = '\0'; - - if (isdigit((unsigned char) *p)) - arts[top_art].line_count = atoi(p); - - p = (q == NULL ? (char *) 0 : q + 1); - } - - /* - * read Xref - */ - if (p != NULL && xref_supported) { - if ((q = strstr(p, "Xref: ")) == NULL) - q = strstr(p, "xref: "); - - if (q != NULL) { - p = q + 6; - q = p; - while (*q && *q != '\t') - q++; - - *q = '\0'; - q = strrchr(p, '\n'); - if (q != NULL) - *q = '\0'; - - q = p; - while (*q && *q == ' ') - q++; - - arts[top_art].xref = my_strdup(q); - /* TODO: crosscheck artnum against Xref:-line (if Xref:full) */ - } - } - - /* - * end of overview line processing - */ -#ifdef DEBUG - debug_print_header(&arts[top_art]); -#endif /* DEBUG */ /* we might loose accuracy here, but that shouldn't hurt */ if (artnum % MODULO_COUNT_NUM == 0) @@ -1344,15 +1261,15 @@ read_nov_file( * Write an Nov/Xover index file. Fields are separated by '\t'. * * Format: - * 1. article number (ie. 183) [mandatory] - * 2. Subject: line (ie. Which newsreader?) [mandatory] - * 3. From: line (ie. iain@ecrc.de) [mandatory] - * 4. Date: line (rfc822 format) [mandatory] - * 5. MessageID: (ie. <123@ether.net>) [mandatory] - * 6. References: (ie. ....) [optional] - * 7. Byte count (Skipped - not used) [mandatory] - * 8. Lines: line (ie. 23) [mandatory] - * 9. Xref: line (ie. alt.test:389) [optional] + * 1. article number (ie. 183) [mandatory] + * 2. Subject: line (ie. Which newsreader?) [mandatory] + * 3. From: line (ie. iain@ecrc.de) [mandatory] + * 4. Date: line (rfc822 format) [mandatory] + * 5. MessageID: (ie. <123@ether.net>) [mandatory] + * 6. References: (ie. ....) [optional] + * 7. Byte count (Skipped - not used) [mandatory] + * 8. Lines: line (ie. 23) [mandatory] + * 9. Xref: line (ie. alt.test:389) [optional] * * TODO: as we don't use the original data, we currently can't store * the data (from/subject) in the original charset (we don't store @@ -1415,6 +1332,8 @@ write_nov_file( * ignore stuff like this. */ p = rfc1522_encode(article->subject, tinrc.mm_local_charset, FALSE); + /* as the subject might now be folded we have to unfold it */ + unfold_header(p); /* * replace any '\t's with ' ' in the references-data @@ -1534,7 +1453,7 @@ find_nov_file( return NULL; /* Don't write cache in this case */ } } -#endif /* NNTP_ONLY */ +#endif /* !NNTP_ONLY */ /* * We only get here when private overviews are going to be used @@ -1619,7 +1538,7 @@ find_nov_file( if ((ptr = strrchr(buf, '\n')) != NULL) *ptr = '\0'; - if (STRCMPEQ(buf, group->name)) + if (strcmp(buf, group->name) == 0) return nov_file; } @@ -1875,16 +1794,16 @@ void set_article( struct t_article *art) { - art->subject = (char *) 0; - art->from = (char *) 0; - art->name = (char *) 0; + art->subject = NULL; + art->from = NULL; + art->name = NULL; art->date = (time_t) 0; - art->xref = (char *) 0; - art->msgid = (char *) 0; - art->refs = (char *) 0; - art->refptr = (struct t_msgid *) 0; + art->xref = NULL; + art->msgid = NULL; + art->refs = NULL; + art->refptr = NULL; art->line_count = -1; - art->archive = (struct t_archive *) 0; + art->archive = NULL; art->tagged = FALSE; art->thread = ART_EXPIRED; art->prev = ART_NORMAL; @@ -1942,14 +1861,13 @@ print_date( { static char date[25]; struct tm *tm; - static const char *const months_a[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", }; tm = gmtime(&secs); - sprintf(date, "%02d %s %04d %02d:%02d:%02d GMT", + snprintf(date, sizeof(date), "%02d %s %04d %02d:%02d:%02d GMT", tm->tm_mday, months_a[tm->tm_mon], tm->tm_year + 1900, @@ -1970,6 +1888,7 @@ print_from( if (article->name != NULL) { p = rfc1522_encode(article->name, tinrc.mm_local_charset, FALSE); + unfold_header(p); if (strpbrk(article->name, "\".:;<>@[]()\\") != NULL && article->name[0] != '"' && article->name[strlen(article->name)] != '"') snprintf(from, sizeof(from), "\"%s\" <%s>", tinrc.post_8bit_header ? article->name : p, article->from); else @@ -2000,7 +1919,7 @@ open_xover_fp( if (!local && xover_cmd && *mode == 'r' && group->type == GROUP_TYPE_NEWS) { char line[NNTP_STRLEN]; - sprintf(line, "%s %ld-%ld", xover_cmd, min, max); + snprintf(line, sizeof(line), "%s %ld-%ld", xover_cmd, min, max); return (nntp_command(line, OK_XOVER, NULL, 0)); } else #endif /* NNTP_ABLE */ diff -Nurp tin-1.7.0/src/attrib.c tin-1.7.1/src/attrib.c --- tin-1.7.0/src/attrib.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/attrib.c Sat Aug 23 01:58:40 2003 @@ -3,7 +3,7 @@ * Module : attrib.c * Author : I. Lea * Created : 1993-12-01 - * Updated : 2003-05-10 + * Updated : 2003-05-22 * Notes : Group attribute routines * * Copyright (c) 1993-2003 Iain Lea @@ -184,7 +184,7 @@ set_default_attributes( break; \ } #define MATCH_STRING(pattern, type) \ - if (match_string(line, pattern, buf, sizeof(buf))) { \ + if (match_string(line, pattern, buf, sizeof(buf) - strlen(pattern))) { \ set_attrib(type, scope, buf); \ found = TRUE; \ break; \ diff -Nurp tin-1.7.0/src/auth.c tin-1.7.1/src/auth.c --- tin-1.7.0/src/auth.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/auth.c Fri Aug 29 01:13:29 2003 @@ -114,13 +114,13 @@ authinfo_generic( put_server(tmpbuf); #ifdef HAVE_SETENV - sprintf(tmpbuf, "%d.%d.%d", + snprintf(tmpbuf, sizeof(tmpbuf), "%d.%d.%d", fileno(get_nntp_fp(FAKE_NNTP_FP)), fileno(get_nntp_wr_fp(FAKE_NNTP_FP)), cookiefd); setenv("NNTP_AUTH_FDS", tmpbuf, 1); #else # ifdef HAVE_PUTENV - sprintf(tmpbuf, "NNTP_AUTH_FDS=%d.%d.%d", + snprintf(tmpbuf, sizeof(tmpbuf), "NNTP_AUTH_FDS=%d.%d.%d", fileno(get_nntp_fp(FAKE_NNTP_FP)), fileno(get_nntp_wr_fp(FAKE_NNTP_FP)), cookiefd); new_env = my_strdup(tmpbuf); @@ -258,7 +258,7 @@ do_authinfo_original( char line[PATH_LEN]; int ret; - sprintf(line, "AUTHINFO USER %s", authuser); + snprintf(line, sizeof(line), "AUTHINFO USER %s", authuser); #ifdef DEBUG debug_nntp("authorization", line); #endif /* DEBUG */ @@ -274,7 +274,7 @@ do_authinfo_original( return ERR_AUTHBAD; } - sprintf(line, "AUTHINFO PASS %s", authpass); + snprintf(line, sizeof(line), "AUTHINFO PASS %s", authpass); #ifdef DEBUG debug_nntp("authorization", line); #endif /* DEBUG */ diff -Nurp tin-1.7.0/src/config.c tin-1.7.1/src/config.c --- tin-1.7.0/src/config.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/config.c Mon Sep 1 00:37:35 2003 @@ -3,7 +3,7 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-08-10 + * Updated : 2003-08-22 * Notes : Configuration file routines * * Copyright (c) 1991-2003 Iain Lea @@ -93,8 +93,7 @@ read_config_file( t_bool global_file) /* return value is always ignored */ { FILE *fp; - char newnews_info[PATH_LEN]; - char buf[LEN]; + char buf[LEN], tmp[LEN]; int upgrade = RC_CHECK; if ((fp = fopen(file, "r")) == NULL) @@ -128,48 +127,48 @@ read_config_file( if (match_boolean(buf, "alternative_handling=", &tinrc.alternative_handling)) break; - if (match_string(buf, "art_marked_deleted=", buf, sizeof(buf))) { - tinrc.art_marked_deleted = !buf[0] ? ART_MARK_DELETED : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_deleted=", tmp, sizeof(tmp))) { + tinrc.art_marked_deleted = !tmp[0] ? ART_MARK_DELETED : DASH_TO_SPACE(tmp[0]); break; } - if (match_string(buf, "art_marked_inrange=", buf, sizeof(buf))) { - tinrc.art_marked_inrange = !buf[0] ? MARK_INRANGE : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_inrange=", tmp, sizeof(tmp))) { + tinrc.art_marked_inrange = !tmp[0] ? MARK_INRANGE : DASH_TO_SPACE(tmp[0]); break; } - if (match_string(buf, "art_marked_killed=", buf, sizeof(buf))) { - tinrc.art_marked_killed = !buf[0] ? ART_MARK_KILLED : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_killed=", tmp, sizeof(tmp))) { + tinrc.art_marked_killed = !tmp[0] ? ART_MARK_KILLED : DASH_TO_SPACE(tmp[0]); break; } - if (match_string(buf, "art_marked_read=", buf, sizeof(buf))) { - tinrc.art_marked_read = !buf[0] ? ART_MARK_READ : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_read=", tmp, sizeof(tmp))) { + tinrc.art_marked_read = !tmp[0] ? ART_MARK_READ : DASH_TO_SPACE(tmp[0]); break; } - if (match_string(buf, "art_marked_read_selected=", buf, sizeof(buf))) { - tinrc.art_marked_read_selected = !buf[0] ? ART_MARK_READ_SELECTED : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_read_selected=", tmp, sizeof(tmp))) { + tinrc.art_marked_read_selected = !tmp[0] ? ART_MARK_READ_SELECTED : DASH_TO_SPACE(tmp[0]); break; } - if (match_string(buf, "art_marked_recent=", buf, sizeof(buf))) { - tinrc.art_marked_recent = !buf[0] ? ART_MARK_RECENT : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_recent=", tmp, sizeof(tmp))) { + tinrc.art_marked_recent = !tmp[0] ? ART_MARK_RECENT : DASH_TO_SPACE(tmp[0]); break; } - if (match_string(buf, "art_marked_return=", buf, sizeof(buf))) { - tinrc.art_marked_return = !buf[0] ? ART_MARK_RETURN : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_return=", tmp, sizeof(tmp))) { + tinrc.art_marked_return = !tmp[0] ? ART_MARK_RETURN : DASH_TO_SPACE(tmp[0]); break; } - if (match_string(buf, "art_marked_selected=", buf, sizeof(buf))) { - tinrc.art_marked_selected = !buf[0] ? ART_MARK_SELECTED : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_selected=", tmp, sizeof(tmp))) { + tinrc.art_marked_selected = !tmp[0] ? ART_MARK_SELECTED : DASH_TO_SPACE(tmp[0]); break; } - if (match_string(buf, "art_marked_unread=", buf, sizeof(buf))) { - tinrc.art_marked_unread = !buf[0] ? ART_MARK_UNREAD : DASH_TO_SPACE(buf[0]); + if (match_string(buf, "art_marked_unread=", tmp, sizeof(tmp))) { + tinrc.art_marked_unread = !tmp[0] ? ART_MARK_UNREAD : DASH_TO_SPACE(tmp[0]); break; } @@ -340,8 +339,8 @@ read_config_file( if (match_boolean(buf, "default_filter_select_expire=", &tinrc.default_filter_select_expire)) break; - if (match_string(buf, "default_save_mode=", buf, sizeof(buf))) { - tinrc.default_save_mode = buf[0]; + if (match_string(buf, "default_save_mode=", tmp, sizeof(tmp))) { + tinrc.default_save_mode = tmp[0]; break; } @@ -375,7 +374,7 @@ read_config_file( #ifndef DONT_HAVE_PIPING if (match_string(buf, "default_pipe_command=", tinrc.default_pipe_command, sizeof(tinrc.default_pipe_command))) break; -#endif /* DONT_HAVE_PIPING */ +#endif /* !DONT_HAVE_PIPING */ if (match_string(buf, "default_post_newsgroups=", tinrc.default_post_newsgroups, sizeof(tinrc.default_post_newsgroups))) break; @@ -443,6 +442,8 @@ read_config_file( if (match_string(buf, "inews_prog=", tinrc.inews_prog, sizeof(tinrc.inews_prog))) break; + if (match_integer(buf, "interactive_mailer=", &tinrc.interactive_mailer, INTERACTIVE_NONE)) + break; break; case 'k': @@ -507,8 +508,8 @@ read_config_file( break; case 'n': - if (match_string(buf, "newnews=", newnews_info, sizeof(newnews_info))) { - load_newnews_info(newnews_info); + if (match_string(buf, "newnews=", tmp, sizeof(tmp))) { + load_newnews_info(tmp); break; } @@ -726,7 +727,7 @@ read_config_file( if (match_string(buf, "url_handler=", tinrc.url_handler, sizeof(tinrc.url_handler))) break; - if (match_boolean(buf, "use_mailreader_i=", &tinrc.use_mailreader_i)) + if (match_boolean(buf, "url_highlight=", &tinrc.url_highlight)) break; if (match_boolean(buf, "use_mouse=", &tinrc.use_mouse)) @@ -973,8 +974,8 @@ write_config_file( fprintf(fp, _(txt_mailer_format.tinrc)); fprintf(fp, "default_mailer_format=%s\n\n", tinrc.mailer_format); - fprintf(fp, _(txt_use_mailreader_i.tinrc)); - fprintf(fp, "use_mailreader_i=%s\n\n", print_boolean(tinrc.use_mailreader_i)); + fprintf(fp, _(txt_interactive_mailer.tinrc)); + fprintf(fp, "interactive_mailer=%d\n\n", tinrc.interactive_mailer); fprintf(fp, _(txt_show_info.tinrc)); fprintf(fp, "show_info=%d\n\n", tinrc.show_info); @@ -1205,6 +1206,9 @@ write_config_file( fprintf(fp, "use_slrnface=%s\n\n", print_boolean(tinrc.use_slrnface)); #endif /*XFACE_ABLE */ + fprintf(fp, _(txt_url_highlight.tinrc)); + fprintf(fp, "url_highlight=%s\n\n", print_boolean(tinrc.url_highlight)); + fprintf(fp, _(txt_word_highlight.tinrc)); fprintf(fp, "word_highlight=%s\n\n", print_boolean(tinrc.word_highlight)); @@ -1302,7 +1306,7 @@ write_config_file( fprintf(fp, "default_move_group=%d\n", tinrc.default_move_group); #ifndef DONT_HAVE_PIPING fprintf(fp, "default_pipe_command=%s\n", tinrc.default_pipe_command); -#endif /* DONT_HAVE_PIPING */ +#endif /* !DONT_HAVE_PIPING */ fprintf(fp, "default_post_newsgroups=%s\n", tinrc.default_post_newsgroups); fprintf(fp, "default_post_subject=%s\n", tinrc.default_post_subject); fprintf(fp, "default_range_group=%s\n", tinrc.default_range_group); @@ -1886,6 +1890,7 @@ change_config_file( /* * the following are boolean and do not need further action (if I'm right) * + * case OPT_ASK_FOR_METAMAIL: * case OPT_AUTO_BCC: * case OPT_AUTO_CC: * case OPT_AUTO_LIST_THREAD: @@ -1912,18 +1917,17 @@ change_config_file( * 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 * case OPT_UNLINK_ARTICLE: - * case OPT_USE_MAILREADER_I: - * case OPT_USE_MOUSE: - * case OPT_WORD_HIGHLIGHT_TINRC: - * case OPT_WRAP_ON_NEXT_UNREAD: + * case OPT_URL_HIGHLIGHT: #ifdef HAVE_KEYPAD * case OPT_USE_KEYPAD: #endif - * case OPT_ASK_FOR_METAMAIL: -#if defined(HAVE_ICONV_OPEN_TRANSLIT) && defined(CHARSET_CONVERSION) - * case OPT_TRANSLIT: -#endif + * case OPT_USE_MOUSE: + * case OPT_WORD_HIGHLIGHT_TINRC: + * case OPT_WRAP_ON_NEXT_UNREAD: */ default: @@ -2117,6 +2121,7 @@ change_config_file( * case OPT_COL_MARKSTROKE: #endif * case OPT_HIDE_UUE: + * case OPT_INTERACTIVE_MAILER: * case OPT_WORD_H_DISPLAY_MARKS: * case OPT_MONO_MARKSTAR: * case OPT_MONO_MARKDASH: @@ -2733,6 +2738,7 @@ rc_update( t_bool thread_articles = FALSE; t_bool use_builtin_inews = FALSE; t_bool use_getart_limit = FALSE; + t_bool use_mailreader_i = FALSE; t_bool use_metamail = FALSE; if (!fp) @@ -2797,6 +2803,8 @@ rc_update( break; if (match_boolean(buf, "use_getart_limit=", &use_getart_limit)) break; + if (match_boolean(buf, "use_mailreader_i=", &use_mailreader_i)) + break; if (match_boolean(buf, "use_metamail=", &use_metamail)) break; break; @@ -2833,6 +2841,9 @@ rc_update( if (use_builtin_inews) strncpy(tinrc.inews_prog, INTERNAL_CMD, sizeof(tinrc.inews_prog) - 1); + if (use_mailreader_i) + tinrc.interactive_mailer = INTERACTIVE_WITHOUT_HEADERS; + env = getenv("NOMETAMAIL"); if (!use_metamail || (NULL == env)) strncpy(tinrc.metamail_prog, INTERNAL_CMD, sizeof(tinrc.metamail_prog) - 1); @@ -2880,19 +2891,19 @@ read_server_config( snprintf(tmp_info, tmp_len, "%s %s", nntp_server, newnews_info); load_newnews_info(tmp_info); free(tmp_info); - break; + continue; } if (match_string(line, "version=", version, sizeof(version))) { if (RC_CHECK != upgrade) - /* ignore duplicate version lines; first match counts */ - break; + /* ignore duplicate version lines; last match counts */ + continue; upgrade = check_upgrade(line, "version=", SERVERCONFIG_VERSION); if (RC_IGNORE == upgrade) /* Expected version number; nothing to do -> continue */ - break; + continue; /* Nothing to do yet for RC_UPGRADE and RC_DOWNGRADE */ - break; + continue; } } fclose(fp); diff -Nurp tin-1.7.0/src/cook.c tin-1.7.1/src/cook.c --- tin-1.7.0/src/cook.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/cook.c Tue Aug 26 00:26:31 2003 @@ -3,7 +3,7 @@ * Module : cook.c * Author : J. Faultless * Created : 2000-03-08 - * Updated : 2003-07-21 + * Updated : 2003-08-26 * Notes : Split from page.c * * Copyright (c) 2000-2003 Jason Faultless @@ -573,6 +573,7 @@ new_uue( if (!(*part)->uue) /* new_part() is simple and doesn't attach list heads */ (*part)->uue = ptr; + free_list(ptr->params); /* * Load the name into the parameter list */ diff -Nurp tin-1.7.0/src/curses.c tin-1.7.1/src/curses.c --- tin-1.7.0/src/curses.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/curses.c Fri Aug 29 01:15:09 2003 @@ -674,7 +674,7 @@ MoveCursor( char stuff[12]; if (_moveto) { - sprintf(stuff, _moveto, row + 1, col + 1); + snprintf(stuff, sizeof(stuff), _moveto, row + 1, col + 1); tputs(stuff, 1, outchar); my_flush(); _line = row + 1; @@ -1491,7 +1491,7 @@ ReadCh( int result; # ifndef READ_CHAR_HACK char ch; -# endif /* READ_CHAR_HACK */ +# endif /* !READ_CHAR_HACK */ fflush(stdout); # ifdef READ_CHAR_HACK diff -Nurp tin-1.7.0/src/debug.c tin-1.7.1/src/debug.c --- tin-1.7.0/src/debug.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/debug.c Fri Aug 29 01:30:43 2003 @@ -240,25 +240,25 @@ debug_print_attributes( void -vDbgPrintMalloc( - int iIsMalloc, - const char *pcFile, - int iLine, - size_t iSize) +debug_print_malloc( + int is_malloc, + const char *xfile, + int line, + size_t size) { FILE *fp; char file[PATH_LEN]; - static int iTotal = 0; + static int total = 0; if (debug == 4) { joinpath(file, TMPDIR, "MALLOC"); if ((fp = fopen(file, "a+")) != NULL) { - iTotal += iSize; + total += size; /* sometimes size_t is long */ - if (iIsMalloc) - fprintf(fp, "%10s:%-4d Malloc %6ld. Total %d\n", pcFile, iLine, (long) iSize, iTotal); + if (is_malloc) + fprintf(fp, "%10s:%-4d Malloc %6ld. Total %d\n", xfile, line, (long) size, total); else - fprintf(fp, "%10s:%-4d Realloc %6ld. Total %d\n", pcFile, iLine, (long) iSize, iTotal); + fprintf(fp, "%10s:%-4d Realloc %6ld. Total %d\n", xfile, line, (long) size, total); fchmod(fileno(fp), (S_IRUGO|S_IWUGO)); fclose(fp); } diff -Nurp tin-1.7.0/src/feed.c tin-1.7.1/src/feed.c --- tin-1.7.0/src/feed.c Sun Aug 10 15:32:00 2003 +++ tin-1.7.1/src/feed.c Thu Aug 28 15:25:14 2003 @@ -3,7 +3,7 @@ * Module : feed.c * Author : I. Lea * Created : 1991-08-31 - * Updated : 2003-08-10 + * Updated : 2003-08-12 * Notes : provides same interface to mail,pipe,print,save & repost commands * * Copyright (c) 1991-2003 Iain Lea @@ -86,7 +86,7 @@ static void print_save_summary(char type # define handle_SIGPIPE() if (got_sig_pipe) goto got_sig_pipe_while_piping #else # define handle_SIGPIPE() /*nothing*/ -#endif /* DONT_HAVE_PIPING */ +#endif /* !DONT_HAVE_PIPING */ /* * 'filename' holds 'filelen' amount of storage in which to place the @@ -563,7 +563,7 @@ feed_articles( #ifndef DISABLE_PRINTING /* Setup printing - get print command line */ case FEED_PRINT: - sprintf(outpath, "%s %s", tinrc.printer, REDIRECT_OUTPUT); + snprintf(outpath, sizeof(outpath), "%s %s", tinrc.printer, REDIRECT_OUTPUT); break; #endif /* !DISABLE_PRINTING */ @@ -747,7 +747,7 @@ feed_articles( * Invoke post-processing if needed * Work out what (if anything) needs to be redrawn */ - if (!tinrc.use_mailreader_i) + if (INTERACTIVE_NONE == tinrc.interactive_mailer) redraw_screen |= mail_check(); /* in case of sending to oneself */ switch (function) { @@ -826,7 +826,7 @@ got_sig_pipe_while_piping: */ switch (function) { case FEED_MAIL: - if (tinrc.use_mailreader_i) + if (INTERACTIVE_NONE != tinrc.interactive_mailer) info_message(_(txt_external_mail_done)); else info_message(_(txt_articles_mailed), counter.success, PLURAL(counter.success, txt_article)); diff -Nurp tin-1.7.0/src/filter.c tin-1.7.1/src/filter.c --- tin-1.7.0/src/filter.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/filter.c Fri Aug 29 01:55:12 2003 @@ -3,7 +3,7 @@ * Module : filter.c * Author : I. Lea * Created : 1992-12-28 - * Updated : 2003-05-16 + * Updated : 2003-08-27 * Notes : Filter articles. Kill & auto selection are supported. * * Copyright (c) 1991-2003 Iain Lea @@ -883,7 +883,7 @@ print_filter_menu( MoveCursor(INDEX_TOP, 0); my_printf("%s%s%s", ptr_filter_comment, cCRLF, cCRLF); my_printf("%s%s", ptr_filter_text, cCRLF); - my_printf("%s%s%s", _(txt_filter_text_type), cCRLF, cCRLF); + my_printf("%s%s%s", _(txt_filter_text_type), cCRLF, cCRLF); my_printf("%s%s", text_subj, cCRLF); my_printf("%s%s", text_from, cCRLF); my_printf("%s%s%s", text_msgid, cCRLF, cCRLF); @@ -1210,8 +1210,8 @@ filter_menu( /* * Expire time */ - sprintf(double_time, "2x %s", text_time); - sprintf(quat_time, "4x %s", text_time); + 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); @@ -1530,7 +1530,7 @@ add_filter_rule( ptr[i].icase = rule->icase; if (*rule->text) { - sprintf(acBuf, REGEX_FMT, quote_wild_whitespace(rule->text)); + snprintf(acBuf, sizeof(acBuf), REGEX_FMT, quote_wild_whitespace(rule->text)); switch (rule->counter) { case FILTER_SUBJ_CASE_IGNORE: @@ -1565,12 +1565,12 @@ add_filter_rule( */ if (rule->subj_ok) { STRCPY(sbuf, art->subject); - sprintf(acBuf, REGEX_FMT, (rule->check_string ? quote_wild(sbuf) : sbuf)); + snprintf(acBuf, sizeof(acBuf), REGEX_FMT, (rule->check_string ? quote_wild(sbuf) : sbuf)); ptr[i].subj = my_strdup(acBuf); } if (rule->from_ok) { STRCPY(sbuf, art->from); - sprintf(acBuf, REGEX_FMT, quote_wild(sbuf)); + snprintf(acBuf, sizeof(acBuf), REGEX_FMT, quote_wild(sbuf)); ptr[i].from = my_strdup(acBuf); } /* @@ -1590,7 +1590,6 @@ add_filter_rule( * So the thread remains open (in group level). To overcome this, * the first msgid from references field is taken in this case. */ -#if 1 /* This is what I think is more correct, but I did NOT test it! (urs) */ if (group->attribute->thread_arts == THREAD_REFS && (group->attribute->quick_kill_header == FILTER_MSGID || group->attribute->quick_kill_header == FILTER_REFS_ONLY) && @@ -1605,24 +1604,7 @@ add_filter_rule( } else { STRCPY(sbuf, MSGID(art)); } -#else /* original logic by guido */ - if (group->attribute->thread_arts != THREAD_REFS || - origin != GROUP_LEVEL || - (group->attribute->quick_kill_header != FILTER_MSGID && - group->attribute->quick_kill_header != FILTER_MSGID_LAST) - (art->refptr->parent == NULL)) - { - STRCPY(sbuf, MSGID(art)); - } else { - /* not real parent, take first references entry as MID */ - struct t_msgid *xptr; - - for (xptr = art->refptr->parent; xptr->parent != NULL; xptr = xptr->parent) - ; - STRCPY(sbuf, xptr->txt); - } -#endif /* 1 */ - sprintf(acBuf, REGEX_FMT, quote_wild(sbuf)); + snprintf(acBuf, sizeof(acBuf), REGEX_FMT, quote_wild(sbuf)); ptr[i].msgid = my_strdup(acBuf); ptr[i].fullref = rule->fullref; } @@ -1769,7 +1751,7 @@ filter_articles( */ if (ptr[j].from != NULL) { if (arts[i].name != NULL) - sprintf(buf, "%s (%s)", arts[i].from, arts[i].name); + snprintf(buf, sizeof(buf), "%s (%s)", arts[i].from, arts[i].name); else strcpy(buf, arts[i].from); if (test_regex(buf, ptr[j].from, ptr[j].icase, ®ex_cache_from[j])) { diff -Nurp tin-1.7.0/src/group.c tin-1.7.1/src/group.c --- tin-1.7.0/src/group.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/group.c Fri Aug 29 01:18:06 2003 @@ -1222,7 +1222,7 @@ build_sline( if ((j = line_is_tagged(respnum))) strcpy(new_resps, tin_ltoa(j, 3)); else - sprintf(new_resps, " %c", sbuf.art_mark); + snprintf(new_resps, sizeof(new_resps), " %c", sbuf.art_mark); /* * Find index of first unread in this thread @@ -1233,19 +1233,20 @@ build_sline( if (n > 1) { /* change this to (n > 0) if you do a n-- above */ if (arts[j].line_count != -1) { char tmp_buffer[4]; + strcpy(tmp_buffer, tin_ltoa(n, 3)); - sprintf(art_cnt, "%s %s ", tmp_buffer, tin_ltoa(arts[j].line_count, 4)); + snprintf(art_cnt, sizeof(art_cnt), "%s %s ", tmp_buffer, tin_ltoa(arts[j].line_count, 4)); } else - sprintf(art_cnt, "%s ? ", tin_ltoa(n, 3)); + snprintf(art_cnt, sizeof(art_cnt), "%s ? ", tin_ltoa(n, 3)); } else { if (arts[j].line_count != -1) - sprintf(art_cnt, " %s ", tin_ltoa(arts[j].line_count, 4)); + snprintf(art_cnt, sizeof(art_cnt), " %s ", tin_ltoa(arts[j].line_count, 4)); else strcpy(art_cnt, " ? "); } } else { if (n > 1) /* change this to (n > 0) if you do a n-- above */ - sprintf(art_cnt, "%s ", tin_ltoa(n, 3)); + snprintf(art_cnt, sizeof(art_cnt), "%s ", tin_ltoa(n, 3)); else strcpy(art_cnt, " "); } diff -Nurp tin-1.7.0/src/header.c tin-1.7.1/src/header.c --- tin-1.7.0/src/header.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/header.c Sat Aug 23 01:58:41 2003 @@ -3,7 +3,7 @@ * Module : header.c * Author : Urs Janssen * Created : 1997-03-10 - * Updated : 2003-03-27 + * Updated : 2003-08-16 * * Copyright (c) 1997-2003 Urs Janssen * All rights reserved. @@ -189,7 +189,7 @@ get_fqdn( if ((hp = gethostbyaddr(hp->h_addr, hp->h_length, hp->h_addrtype))) in.s_addr = (*hp->h_addr); - sprintf(fqdn, "%s", hp + snprintf(fqdn, sizeof(fqdn), "%s", hp ? strchr(hp->h_name, '.') ? hp->h_name : inet_ntoa(in) : ""); @@ -219,7 +219,7 @@ get_fqdn( } } if (domain) - sprintf(fqdn, "%s.%s", name, strip_line(domain)); + snprintf(fqdn, sizeof(fqdn), "%s.%s", name, strip_line(domain)); fclose(inf); } diff -Nurp tin-1.7.0/src/inews.c tin-1.7.1/src/inews.c --- tin-1.7.0/src/inews.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/inews.c Mon Aug 25 15:00:23 2003 @@ -474,11 +474,11 @@ sender_needed( snprintf(sender_line, sizeof(sender_line), "Sender: %s", sender); -#ifdef CHARSET_CONVERSION +# ifdef CHARSET_CONVERSION p = rfc1522_encode(sender_line, group ? txt_mime_charsets[group->attribute->mm_network_charset] : txt_mime_charsets[tinrc.mm_network_charset], FALSE); -#else +# else p = rfc1522_encode(sender_line, tinrc.mm_charset, FALSE); -#endif /* CHARSET_CONVERSION */ +# endif /* CHARSET_CONVERSION */ if (GNKSA_OK != gnksa_do_check_from(p + 8, sender_addr, sender_name)) { free(p); return -2; diff -Nurp tin-1.7.0/src/init.c tin-1.7.1/src/init.c --- tin-1.7.0/src/init.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/init.c Wed Aug 27 23:18:34 2003 @@ -3,7 +3,7 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-08-10 + * Updated : 2003-08-27 * Notes : * * Copyright (c) 1991-2003 Iain Lea @@ -328,6 +328,7 @@ struct t_config tinrc = { 5, /* mono_markslash */ 3, /* mono_markstroke */ TRUE, /* word_highlight */ + TRUE, /* url_highlight */ 0, /* wrap_column */ #ifdef HAVE_COLOR FALSE, /* use_color */ @@ -393,7 +394,7 @@ struct t_config tinrc = { TRUE, /* thread_catchup_on_exit */ TRUE, /* unlink_article */ "", /* inews_prog */ - FALSE, /* use_mailreader_i */ + INTERACTIVE_NONE, /* interactive_mailer */ FALSE, /* use_mouse */ #ifdef HAVE_KEYPAD FALSE, /* use_keypad */ @@ -573,7 +574,7 @@ init_selfinfo( strncpy(homedir, myentry->pw_dir, sizeof(homedir) - 1); } #endif /* !M_AMIGA */ - else + else strncpy(homedir, TMPDIR, sizeof(homedir) - 1); cmdline_nntpserver[0] = '\0'; @@ -674,10 +675,11 @@ init_selfinfo( /* * the site_config-file was the last chance to set the domainname - * if it's still unset exit tin. + * if it's still unset fall into no posting mode. */ if (domain_name[0] == '\0') { error_message(_(txt_error_no_domain_name)); + sleep(2); force_no_post = TRUE; } diff -Nurp tin-1.7.0/src/keymap.c tin-1.7.1/src/keymap.c --- tin-1.7.0/src/keymap.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/keymap.c Mon Aug 25 14:48:35 2003 @@ -620,7 +620,7 @@ static t_keynode *keys_select_nav[] = { &Key.Global.Eight, &Key.Global.Nine, #ifndef NO_SHELL_ESCAPE &Key.Global.ShellEscape, -#endif /* NO_SHELL_ESCAPE */ +#endif /* !NO_SHELL_ESCAPE */ &Key.Global.FirstPage, &Key.Global.LastPage, &Key.Global.PageUp, &Key.Global.PageUp2, &Key.Global.PageUp3, &Key.Global.PageDown, &Key.Global.PageDown2, &Key.Global.PageDown3, &Key.Global.Up, diff -Nurp tin-1.7.0/src/lang.c tin-1.7.1/src/lang.c --- tin-1.7.0/src/lang.c Sun Aug 10 16:08:36 2003 +++ tin-1.7.1/src/lang.c Wed Aug 27 23:18:49 2003 @@ -3,7 +3,7 @@ * Module : lang.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-08-10 + * Updated : 2003-08-12 * Notes : * * Copyright (c) 1991-2003 Iain Lea @@ -200,7 +200,7 @@ constext txt_error_invalid_response_to_g constext txt_error_locale[] = "Can't set the specified locale!"; constext txt_error_mime_end[] = N_("MIME parse error: Unexpected end of %s/%s article"); constext txt_error_mime_start[] = N_("MIME parse error: Start boundary whilst reading headers"); -constext txt_error_no_domain_name[] = N_("Can't get a (fully-qualified) domain-name!\n"); +constext txt_error_no_domain_name[] = N_("Can't get a (fully-qualified) domain-name!"); constext txt_error_no_enter_permission[] = N_("No permissions to go into %s\n"); constext txt_error_no_from[] = N_("\nError: From: line missing.\n"); constext txt_error_no_read_permission[] = N_("No read permissions for %s\n"); @@ -1042,7 +1042,7 @@ Warning: The \"%s:\" line has spaces in # else constext txt_mini_group_3[] = N_("%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"); constext txt_mini_page_3[] = N_("%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"); -# endif /* DONT_HAVE_PIPING */ +# endif /* !DONT_HAVE_PIPING */ #else # ifndef DONT_HAVE_PIPING constext txt_mini_group_3[] = N_("%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"); @@ -1050,8 +1050,8 @@ Warning: The \"%s:\" line has spaces in # else constext txt_mini_group_3[] = N_("%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post"); constext txt_mini_page_3[] = N_("%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post"); -# endif /* DONT_HAVE_PIPING */ -#endif /* DISABLE_PRINTING */ +# endif /* !DONT_HAVE_PIPING */ +#endif /* !DISABLE_PRINTING */ #ifdef HAVE_COLOR # ifdef USE_CURSES @@ -1285,6 +1285,13 @@ constext *txt_mailbox_formats[] = { "MMDF" }; +/* interactive mailers */ +constext *txt_interactive_mailers[] = { + N_("no"), + N_("with headers"), + N_("without headers") +}; + struct opttxt txt_display_options = { NULL, N_("Display Options"), @@ -1935,6 +1942,12 @@ struct opttxt txt_mono_markstroke = { "" }; +struct opttxt txt_url_highlight = { + N_(" toggles, sets, cancels."), + N_("URL highlighting in message body :"), + N_("# Enable URL highlighting?\n") +}; + struct opttxt txt_word_highlight = { N_(" toggles, sets, cancels."), N_("Word highlighting in message body :"), @@ -2249,12 +2262,13 @@ struct opttxt txt_mailer_format = { # ie. elm interactive : elm -i %%F -s \"%%S\" \"%%T\"\n") }; -struct opttxt txt_use_mailreader_i = { +struct opttxt txt_interactive_mailer = { N_(" toggles, sets, cancels."), N_("Use interactive mail reader :"), - N_("# Interactive mailreader: if ON mailreader will be invoked earlier for\n\ -# reply so you can use more of its features (eg. MIME, pgp, ...)\n\ -# this option has to suit default_mailer_format\n") + N_("# 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") }; struct opttxt txt_unlink_article = { diff -Nurp tin-1.7.0/src/main.c tin-1.7.1/src/main.c --- tin-1.7.0/src/main.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/main.c Sat Sep 6 12:05:34 2003 @@ -226,7 +226,7 @@ main( joinpath(file, TMPDIR, "BITMAP"); unlink(file); - /* vNewsrcTestHarness(); */ + /* newsrc_test_harness(); */ } #endif /* DEBUG_NEWSRC */ @@ -422,7 +422,7 @@ main( # define OPTIONS "aAcdD:f:G:g:hHI:lm:M:nNop:qQrRs:SuvVwxXzZ" #else # define OPTIONS "BcdD:f:G:hHI:lm:M:nNop:qQrRs:SuvVwxXzZ" -#endif /* M_AMIGA */ +#endif /* !M_AMIGA */ static void read_cmd_line_options( @@ -551,7 +551,7 @@ read_cmd_line_options( giveup(); /* keep lint quiet: */ /* NOTREACHED */ -#endif /* NO_POSTING */ +#endif /* !NO_POSTING */ break; case 'p': /* implies -r */ @@ -852,7 +852,7 @@ read_cmd_line_options( giveup(); /* keep lint quiet: */ /* NOTREACHED */ -#endif /* NO_POSTING */ +#endif /* !NO_POSTING */ break; #if 0 diff -Nurp tin-1.7.0/src/memory.c tin-1.7.1/src/memory.c --- tin-1.7.0/src/memory.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/memory.c Fri Aug 29 01:31:08 2003 @@ -476,7 +476,7 @@ my_malloc1( void *p; #ifdef DEBUG - vDbgPrintMalloc(TRUE, file, line, size); + debug_print_malloc(TRUE, file, line, size); #endif /* DEBUG */ if ((p = malloc(size)) == NULL) { @@ -500,7 +500,7 @@ my_calloc1( void *p; #ifdef DEBUG - vDbgPrintMalloc(TRUE, file, line, nmemb * size); + debug_print_malloc(TRUE, file, line, nmemb * size); #endif /* DEBUG */ if ((p = calloc(nmemb, size)) == NULL) { @@ -519,7 +519,7 @@ my_realloc1( size_t size) { #ifdef DEBUG - vDbgPrintMalloc(FALSE, file, line, size); + debug_print_malloc(FALSE, file, line, size); #endif /* DEBUG */ p = ((!p) ? (calloc(1, size)) : realloc(p, size)); diff -Nurp tin-1.7.0/src/mimetypes.c tin-1.7.1/src/mimetypes.c --- tin-1.7.0/src/mimetypes.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/mimetypes.c Tue Aug 26 14:21:41 2003 @@ -3,7 +3,7 @@ * Module : mimetypes.c * Author : J. Faultless * Created : 2000-03-31 - * Updated : 2003-04-10 + * Updated : 2003-08-26 * Notes : mime.types handling * * Copyright (c) 2000-2003 Jason Faultless @@ -77,6 +77,7 @@ _lookup_mimetype( if ((i = content_type(strtok(buf, "/"))) != -1) { if ((ptr = strtok(NULL, "\n")) != NULL) { part->type = i; + FreeIfNeeded(part->subtype); part->subtype = my_strdup(ptr); fclose(fp); return TRUE; diff -Nurp tin-1.7.0/src/misc.c tin-1.7.1/src/misc.c --- tin-1.7.0/src/misc.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/misc.c Fri Aug 29 01:20:03 2003 @@ -3,7 +3,7 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-06-17 + * Updated : 2003-08-24 * Notes : * * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta @@ -277,7 +277,7 @@ copy_body( */ if (tinrc.quote_style & QUOTE_COMPRESS) { if (strstr(prefix, "%s")) - sprintf(prefixbuf, prefix, initl); + snprintf(prefixbuf, sizeof(prefixbuf), prefix, initl); else { /* strip tailing space from quote-char for quoting quoted lines */ strcpy(prefixbuf, prefix); @@ -285,7 +285,7 @@ copy_body( prefixbuf[strlen(prefixbuf) - 1] = '\0'; } } else - sprintf(prefixbuf, prefix, initl); + snprintf(prefixbuf, sizeof(prefixbuf), prefix, initl); /* * if raw_data is true, the signature is exceptionally quoted, even if @@ -654,7 +654,7 @@ my_mkdir( char buf[LEN]; struct stat sb; - sprintf(buf, "mkdir %s", path); /* redirect stderr to /dev/null? use invoke_cmd()? */ + snprintf(buf, sizeof(buf), "mkdir %s", path); /* redirect stderr to /dev/null? use invoke_cmd()? */ if (stat(path, &sb) == -1) { system(buf); return chmod(path, mode); @@ -1697,12 +1697,6 @@ strfpath( } -enum quote_enum { - no_quote = 0, - dbl_quote, - sgl_quote -}; - /* * TODO: Properly explain this @@ -1714,37 +1708,46 @@ escape_shell_meta( { static char buf[PATH_LEN]; char *dest = buf; + int space = sizeof(buf) - 2; switch (quote_area) { case no_quote: - while (*source) { + while (*source && (space > 0)) { if (*source == '\'' || *source == '\\' || *source == '"' || *source == '$' || *source == '`' || *source == '*' || *source == '&' || *source == '|' || *source == '<' || *source == '>' || *source == ';' || *source == '(' || - *source == ')') + *source == ')') { *dest++ = '\\'; + space--; + } *dest++ = *source++; + space--; } break; case dbl_quote: - while (*source) { + while (*source && (space > 0)) { if (*source == '\\' || *source == '"' || *source == '$' || - *source == '`') + *source == '`') { *dest++ = '\\'; + space--; + } *dest++ = *source++; + space--; } break; case sgl_quote: - while (*source) { + while (*source && (space > 4)) { if (*source == '\'') { *dest++ = '\''; *dest++ = '\\'; *dest++ = '\''; + space -= 3; } *dest++ = *source++; + space--; } break; @@ -1879,7 +1882,7 @@ strfmailer( case 'S': /* Subject */ /* don't MIME encode Subject if using external mail client */ - if (tinrc.use_mailreader_i) + if (INTERACTIVE_NONE != tinrc.interactive_mailer) strncpy(tbuf, escape_shell_meta(subject, quote_area), sizeof(tbuf) - 1); else { #ifdef CHARSET_CONVERSION @@ -1896,7 +1899,7 @@ strfmailer( case 'T': /* To */ /* don't MIME encode To if using external mail client */ - if (tinrc.use_mailreader_i) + if (INTERACTIVE_NONE != tinrc.interactive_mailer) strncpy(tbuf, escape_shell_meta(to, quote_area), sizeof(tbuf) - 1); else { #ifdef CHARSET_CONVERSION @@ -1913,7 +1916,7 @@ strfmailer( case 'U': /* User */ /* don't MIME encode User if using external mail client */ - if (tinrc.use_mailreader_i) + if (INTERACTIVE_NONE != tinrc.interactive_mailer) strncpy(tbuf, userid, sizeof(tbuf) - 1); else { #ifdef CHARSET_CONVERSION @@ -2056,7 +2059,7 @@ cleanup_tmp_files( char acNovFile[PATH_LEN]; if (xover_cmd && !tinrc.cache_overview_files) { - sprintf(acNovFile, "%s%d.idx", TMPDIR, (int) process_id); + snprintf(acNovFile, sizeof(acNovFile), "%s%d.idx", TMPDIR, (int) process_id); unlink(acNovFile); } #endif /* 0 */ diff -Nurp tin-1.7.0/src/newsrc.c tin-1.7.1/src/newsrc.c --- tin-1.7.0/src/newsrc.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/newsrc.c Sat Sep 6 12:05:34 2003 @@ -43,7 +43,7 @@ #endif /* !TCURSES_H */ #ifndef TNNTP_H # include "tnntp.h" -#endif /* TNNTP_H */ +#endif /* !TNNTP_H */ #define BITS_TO_BYTES(n) ((size_t) ((n + NBITS - 1) / NBITS)) @@ -1432,22 +1432,17 @@ set_default_bitmap( /* TEST harness */ #ifdef DEBUG_NEWSRC - -# ifdef DEBUG_NEWSRC_FIXME /* something's broken here */ - static void set_bitmap_range_read(struct t_newsrc *newsrc, long beg, long end); - static void set_bitmap_range_unread(struct t_newsrc *newsrc, long beg, long end); -# endif /* DEBUG_NEWSRC_FIXME */ +static void set_bitmap_range_read(struct t_newsrc *my_newsrc, long beg, long end); +static void set_bitmap_range_unread(struct t_newsrc *my_newsrc, long beg, long end); void -vNewsrcTestHarness( +newsrc_test_harness( void) { char seq[20000]; - char *temp_file = NULL; FILE *fp; int i; int retry = 10; /* max. retrys */ - int fd; long rng_min, rng_max; struct t_group group; @@ -1470,7 +1465,7 @@ vNewsrcTestHarness( strcpy(seq, get_val("TIN_SEQ", "")); - my_printf("\nENV Min=[%ld] Max=[%ld] Rng=[%ld-%ld] Count=[%ld] Seq=[%s]\n", + fprintf(stderr, "\nENV Min=[%ld] Max=[%ld] Rng=[%ld-%ld] Count=[%ld] Seq=[%s]\n", group.xmin, group.xmax, rng_min, rng_max, group.count, seq); for (i = 0; i < 3; i++) { @@ -1485,74 +1480,65 @@ vNewsrcTestHarness( while (retry) { /* FIXME - this is secure now, but doesn't write any debug output */ /* (it didn't before too) */ - if ((temp_file = my_tempnam("", "NEWSRC")) != NULL) { - if ((fd = open (temp_file, (O_CREAT|O_EXCL), (S_IRUSR|S_IWUSR))) != -1) { - if ((fp = fopen(temp_file, "w")) != NULL) { - my_printf("\n%d. PARSE Seq=[%s]\n", i + 1, seq); - parse_bitmap_seq(&group, seq); - debug_print_newsrc(&group.newsrc, stdout); - print_bitmap_seq(fp, &group); - my_printf(" PRINT Seq=["); - print_bitmap_seq(stdout, &group); - fclose(fp); - } else - retry--; - close(fd); - break; - } else - retry--; + if ((fp = tmpfile()) != NULL) { + fprintf(stderr, "\n%d. PARSE Seq=[%s]\n", i + 1, seq); + parse_bitmap_seq(&group, seq); + debug_print_newsrc(&group.newsrc, stderr); + print_bitmap_seq(fp, &group); + fprintf(stderr, " PRINT Seq="); + print_bitmap_seq(stderr, &group); + rewind(fp); + break; } else retry--; } - debug_print_newsrc(&group.newsrc, stdout); + debug_print_newsrc(&group.newsrc, stderr); if (!retry) error_message(_(txt_cannot_create_uniq_name)); else { - fp = fopen(temp_file, "r"); fgets(seq, (int) sizeof(seq), fp); seq[strlen(seq) - 1] = '\0'; fclose(fp); } } -# ifdef DEBUG_NEWSRC_FIXME /* something's broken here */ set_bitmap_range_read(&group.newsrc, rng_min, rng_max); - debug_print_newsrc(&group.newsrc, stdout); + debug_print_newsrc(&group.newsrc, stderr); set_bitmap_range_unread(&group.newsrc, rng_min, rng_max); - debug_print_newsrc(&group.newsrc, stdout); - - NSETBLK0(group.newsrc.xbitmap, group.newsrc.xbitlen); - debug_print_newsrc(&group.newsrc, stdout); + debug_print_newsrc(&group.newsrc, stderr); - NSETBLK1(group.newsrc.xbitmap, group.newsrc.xbitlen); - debug_print_newsrc(&group.newsrc, stdout); -# endif /* DEBUG_NEWSRC_FIXME */ + if (group.newsrc.xbitmap != NULL) + NSETBLK0(group.newsrc.xbitmap, group.newsrc.xbitlen); + debug_print_newsrc(&group.newsrc, stderr); + + if (group.newsrc.xbitmap != NULL) + NSETBLK1(group.newsrc.xbitmap, group.newsrc.xbitlen); + debug_print_newsrc(&group.newsrc, stderr); my_printf("\n"); } -# ifdef DEBUG_NEWSRC_FIXME /* something's broken here */ static void set_bitmap_range_read( - struct t_newsrc *newsrc, + struct t_newsrc *my_newsrc, long beg, long end) { long length, offset; - if (beg >= newsrc->xmin && end <= newsrc->xmax) { - offset = beg - newsrc->xmin; - length = end - newsrc->xmin; + if (beg >= my_newsrc->xmin && end <= my_newsrc->xmax) { + offset = beg - my_newsrc->xmin; + length = end - my_newsrc->xmin; -my_printf("\nRNG Min-Max=[%ld-%ld] Beg-End=[%ld-%ld] OFF=[%ld] LEN=[%ld]\n", -newsrc->xmin, newsrc->xmax, beg, end, offset, length); +fprintf(stderr, "\nRNG Min-Max=[%ld-%ld] Beg-End=[%ld-%ld] OFF=[%ld] LEN=[%ld]\n", +my_newsrc->xmin, my_newsrc->xmax, beg, end, offset, length); if (beg == end) { - NSET0(newsrc->xbitmap, offset); + NSET0(my_newsrc->xbitmap, offset); } else { - NSETRNG0(newsrc->xbitmap, offset, length); + NSETRNG0(my_newsrc->xbitmap, offset, length); } } } @@ -1560,24 +1546,23 @@ newsrc->xmin, newsrc->xmax, beg, end, of static void set_bitmap_range_unread( - struct t_newsrc *newsrc, + struct t_newsrc *my_newsrc, long beg, long end) { long length, offset; - if (beg >= newsrc->xmin && end <= newsrc->xmax) { - offset = beg - newsrc->xmin; - length = end - newsrc->xmin; + if (beg >= my_newsrc->xmin && end <= my_newsrc->xmax) { + offset = beg - my_newsrc->xmin; + length = end - my_newsrc->xmin; -my_printf("\nRNG Min-Max=[%ld-%ld] Beg-End=[%ld-%ld] OFF=[%ld] LEN=[%ld]\n", newsrc->xmin, newsrc->xmax, beg, end, offset, length); +fprintf(stderr, "\nRNG Min-Max=[%ld-%ld] Beg-End=[%ld-%ld] OFF=[%ld] LEN=[%ld]\n", my_newsrc->xmin, my_newsrc->xmax, beg, end, offset, length); if (beg == end) { - NSET1(newsrc->xbitmap, offset); + NSET1(my_newsrc->xbitmap, offset); } else { - NSETRNG1(newsrc->xbitmap, offset, length); + NSETRNG1(my_newsrc->xbitmap, offset, length); } } } -# endif /* DEBUG_NEWSRC_FIXME */ #endif /* DEBUG_NEWSRC */ diff -Nurp tin-1.7.0/src/nrctbl.c tin-1.7.1/src/nrctbl.c --- tin-1.7.0/src/nrctbl.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/nrctbl.c Thu Aug 28 15:35:20 2003 @@ -169,7 +169,7 @@ get_newsrcname( int error = 0; if (!strfpath(name_found, tmp_newsrc, sizeof(tmp_newsrc), NULL)) { - my_fprintf(stderr, _("couldn't expand %s\n"), name_found); + my_fprintf(stderr, _("couldn't expand %s\n"), name_found); /* TODO: -> lang.c */ error = 1; } else { if (tmp_newsrc[0] == '/') diff -Nurp tin-1.7.0/src/open.c tin-1.7.1/src/open.c --- tin-1.7.0/src/open.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/open.c Sat Aug 23 01:58:41 2003 @@ -3,7 +3,7 @@ * Module : open.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-07-22 + * Updated : 2003-08-16 * Notes : Routines to make reading news locally (ie. /var/spool/news) * or via NNTP transparent * @@ -51,26 +51,101 @@ * local prototypes */ static int base_comp(t_comptype p1, t_comptype p2); +#ifdef NNTP_ABLE + static void check_extensions(void); +#endif /* NNTP_ABLE */ #if 0 /* currently unused */ static FILE *open_xhdr_fp(char *header, long min, long max); static t_bool stat_article(long art, const char *group_path); #endif /* 0 */ +char *nntp_server = NULL; +constext *xover_cmd = NULL; long head_next; - #ifdef NO_POSTING t_bool can_post = FALSE; #else t_bool can_post = TRUE; #endif /* NO_POSTING */ +#ifdef NNTP_ABLE + static constext *xover_cmds = "XOVER"; +# if 0 /* currently not used */ + static constext *xhdr_cmd = NULL; + static constext *xhdr_cmds = "XHDR"; +# endif /* 0 */ + static t_bool have_list_extensions = FALSE; +#endif /* NNTP_ABLE */ + -char *nntp_server = NULL; -char *xover_cmd = NULL; #ifdef NNTP_ABLE - static char txt_xover_buff[] = "XOVER"; +/* + * Try and use LIST EXTENSIONS here. Get this list before issuing + * other NNTP commands because the correct methods may be + * mentioned in the list of extensions. + * Possible extensions include: + * - HDR & LIST HEADERS + * - OVER + * - LISTGROUP + * - LIST OVERVIEW.FMT + * + * Sets up: have_list_extensions, xover_cmd, (xhdr_cmd) + */ +static void +check_extensions( + void) +{ + FILE *fp; + char *ptr; + int i; + + if ((fp = nntp_command("LIST EXTENSIONS", OK_EXTENSIONS, NULL, 0)) == NULL) + return; + + have_list_extensions = TRUE; + + while ((ptr = tin_fgets(fp, FALSE)) != NULL) { + /* + * Check for (X)OVER + * XOVER should not be listed in EXTENSIONS (only OVER), but + * checking for it if OVER is not found does no harm. + */ + if (!xover_cmd) { + for (i = 1; i >= 0; i--) { + if (strcmp(ptr, &xover_cmds[i]) == 0) { + xover_cmd = &xover_cmds[i]; + break; + } + } + } +# if 0 /* currently not used */ + /* + * Check for (X)HDR + * XHDR should not be listed in EXTENSIONS (only HDR), but + * checking for it if HDR is not found does no harm. + */ + if (!xhdr_cmd) { + for (i = 1; i >= 0; i--) { + if (strcmp(ptr, &xhdr_cmds[i]) == 0) { + xhdr_cmd = &xhdr_cmds[i]; + break; + } + } + } +# endif /* 0 */ + /* + * additional checks for + * - LISTGROUP + * - LIST OVERVIEW.FMT + * - LIST HEADERS + * go here whenever they are needed + */ + } + return; +} #endif /* NNTP_ABLE */ + /* * Open a connection to the NNTP server. Authenticate if necessary or * desired, and test if the server supports XOVER. @@ -223,14 +298,12 @@ nntp_open( } /* - * NOTE: Latest NNTP draft (Jan 2002) states that LIST EXTENSIONS should - * be used to find out what commands are supported. - * - * TODO: Implement LIST EXTENSIONS here. Get this list before issuing - * authentication because the authentication method required may be - * mentioned in the list of extensions. (For details about - * authentication methods, see draft-newman-nntpext-auth-01.txt.) + * Find out which NNTP extensions are available + * TODO: The authentication method required may be mentioned in the list of + * extensions. (For details about authentication methods, see + * draft-newman-nntpext-auth-01.txt). */ + check_extensions(); /* * If the user wants us to authenticate on connection startup, do it now. @@ -239,7 +312,6 @@ nntp_open( * allowed to post after authentication issue a "MODE READER" again and * interpret the response code. */ - if (force_auth_on_conn_open) { # ifdef DEBUG debug_nntp("nntp_open", "authenticate"); @@ -313,20 +385,39 @@ nntp_open( } /* - * Check if NNTP supports XOVER or OVER command (successor of XOVER as of - * latest NNTP Draft (Jan 2002); ie, we _don't_ get an ERR_COMMAND - * Could use (i=1;i>=0;i--) to give OVER higher priority than XOVER - * - * TODO: Don't try (X)OVER if listed in LIST EXTENSIONS. + * If LIST EXTENSIONS failed, check if NNTP supports XOVER or OVER command + * (successor of XOVER as of latest NNTP Draft (Jan 2002) + * We have to check that we _don't_ get an ERR_COMMAND */ - for (i = 0; i < 2; i++) { - xover_cmd = &txt_xover_buff[i]; - if (!nntp_command(xover_cmd, ERR_COMMAND, NULL, 0)) - break; + if (!have_list_extensions) { + for (i = 0; i < 2; i++) { + if (!nntp_command(&xover_cmds[i], ERR_COMMAND, NULL, 0)) { + xover_cmd = &xover_cmds[i]; + break; + } + } + } else { + if (!xover_cmd) { + /* + * LIST EXTENSIONS didn't mention OVER or XOVER, try + * XOVER + */ + if (!nntp_command(xover_cmds, ERR_COMMAND, NULL, 0)) + xover_cmd = xover_cmds; + } +#if 0 /* unused */ + if (!xhdr_cmd) { + /* + * LIST EXTENSIONS didn't mention HDR or XHDR, try + * XHDR + */ + if (!nntp_command(xhdr_cmds, ERR_COMMAND, NULL, 0)) + xhdr_cmd = xhdr_cmds; + } +#endif /* 0 */ } - if (i == 2) { /* ie XOVER and OVER gave ERR_COMMAND */ - xover_cmd = NULL; + if (!xover_cmd) { if (!is_reconnect && !batch_mode) { wait_message(2, _(txt_no_xover_support)); @@ -340,8 +431,11 @@ nntp_open( /* in index_newsdir ? */ } -# if 0 /* TODO: */ - /* if we're using -n, check for LIST NEWSGROUPS */ +# if 0 + /* + * TODO: if we're using -n, check for LIST NEWSGROUPS + * see also comments in open_newsgroups_fp() + */ if (newsrc_active && !list_active) { /* -n */ /* code goes here */ } @@ -374,8 +468,8 @@ nntp_close( /* * Get a response code from the server. * Returns: - * +ve NNTP return code - * -1 on an error or user abort. We don't differentiate. + * +ve NNTP return code + * -1 on an error or user abort. We don't differentiate. * If 'message' is not NULL, then any trailing text after the response * code is copied into it. * Does not perform authentication if required; use get_respcode() @@ -406,7 +500,7 @@ get_only_respcode( DEBUG_IO((stderr, "get_only_respcode(%d)\n", respcode)); /* TODO: reconnect on ERR_FAULT? */ - if ((respcode == ERR_FAULT || respcode == ERR_GOODBYE) && last_put[0] != '\0') { + if ((respcode == ERR_FAULT || respcode == ERR_GOODBYE || respcode == OK_GOODBYE) && last_put[0] != '\0' && strcmp(last_put, "QUIT")) { /* * Maybe server timed out. * If so, retrying will force a reconnect. @@ -441,8 +535,8 @@ get_only_respcode( /* * Get a response code from the server. * Returns: - * +ve NNTP return code - * -1 on an error + * +ve NNTP return code + * -1 on an error * If 'message' is not NULL, then any trailing text after the response * code is copied into it. * Performs authentication if required and repeats the last command if @@ -567,7 +661,7 @@ open_overview_fmt_fp( if (!xover_cmd) return (FILE *) 0; - sprintf(line, "LIST %s", OVERVIEW_FMT); + snprintf(line, sizeof(line), "LIST %s", OVERVIEW_FMT); return (nntp_command(line, OK_GROUPS, NULL, 0)); } else { #endif /* NNTP_ABLE */ @@ -597,12 +691,12 @@ open_newgroups_fp( return (FILE *) 0; ngtm = localtime(&newnews[idx].time); - /* - * in the current draft NEWGROUPS is allowed to take a 4 digit year - * componennt - but even with a 2 digit year componennt it is y2k - * compilant... we should switch over to ngtm->tm_year + 1900 - * after most of the server could handle the new format - */ + /* + * in the current draft, NEWGROUPS is allowed to take a 4 digit year + * component - but even with a 2 digit year component it is y2k + * compliant... we should switch over to ngtm->tm_year + 1900 + * when most servers can handle the new format + */ snprintf(line, sizeof(line), "NEWGROUPS %02d%02d%02d %02d%02d%02d", ngtm->tm_year % 100, ngtm->tm_mon + 1, ngtm->tm_mday, ngtm->tm_hour, ngtm->tm_min, ngtm->tm_sec); @@ -673,6 +767,7 @@ open_newsgroups_fp( { #ifdef NNTP_ABLE FILE *result; + if (read_news_via_nntp && !read_saved_news) { if (read_local_newsgroups_file) { result = fopen(local_newsgroups_file, "r"); @@ -686,8 +781,7 @@ open_newsgroups_fp( } # if 0 /* TODO: */ if (list_newsgroups_wildmat_supported && newsrc_active - && !list_active - && num_active < some_useful_limit) { + && !list_active && num_active < some_useful_limit) { for_each_group(i) { sprintf(buff, "LIST NEWSGROUPS %s", active[i].name); nntp_command(buff, OK_LIST, NULL, 0); @@ -834,6 +928,7 @@ setup_hard_base( */ if (read_news_via_nntp && group->type == GROUP_TYPE_NEWS) { #ifdef NNTP_ABLE + FILE *fp; # ifdef BROKEN_LISTGROUP /* @@ -841,7 +936,7 @@ setup_hard_base( * (reported by reorx@irc.pl). This affects (old?) versions of * nntpcache and leafnode. Usually this should not be needed. */ - sprintf(buf, "GROUP %s", group->name); + snprintf(buf, sizeof(buf), "GROUP %s", group->name); if (nntp_command(buf, OK_GROUP, NULL, 0) == NULL) return -1; # endif /* BROKEN_LISTGROUP */ @@ -849,18 +944,17 @@ setup_hard_base( /* * See if LISTGROUP works */ - sprintf(buf, "LISTGROUP %s", group->name); - if (nntp_command(buf, OK_GROUP, NULL, 0) != NULL) { + snprintf(buf, sizeof(buf), "LISTGROUP %s", group->name); + if ((fp = nntp_command(buf, OK_GROUP, NULL, 0)) != NULL) { char *ptr; # ifdef DEBUG debug_nntp("setup_hard_base", buf); # endif /* DEBUG */ - while ((ptr = tin_fgets(FAKE_NNTP_FP, FALSE)) != NULL) { + while ((ptr = tin_fgets(fp, FALSE)) != NULL) { if (grpmenu.max >= max_art) expand_art(); - base[grpmenu.max++] = atoi(ptr); } @@ -868,6 +962,9 @@ setup_hard_base( return -1; } else { + /* + * LISTGROUP failed, use GROUP command instead + */ long start, last, count; char line[NNTP_STRLEN]; @@ -878,10 +975,7 @@ setup_hard_base( if (tin_errno) return -1; - /* - * LISTGROUP failed, try a GROUP command instead - */ - sprintf(buf, "GROUP %s", group->name); + snprintf(buf, sizeof(buf), "GROUP %s", group->name); if (nntp_command(buf, OK_GROUP, line, sizeof(line)) == NULL) return -1; @@ -985,18 +1079,15 @@ group_get_art_info( char buf[NNTP_STRLEN]; long artnum; #ifdef M_AMIGA - long artmin; - long artmax; - - artmin = *art_min; - artmax = *art_max; + long artmin = *art_min; + long artmax = *art_max; #endif /* M_AMIGA */ if (read_news_via_nntp && grouptype == GROUP_TYPE_NEWS) { #ifdef NNTP_ABLE char line[NNTP_STRLEN]; - sprintf(buf, "GROUP %s", groupname); + snprintf(buf, sizeof(buf), "GROUP %s", groupname); # ifdef DEBUG debug_nntp("group_get_art_info", buf); # endif /* DEBUG */ @@ -1100,7 +1191,9 @@ stat_article( #endif /* 0 */ -/* This will come in useful for filtering on non-overview hdr fields */ +/* + * This will come in useful for filtering on non-overview hdr fields + */ #if 0 static FILE * open_xhdr_fp( @@ -1109,10 +1202,10 @@ open_xhdr_fp( long max) { # ifdef NNTP_ABLE - if (read_news_via_nntp && !read_saved_news) { + if (read_news_via_nntp && !read_saved_news && xhdr_cmd) { char buf[NNTP_STRLEN]; - sprintf(buf, "XHDR %s %ld-%ld", header, min, max); + snprintf(buf, sizeof(buf), "%s %s %ld-%ld", xhdr_cmd, header, min, max); return (nntp_command(buf, OK_HEAD, NULL, 0)); } else # endif /* NNTP_ABLE */ diff -Nurp tin-1.7.0/src/page.c tin-1.7.1/src/page.c --- tin-1.7.0/src/page.c Sun Aug 10 15:10:12 2003 +++ tin-1.7.1/src/page.c Sat Sep 13 16:46:15 2003 @@ -3,7 +3,7 @@ * Module : page.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-08-10 + * Updated : 2003-09-12 * Notes : * * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta @@ -993,6 +993,7 @@ return_to_index: case iKeyPageViewAttach: XFACE_SUPPRESS(); decode_save_mime(&pgart, FALSE); + draw_page(group->name, 0); XFACE_SHOW(); break; @@ -1002,6 +1003,7 @@ return_to_index: resize_article(FALSE, &pgart); /* umbreak long lines */ process_url(); resize_article(TRUE, &pgart); /* rebreak long lines */ + draw_page(group->name, 0); XFACE_SHOW(); } break; @@ -1092,14 +1094,16 @@ print_message_page( /* * Highlight URL's and mail addresses */ - if (curr->flags & C_URL) - highlight_regexes(i + scroll_region_top, &url_regex, -1); + if (tinrc.url_highlight) { + if (curr->flags & C_URL) + highlight_regexes(i + scroll_region_top, &url_regex, -1); - if (curr->flags & C_MAIL) - highlight_regexes(i + scroll_region_top, &mail_regex, -1); + if (curr->flags & C_MAIL) + highlight_regexes(i + scroll_region_top, &mail_regex, -1); - if (curr->flags & C_NEWS) - highlight_regexes(i + scroll_region_top, &news_regex, -1); + if (curr->flags & C_NEWS) + highlight_regexes(i + scroll_region_top, &news_regex, -1); + } /* * Highlight /slashes/, *stars*, _underscores_ and -strokes- @@ -1316,11 +1320,7 @@ draw_page_header( buf[i] = '\0'; - if (maxlen != grplen) { /* ie groupname was too long */ - strncat(buf, group, maxlen - 3); - strcat(buf, "..."); - } else - strncat(buf, group, maxlen); + trunc(group, buf + i, sizeof(buf) - i, maxlen); for (i = strlen(buf); i < RIGHT_POS + mb_diff; i++) /* Pad out to right */ buf[i] = ' '; @@ -1337,7 +1337,7 @@ draw_page_header( /* Can't eval tin_ltoa() more than once in a statement due to statics */ strcpy(x, tin_ltoa(which_thread(this_resp) + 1, 4)); - sprintf(tmp, _(txt_thread_x_of_n), buf, x, tin_ltoa(grpmenu.max, 4)); + snprintf(tmp, sizeof(tmp), _(txt_thread_x_of_n), buf, x, tin_ltoa(grpmenu.max, 4)); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (mbstowcs(wtmp, tmp, ARRAY_SIZE(wtmp)) != (size_t) -1) { wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; @@ -1356,13 +1356,13 @@ draw_page_header( if (arts[this_resp].line_count < 0) strcpy(tmp, "?"); else - sprintf(tmp, "%-4d", arts[this_resp].line_count); + snprintf(tmp, sizeof(tmp), "%-4d", arts[this_resp].line_count); #ifdef HAVE_COLOR fcol(tinrc.col_head); #endif /* HAVE_COLOR */ - sprintf(buf, _(txt_lines), tmp); + snprintf(buf, sizeof(buf), _(txt_lines), tmp); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (mbstowcs(wtmp, buf, ARRAY_SIZE(wtmp)) != (size_t) -1) { wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; @@ -1396,13 +1396,14 @@ draw_page_header( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (mbstowcs(wtmp, buf, ARRAY_SIZE(wtmp)) != (size_t) -1) { wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - wcspart(wbuf, wtmp, RIGHT_POS - 5 - i, ARRAY_SIZE(wbuf), FALSE); + wtrunc(wtmp, wbuf, ARRAY_SIZE(wbuf), RIGHT_POS - 5 - i); scrlen = wcswidth(wbuf, ARRAY_SIZE(wbuf)); wcstombs(buf, wbuf, sizeof(wbuf)); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ { - buf[RIGHT_POS - 5 - i] = '\0'; + STRCPY(tmp, buf); + trunc(tmp, buf, sizeof(buf), RIGHT_POS - 5 - i); scrlen = (int) strlen(buf); } @@ -1449,10 +1450,13 @@ draw_page_header( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) if (mbstowcs(wtmp, buf, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - wcspart(wbuf, wtmp, cCOLS - 1, ARRAY_SIZE(wbuf) - 1, FALSE); + wtrunc(wtmp, wbuf, ARRAY_SIZE(wbuf), cCOLS - 1); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - buf[cCOLS - 1] = '\0'; + { + STRCPY(tmp, buf); + trunc(tmp, buf, sizeof(buf), cCOLS - 1); + } if (note_h->org) { snprintf(tmp, sizeof(tmp), _(txt_at_s), note_h->org); @@ -1465,7 +1469,7 @@ draw_page_header( if (wcswidth(wbuf, ARRAY_SIZE(wbuf)) + wcswidth(wtmp, ARRAY_SIZE(wtmp)) >= cCOLS - 1) { wcsncat(wbuf, wtmp, ARRAY_SIZE(wbuf) - wcslen(wbuf) - 1); wcscpy(wtmp, wbuf); - wcspart(wbuf, wtmp, cCOLS - 1, ARRAY_SIZE(wbuf) - 1, FALSE); + wtrunc(wtmp, wbuf, ARRAY_SIZE(wbuf), cCOLS - 1); } else { int j = cCOLS - 1 - wcswidth(wtmp, ARRAY_SIZE(wtmp)) - wcswidth(wbuf, ARRAY_SIZE(wbuf)); @@ -1478,8 +1482,9 @@ draw_page_header( } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ if ((int) strlen(buf) + (int) strlen(tmp) >= cCOLS - 1) { - strncat(buf, tmp, cCOLS - 1 - strlen(buf)); - buf[cCOLS - 1] = '\0'; + strncat(buf, tmp, sizeof(buf) - strlen(buf) - 1); + STRCPY(tmp, buf); + trunc(tmp, buf, sizeof(buf), cCOLS - 1); } else { pos = cCOLS - 1 - (int) strlen(tmp); for (i = strlen(buf); i < pos; i++) diff -Nurp tin-1.7.0/src/post.c tin-1.7.1/src/post.c --- tin-1.7.0/src/post.c Sun Aug 10 15:32:09 2003 +++ tin-1.7.1/src/post.c Sat Sep 13 16:45:49 2003 @@ -3,7 +3,7 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2003-08-10 + * Updated : 2003-09-13 * Notes : mail/post/replyto/followup/repost & cancel articles * * Copyright (c) 1991-2003 Iain Lea @@ -1201,7 +1201,7 @@ check_article_to_be_posted( errors_catbp |= CA_ERROR_BAD_CHARSET; #else /* we catch this case later on again */ warnings_catbp |= CA_WARNING_CHARSET_CONVERSION; -#endif /* CHARSET_CONVERSION */ +#endif /* !CHARSET_CONVERSION */ if (contains_8bit && mime_7bit) errors_catbp |= CA_ERROR_BAD_ENCODING; @@ -1746,7 +1746,7 @@ check_moderated( * Generally only bogus groups should have no attributes */ if (psGrp->bogus) { - error_message(_("%s is bogus"), group); + error_message(_("%s is bogus"), group); /* TODO: -> lang.c */ return NULL; } @@ -1797,12 +1797,8 @@ create_normal_article_headers( char from_name[HEADER_LEN]; char tmp[HEADER_LEN]; - /* TODO: combine with other code in tin that does the ... truncation? */ /* Get subject for posting article - Limit the display if needed */ - if (strlen(tinrc.default_post_subject) > DISPLAY_SUBJECT_LEN) - sprintf(tmp, "%.*s ...", DISPLAY_SUBJECT_LEN, tinrc.default_post_subject); - else - strncpy(tmp, tinrc.default_post_subject, sizeof(tmp) - 1); + trunc(tinrc.default_post_subject, tmp, sizeof(tmp), DISPLAY_SUBJECT_LEN); snprintf(mesg, sizeof(mesg), _(txt_post_subject), tmp); @@ -1893,7 +1889,7 @@ quick_post_article( /* * Get groupname */ - sprintf(buf, _(txt_post_newsgroups), tinrc.default_post_newsgroups); + snprintf(buf, sizeof(buf), _(txt_post_newsgroups), tinrc.default_post_newsgroups); if (!(prompt_string_default(buf, tinrc.default_post_newsgroups, _(txt_no_newsgroups), HIST_POST_NEWSGROUPS))) return; @@ -1937,7 +1933,7 @@ post_postponed_article( if ((p = strchr(ng, ',')) != NULL) *p = '\0'; - sprintf(buf, _("Posting: %.*s ..."), (int) (cCOLS - 14), subject); + snprintf(buf, sizeof(buf), _("Posting: %.*s ..."), (int) (cCOLS - 14), subject); /* TODO: -> lang.c */ post_loop(POST_POSTPONED, group_find(ng), (ask ? iKeyPostEdit : iKeyPostPost3), buf, GROUP_TYPE_NEWS, 0); free(ng); return; @@ -2691,7 +2687,7 @@ create_mail_headers( fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); - if (!tinrc.use_mailreader_i) { /* tin should start editor */ + if ((INTERACTIVE_NONE == tinrc.interactive_mailer) || (INTERACTIVE_WITH_HEADERS == tinrc.interactive_mailer)) { /* tin should include headers for editing */ char from_buf[HEADER_LEN]; char *from_address; @@ -2925,12 +2921,12 @@ mail_to_someone( /* TODO: -> lang.c */ fprintf(fp, "-- end of forwarded message --\n"); - if (!tinrc.use_mailreader_i) + if (INTERACTIVE_NONE == tinrc.interactive_mailer) msg_write_signature(fp, TRUE, &CURR_GROUP); fclose(fp); - if (tinrc.use_mailreader_i) { /* user wants to use his own mailreader */ + if (INTERACTIVE_NONE != tinrc.interactive_mailer) { /* user wants to use his own mailreader */ char buf[HEADER_LEN]; char *p; @@ -2967,7 +2963,7 @@ mail_bug_report( t_bool is_nntp = FALSE, is_nntp_only; wait_message(0, _(txt_mail_bug_report)); - sprintf(subject, "BUG REPORT %s\n", page_header); + snprintf(subject, sizeof(subject), "BUG REPORT %s\n", page_header); if ((fp = create_mail_headers(nam, ".bugreport", bug_addr, subject, NULL)) == NULL) return FALSE; @@ -3032,12 +3028,12 @@ mail_bug_report( fprintf(fp, "\nPlease enter _detailed_ bug report, gripe or comment:\n\n"); start_line_offset += 2; - if (!tinrc.use_mailreader_i) + if (INTERACTIVE_NONE == tinrc.interactive_mailer) msg_write_signature(fp, TRUE, (selmenu.curr == -1) ? NULL : &CURR_GROUP); fclose(fp); - if (tinrc.use_mailreader_i) { /* user wants to use his own mailreader */ + if (INTERACTIVE_NONE != tinrc.interactive_mailer) { /* user wants to use his own mailreader */ subject[strlen(subject) - 1] = '\0'; /* cut trailing '\n' */ strfmailer(mailer, subject, bug_addr, nam, buf, sizeof(buf), tinrc.mailer_format); if (invoke_cmd(buf)) @@ -3154,7 +3150,7 @@ mail_to_author( } else /* !copy_text */ fprintf(fp, "\n"); /* add a newline to keep vi from bitching */ - if (!tinrc.use_mailreader_i) + if (INTERACTIVE_NONE == tinrc.interactive_mailer) msg_write_signature(fp, TRUE, &CURR_GROUP); fclose(fp); @@ -3164,7 +3160,7 @@ mail_to_author( find_reply_to_addr(mail_to, TRUE, &pgart.hdr); - if (tinrc.use_mailreader_i) { /* user wants to use his own mailreader for reply */ + if (INTERACTIVE_NONE != tinrc.interactive_mailer) { /* user wants to use his own mailreader for reply */ char buf[HEADER_LEN]; subject[strlen(subject) - 1] = '\0'; /* cut trailing '\n' */ @@ -3175,7 +3171,7 @@ mail_to_author( ret_code = mail_loop(nam, iKeyPostEdit, subject, group, NULL); /* - * If use_mailreader_i=ON and the user changed the subject in his + * If interactive_mailer!=NONE and the user changed the subject in his * mailreader, the entry generated here is wrong, strictly speaking. * But since we don't have a chance to get the final subject back from * the mailer I think this is the best solution. -dn, 2000-03-16 @@ -3330,11 +3326,11 @@ cancel_article( if (!author) { char line2[HEADER_LEN]; - sprintf(line2, "cyberspam!%s", line); + snprintf(line2, sizeof(line2), "cyberspam!%s", line); msg_add_header("Path", line2); msg_add_header("From", from_name); msg_add_header("Sender", note_h.from); - sprintf(line, "name) - sprintf(line, "%s <%s>", art->name, art->from); + snprintf(line, sizeof(line), "%s <%s>", art->name, art->from); else - sprintf(line, "<%s>", art->from); + snprintf(line, sizeof(line), "<%s>", art->from); msg_add_header("From", line); ADD_CAN_KEY(note_h.messageid); } @@ -3356,7 +3352,7 @@ cancel_article( ADD_MSG_ID_HEADER(); ADD_CAN_KEY(note_h.messageid); #endif /* FORGERY */ - sprintf(buf, "cmsg cancel %s", note_h.messageid); + snprintf(buf, sizeof(buf), "cmsg cancel %s", note_h.messageid); msg_add_header("Subject", buf); /* @@ -3366,7 +3362,7 @@ cancel_article( msg_add_header("Newsgroups", note_h.newsgroups); if (tinrc.prompt_followupto) msg_add_header("Followup-To", ""); - sprintf(buf, "cancel %s", note_h.messageid); + snprintf(buf, sizeof(buf), "cancel %s", note_h.messageid); msg_add_header("Control", buf); /* TODO: does this catch x-posts to moderated groups? */ @@ -3558,7 +3554,7 @@ repost_article( if (note_h.org) msg_add_header("Organization", note_h.org); - sprintf(line, " @@ -510,7 +510,7 @@ prompt_msgid( * Format a message such that it'll fit within the screen width * Useful for fitting long Subjects and newsgroup names into prompts * TODO: maybe add a '...' to the string to show it was truncated. - * See center_line() + * You can use trunc() for it. */ char * sized_message( diff -Nurp tin-1.7.0/src/rfc1524.c tin-1.7.1/src/rfc1524.c --- tin-1.7.0/src/rfc1524.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/rfc1524.c Mon Aug 25 14:55:15 2003 @@ -3,7 +3,7 @@ * Module : rfc1524.c * Author : Urs Janssen , Jason Faultless * Created : 2000-05-15 - * Updated : 2002-06-18 + * Updated : 2002-08-24 * Notes : mailcap parsing as defined in RFC 1524 * * Copyright (c) 2000-2003 Urs Janssen , Jason Faultless @@ -39,7 +39,7 @@ #endif /* !TIN_H */ #ifndef RFC2046_H # include "rfc2046.h" -#endif /* RFC2046_H */ +#endif /* !RFC2046_H */ /* TODO: what about !unix systems? */ #define DEFAULT_MAILCAPS "~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:/etc/mail/mailcap" @@ -48,7 +48,7 @@ #define MAILCAPFIELDS 13 /* local prototypes */ -static char *expand_mailcap_meta(const char *mailcap, t_part *part, char *nametemplate, const char *path); +static char *expand_mailcap_meta(const char *mailcap, t_part *part, t_bool escape_shell_meta_chars, const char *path); static char *get_mailcap_field(char *mailcap); static t_mailcap *parse_mailcap_line(const char *mailcap, t_part *part, const char *path); @@ -208,7 +208,7 @@ parse_mailcap_line( ptr += strlen(ptr) + 1; } if (!strncasecmp(ptr, "nametemplate=", 13)) { - tmailcap->nametemplate = expand_mailcap_meta(ptr + 13, part, (char *) 0, path); + tmailcap->nametemplate = expand_mailcap_meta(ptr + 13, part, FALSE, path); ptr += strlen(ptr) + 1; } if (!strncasecmp(ptr, "test=", 5)) { @@ -246,21 +246,21 @@ parse_mailcap_line( * nametemplate */ if (tmailcap->command != NULL) - tmailcap->command = expand_mailcap_meta(tmailcap->command, part, tmailcap->nametemplate, path); + tmailcap->command = expand_mailcap_meta(tmailcap->command, part, TRUE, tmailcap->nametemplate ? tmailcap->nametemplate : path); if (tmailcap->description != NULL) - tmailcap->description = expand_mailcap_meta(tmailcap->description, part, tmailcap->nametemplate, path); + tmailcap->description = expand_mailcap_meta(tmailcap->description, part, FALSE, tmailcap->nametemplate ? tmailcap->nametemplate : path); if (tmailcap->test != NULL) - tmailcap->test = expand_mailcap_meta(tmailcap->test, part, tmailcap->nametemplate, path); + tmailcap->test = expand_mailcap_meta(tmailcap->test, part, TRUE, tmailcap->nametemplate ? tmailcap->nametemplate : path); if (tmailcap->compose != NULL) - tmailcap->compose = expand_mailcap_meta(tmailcap->compose, part, tmailcap->nametemplate, path); + tmailcap->compose = expand_mailcap_meta(tmailcap->compose, part, TRUE, tmailcap->nametemplate ? tmailcap->nametemplate : path); if (tmailcap->composetyped != NULL) - tmailcap->composetyped = expand_mailcap_meta(tmailcap->composetyped, part, tmailcap->nametemplate, path); + tmailcap->composetyped = expand_mailcap_meta(tmailcap->composetyped, part, TRUE, tmailcap->nametemplate ? tmailcap->nametemplate : path); if (tmailcap->edit != NULL) - tmailcap->edit = expand_mailcap_meta(tmailcap->edit, part, tmailcap->nametemplate, path); + tmailcap->edit = expand_mailcap_meta(tmailcap->edit, part, TRUE, tmailcap->nametemplate ? tmailcap->nametemplate : path); if (tmailcap->print != NULL) - tmailcap->print = expand_mailcap_meta(tmailcap->print, part, tmailcap->nametemplate, path); + tmailcap->print = expand_mailcap_meta(tmailcap->print, part, TRUE, tmailcap->nametemplate ? tmailcap->nametemplate : path); if (tmailcap->x11bitmap != NULL) - tmailcap->x11bitmap = expand_mailcap_meta(tmailcap->x11bitmap, part, tmailcap->nametemplate, path); + tmailcap->x11bitmap = expand_mailcap_meta(tmailcap->x11bitmap, part, TRUE, tmailcap->nametemplate ? tmailcap->nametemplate : path); free(optr); @@ -345,13 +345,12 @@ static char * expand_mailcap_meta( const char *mailcap, t_part *part, - char *nametemplate, + t_bool escape_shell_meta_chars, const char *path) { const char *ptr; char *line, *lptr; - t_bool quote = FALSE; - t_bool percent = FALSE; + int quote = no_quote; size_t linelen, space, olen; if ((ptr = strchr(mailcap, '%')) == NULL) /* nothing to expand */ @@ -377,116 +376,87 @@ expand_mailcap_meta( lptr = line + olen; /* adjust pointer to current position */ } - switch (*ptr) { - case '\\': - quote = bool_not(quote); - break; - - case '%': - if (!quote) - percent = TRUE; - else { - *lptr++ = '%'; - space--; - quote = FALSE; - } - break; - - case '{': - if (percent) { - char *end; - - percent = FALSE; - if ((end = strchr(ptr, '}')) != NULL) { - if (part->params != NULL) { - char *parameter; - const char *value; - - parameter = my_calloc(1, end - ptr + 1); - strncpy(parameter, ptr + 1, end - ptr - 1); /* extract paramter name */ - - if ((value = get_param(part->params, parameter)) != NULL) { /* match? */ - CHECK_SPACE(strlen(value)); - strcat(line, value); - lptr = line + strlen(line); - space -= strlen(line); - } - free(parameter); + if ('\\' == *ptr) { + ptr++; + if (('\\' == *ptr) || ('%' == *ptr)) { + *lptr++ = *ptr++; + space--; + } + continue; + } + if ('%' == *ptr) { + ptr++; + if ('{' == *ptr) { /* Content-Type parameter */ + char *end; + + if ((end = strchr(ptr, '}')) != NULL) { + if (part->params != NULL) { + char *parameter; + const char *value; + + parameter = my_calloc(1, end - ptr + 1); + strncpy(parameter, ptr + 1, end - ptr - 1); /* extract paramter name */ + if ((value = get_param(part->params, parameter)) != NULL) { /* match? */ + const char *nptr = escape_shell_meta_chars ? escape_shell_meta(value, quote) : value; + + CHECK_SPACE(strlen(nptr)); + strcat(line, nptr); + lptr = line + strlen(line); + space -= strlen(line); } - ptr = end; /* skip past closing } */ + free(parameter); } - break; /* full %{...} */ - } - /* FALLTHROUGH */ - -#if 0 /* TODO: */ - case 'F': - if (percent) { - percent = FALSE; - break; - } - /* FALLTHROUGH */ - - case 'n': - if (percent) { - percent = FALSE; - break; + ptr = end; /* skip past closing } */ + ptr++; + } else { + /* sequence broken, output literally */ + *lptr++ = '%'; + *lptr++ = *ptr++; + space -= 2; } - /* FALLTHROUGH */ + continue; +#if 0 /* TODO */ + } else if ('F' == *ptr) { /* Content-Types and Filenames of sub parts */ + } else if ('n' == *ptr) { /* Number of sub parts */ + } #endif /* 0 */ + } else if ('s' == *ptr) { /* Filename */ + const char *nptr = escape_shell_meta_chars ? escape_shell_meta(path, quote) : path; - case 's': - if (percent) { - char *nptr = (char *) 0; - - if (nametemplate && (nptr = expand_mailcap_meta(nametemplate, part, (char *) 0, path)) != 0) { - CHECK_SPACE(strlen(nptr) + 2); - strcat(line, nptr); - free(nptr); - } else { - CHECK_SPACE(strlen(path) + 2); - strcat(line, path); - } - - lptr = line + strlen(line); - space -= strlen(line); - percent = FALSE; - break; - } - /* FALLTHROUGH */ - - case 't': - if (percent) { - CHECK_SPACE((strlen(content_types[part->type]) + 1 + strlen(part->subtype))); - strcat(line, content_types[part->type]); - strcat(line, "/"); - strcat(line, part->subtype); - lptr = line + strlen(line); - space -= strlen(line); - percent = FALSE; - break; - } - /* FALLTHROUGH */ - - default: - if (quote) { /* last char was \ */ - *lptr = '\\'; - lptr++; - space--; - quote = FALSE; - } - if (percent) { /* unknow %x sequence */ - *lptr = '%'; - lptr++; - space--; - percent = FALSE; - quote = FALSE; - } - *lptr = *ptr; - lptr++; + CHECK_SPACE(strlen(nptr) + 2); + strcat(line, nptr); + lptr = line + strlen(line); + space -= strlen(line); + ptr++; + continue; + } else if ('t' == *ptr) { /* Content-Type */ + const char *nptr = escape_shell_meta_chars ? escape_shell_meta(part->subtype, quote) : part->subtype; + + CHECK_SPACE((strlen(content_types[part->type]) + 1 + strlen(nptr))); + strcat(line, content_types[part->type]); + strcat(line, "/"); + strcat(line, nptr); + lptr = line + strlen(line); + space -= strlen(line); + ptr++; + continue; + } else { /* unknown % sequence */ + *lptr++ = '%'; space--; + continue; + } } - ptr++; + + if (escape_shell_meta_chars) { + if (('\'' == *ptr) && (quote != dbl_quote)) + quote = (quote == no_quote ? sgl_quote : no_quote); + else if (('"' == *ptr) && (quote != sgl_quote)) + quote = (quote == no_quote ? dbl_quote : no_quote); + } + + /* any other char */ + *lptr++ = *ptr++; + space--; } return line; } diff -Nurp tin-1.7.0/src/rfc2046.c tin-1.7.1/src/rfc2046.c --- tin-1.7.0/src/rfc2046.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/rfc2046.c Tue Aug 26 14:18:38 2003 @@ -3,7 +3,7 @@ * Module : rfc2046.c * Author : Jason Faultless * Created : 2000-02-18 - * Updated : 2003-06-09 + * Updated : 2003-08-26 * Notes : RFC 2046 MIME article parsing * * Copyright (c) 2000-2003 Jason Faultless @@ -46,13 +46,16 @@ /* * local prototypes */ +static char *get_quoted_string(char *source, char **dest); +static char *get_token(const char *source); +static char *skip_equal_sign(char *source); +static char *skip_space(char *source); static int boundary_cmp(const char *line, const char *boundary); static int count_lines(char *line); static int parse_multipart_article(FILE *infile, t_openartinfo *artinfo, t_part *part, int depth, t_bool show_progress_meter); static int parse_normal_article(FILE *in, t_openartinfo *artinfo, t_bool show_progress_meter); static int parse_rfc2045_article(FILE *infile, int line_count, t_openartinfo *artinfo, t_bool show_progress_meter); static unsigned int parse_content_encoding(const char *encoding); -static void free_list(t_param *list); static void parse_content_type(char *type, t_part *content); static void parse_content_disposition(char *disp, t_part *part); static void parse_params(char *params, t_part *content); @@ -173,6 +176,79 @@ boundary_check( } +#define ATTRIBUTE_DELIMS "()<>@,;:\\\"/[]?=" + +static char * +skip_space( + char *source) +{ + while ((*source) && ((' ' == *source) || ('\t' == *source))) + source++; + return *source ? source : NULL; +} + + +static char * +get_token( + const char *source) +{ + char *dest = my_strdup(source); + char *ptr = dest; + + while (isascii(*ptr) && isprint(*ptr) && *ptr != ' ' && !strchr(ATTRIBUTE_DELIMS, *ptr)) + ptr++; + *ptr = '\0'; + + return my_realloc(dest, strlen(dest) + 1); +} + + +static char * +get_quoted_string( + char *source, + char **dest) +{ + char *ptr; + t_bool quote = FALSE; + + *dest = my_malloc(strlen(source)); + ptr = *dest; + source++; /* skip over double quote */ + while (*source) { + if ('\\' == *source) { + quote = TRUE; /* next char as-is */ + source++; + continue; + } + if (('"' == *source) && !quote) + break; /* end of quoted-string */ + *ptr++ = *source++; + quote = FALSE; + } + *ptr = '\0'; + *dest = my_realloc(*dest, strlen(*dest) + 1); + return *source ? source++ : source; +} + + +/* + * Skip equal sign and (non compliant) white space around it + */ +static char * +skip_equal_sign( + char *source) +{ + if (!(source = skip_space(source))) + return NULL; + + if ('=' != *source++) + /* no equal sign, invalid header, stop parsing here */ + return NULL; + + return skip_space(source); +} + + /* * Parse a Content-* parameter list into a linked list * Ensure the ->params element is correctly initialised before calling @@ -183,27 +259,49 @@ parse_params( char *params, t_part *content) { - char *eql, *param; + char *name, *param, *value; t_param *ptr; - for (param = strtok(params, ";"); param; param = strtok(NULL, PARAM_SEP)) { - if ((eql = strchr(param, '=')) == NULL) - continue; /* No =, Malformed param */ + param = params; + while (*param) { + /* Skip over white space */ + if (!(param = skip_space(param))) + break; - *eql++ = '\0'; /* Split at = */ + /* catch parameter name */ + name = get_token(param); + param += strlen(name); + if (!*param) { + /* Nothing follows, invalid, stop here */ + FreeIfNeeded(name); + break; + } - ptr = my_malloc(sizeof(t_param)); - str_trim(param); - ptr->name = my_strdup(param); + if (!(param = skip_equal_sign(param))) { + FreeIfNeeded(name); + break; + } - str_trim(eql); /* See if in "" */ - if (*eql == '"' && (param = strrchr(eql, '"')) != NULL) { - eql++; - *param = '\0'; + /* catch parameter value; may be surrounded by double quotes */ + if ('"' == *param) /* parse quoted-string */ + param = get_quoted_string(param, &value); + else { + /* parse token */ + value = get_token(param); + param += strlen(value); } - ptr->value = my_strdup(rfc1522_decode(eql)); + + ptr = my_malloc(sizeof(t_param)); + ptr->name = name; + ptr->value = value; /* TODO don't RFC1522 decode, parameter encoding is per RFC2231 (not implemented yet) */ ptr->next = content->params; /* Push onto start of list */ content->params = ptr; + + /* advance pointer to next parameter */ + while ((*param) && (';' != *param)) + param++; + if (';' == *param) + param++; } } @@ -211,7 +309,7 @@ parse_params( /* * Free up a generic list object */ -static void +void free_list( t_param *list) { @@ -414,8 +512,6 @@ new_part( /* * Free a linked list of t_part - * - * TODO: plug mem leak: ptr->uue is not entirely freed */ void free_parts( @@ -445,6 +541,8 @@ free_and_init_header( */ FreeAndNull(hdr->from); FreeAndNull(hdr->to); + FreeAndNull(hdr->cc); + FreeAndNull(hdr->bcc); FreeAndNull(hdr->date); FreeAndNull(hdr->subj); FreeAndNull(hdr->org); diff -Nurp tin-1.7.0/src/save.c tin-1.7.1/src/save.c --- tin-1.7.0/src/save.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/save.c Tue Aug 26 20:04:16 2003 @@ -3,7 +3,7 @@ * Module : save.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-08-03 + * Updated : 2003-08-26 * Notes : * * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta @@ -231,7 +231,7 @@ check_start_save_any_news( continue; } - if (function == MAIL_ANY_NEWS) { + if ((function == MAIL_ANY_NEWS) && ((INTERACTIVE_NONE == tinrc.interactive_mailer) || (INTERACTIVE_WITH_HEADERS == tinrc.interactive_mailer))) { fprintf(savefp, "To: %s\n", mail_news_user); fprintf(savefp, "Subject: %s\n", arts[j].subject); /* @@ -1430,20 +1430,9 @@ decode_save_mime( t_part *ptr, *uueptr; /* - * Process only the uue part in the 'main' article to prevent saving out the - * preamble as a text section etc.. - */ - if (!postproc) { - for (uueptr = art->hdr.ext->uue; uueptr != NULL; uueptr = uueptr->next) { - if (!(decode_save_one(uueptr, art->raw, postproc))) - break; - } - } - - /* * Iterate over all the attachments */ - for (ptr = art->hdr.ext->next; ptr != NULL; ptr = ptr->next) { + for (ptr = art->hdr.ext; ptr != NULL; ptr = ptr->next) { /* * Handle uuencoded sections in this message part. * Only works when the uuencoded file is entirely within the current @@ -1459,9 +1448,12 @@ decode_save_mime( } /* - * TYPE_MULTIPART is an envelope type, don't process it + * TYPE_MULTIPART is an envelope type, don't process it. + * If we had an UUE part, the "surrounding" text/plain plays + * the role of a multipart part. Check to see if we want to + * save text and if not, skip this part. */ - if (ptr->type == TYPE_MULTIPART) + if ((ptr->type == TYPE_MULTIPART || ((NULL != ptr->uue) && (!check_save_mime_type(ptr, CURR_GROUP.attribute->mime_types_to_save))))) continue; if (!(decode_save_one(ptr, art->raw, postproc))) diff -Nurp tin-1.7.0/src/screen.c tin-1.7.1/src/screen.c --- tin-1.7.0/src/screen.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/screen.c Sat Sep 13 16:46:34 2003 @@ -3,7 +3,7 @@ * Module : screen.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-08-03 + * Updated : 2003-09-12 * Notes : * * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta @@ -199,7 +199,6 @@ clear_message( } -#define TRUNC_TAIL " ..." void center_line( int line, @@ -212,8 +211,6 @@ center_line( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) int width; wchar_t wbuffer[256]; /* needs same number of elements as buffer */ - wchar_t wbuffer2[256]; - wchar_t suffix_buf[6]; /* space for TRUNC_TAIL */ #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ STRCPY(buffer, str); @@ -221,25 +218,18 @@ center_line( /* protect terminal... */ convert_to_printable(buffer); + len = strlen(buffer); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if ((len = mbstowcs(wbuffer, buffer, ARRAY_SIZE(wbuffer) - 1)) <= 0) - len = strlen(buffer); - else + if (mbstowcs(wbuffer, buffer, ARRAY_SIZE(wbuffer)) != (size_t)(-1)) { wbuffer[ARRAY_SIZE(wbuffer) - 1] = (wchar_t) '\0'; - if ((width = wcswidth(wbuffer, ARRAY_SIZE(wbuffer) - 1)) <= 0) - width = len; -#else - len = strlen(buffer); + if ((width = wcswidth(wbuffer, ARRAY_SIZE(wbuffer))) > 0) + len = width; + } #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ if (!cmd_line) { -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (cCOLS >= width) - pos = (cCOLS - width) / 2; -#else if (cCOLS >= len) pos = (cCOLS - len) / 2; -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ else pos = 1; @@ -250,22 +240,13 @@ center_line( } } -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (width >= cCOLS) { - wcspart(wbuffer2, wbuffer, cCOLS - 6, ARRAY_SIZE(wbuffer2) - 5, TRUE); - mbstowcs(suffix_buf, TRUNC_TAIL, ARRAY_SIZE(suffix_buf) - 1); - wcsncat(wbuffer2, suffix_buf, 4); - wcstombs(buffer, wbuffer2, sizeof(buffer) - 1); - } -#else if (len >= cCOLS) { char *buf; buf = my_strdup(buffer); - snprintf(buffer, sizeof(buffer), "%-.*s%s", cCOLS - 6, buf, TRUNC_TAIL); + trunc(buf, buffer, sizeof(buffer), cCOLS - 2); free(buf); } -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ my_fputs(buffer, stdout); if (cmd_line) diff -Nurp tin-1.7.0/src/search.c tin-1.7.1/src/search.c --- tin-1.7.0/src/search.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/search.c Mon Sep 15 18:30:48 2003 @@ -3,7 +3,7 @@ * Module : search.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-05-15 + * Updated : 2003-09-15 * Notes : * * Copyright (c) 1991-2003 Iain Lea , Rich Skrenta @@ -490,7 +490,7 @@ search_body( { char *buf; int i; - t_bool forward_fake; + t_bool forward_fake = TRUE; if (!(buf = get_search_pattern( &forward_fake, /* we pass a dummy var since body search has no `forward' */ diff -Nurp tin-1.7.0/src/select.c tin-1.7.1/src/select.c --- tin-1.7.0/src/select.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/select.c Wed Sep 3 17:22:15 2003 @@ -403,7 +403,7 @@ selection_page( } else if (CURR_GROUP.bogus && tinrc.strip_bogus == BOGUS_SHOW) { /* Bogus groups aren't subscribed to avoid confusion */ /* Note that there is no way to remove the group from active[] */ - sprintf(buf, _(txt_remove_bogus), CURR_GROUP.name); + snprintf(buf, sizeof(buf), _(txt_remove_bogus), CURR_GROUP.name); write_newsrc(); /* save current newsrc */ delete_group(CURR_GROUP.name); /* remove bogus group */ read_newsrc(newsrc, TRUE); /* reload newsrc */ @@ -428,7 +428,7 @@ selection_page( case iKeyPost: /* post a basenote */ if (!selmenu.max) { - sprintf(buf, _(txt_post_newsgroups), tinrc.default_post_newsgroups); + snprintf(buf, sizeof(buf), _(txt_post_newsgroups), tinrc.default_post_newsgroups); if (!prompt_string_default(buf, tinrc.default_post_newsgroups, _(txt_no_newsgroups), HIST_POST_NEWSGROUPS)) break; if (group_find(tinrc.default_post_newsgroups) == NULL) { @@ -837,7 +837,7 @@ reposition_group( /* Have already trapped no_write at this point */ - sprintf(buf, _(txt_newsgroup_position), group->name, + snprintf(buf, sizeof(buf), _(txt_newsgroup_position), group->name, (tinrc.default_move_group ? tinrc.default_move_group : default_num + 1)); if (!prompt_string(buf, pos, HIST_MOVE_GROUP)) diff -Nurp tin-1.7.0/src/sigfile.c tin-1.7.1/src/sigfile.c --- tin-1.7.0/src/sigfile.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/sigfile.c Thu Aug 28 15:23:52 2003 @@ -80,6 +80,7 @@ msg_write_signature( FILE *pipe_fp; char *sigcmd; char cmd[PATH_LEN]; + fprintf(fp, "\n%s", tinrc.sigdashes ? SIGDASHES : "\n"); sigcmd = my_malloc(strlen(thisgroup->attribute->sigfile + 1) + strlen(thisgroup->name) + 4); sprintf(sigcmd, "%s \"%s\"", thisgroup->attribute->sigfile + 1, thisgroup->name); diff -Nurp tin-1.7.0/src/signal.c tin-1.7.1/src/signal.c --- tin-1.7.0/src/signal.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/signal.c Wed Aug 27 03:07:11 2003 @@ -3,7 +3,7 @@ * Module : signal.c * Author : I.Lea * Created : 1991-04-01 - * Updated : 2003-05-15 + * Updated : 2003-08-27 * Notes : signal handlers for different modes and window resizing * * Copyright (c) 1991-2003 Iain Lea @@ -400,20 +400,24 @@ signal_handler( #ifdef SIGTERM case SIGTERM: #endif /* SIGTERM */ +#if defined(SIGHUP) || defined(SIGUSR1) || defined(SIGTERM) dangerous_signal_exit = TRUE; tin_done(-sig); /* NOTREACHED */ break; +#endif /* SIGHUP || SIGUSR1 || SIGTERM */ #ifdef SIGBUS case SIGBUS: -#endif /*S IGBUS */ +#endif /* SIGBUS */ #ifdef SIGSEGV case SIGSEGV: #endif /* SIGSEGV */ +#if defined(SIGBUS) || defined(SIGSEGV) my_fprintf(stderr, _(txt_send_bugreport), tin_progname, VERSION, RELEASEDATE, RELEASENAME, OSNAME, bug_addr); my_fflush(stderr); break; +#endif /* SIGBUS || SIGSEGV */ default: break; diff -Nurp tin-1.7.0/src/strftime.c tin-1.7.1/src/strftime.c --- tin-1.7.0/src/strftime.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/strftime.c Fri Aug 29 01:23:31 2003 @@ -143,7 +143,7 @@ my_strftime( break; case 'c': /* appropriate date and time representation */ - sprintf(tbuf, "%s %s %2d %02d:%02d:%02d %d", + snprintf(tbuf, sizeof(tbuf), "%s %s %2d %02d:%02d:%02d %d", days_a[timeptr->tm_wday], months_a[timeptr->tm_mon], timeptr->tm_mday, @@ -154,11 +154,11 @@ my_strftime( break; case 'd': /* day of the month, 01 - 31 */ - sprintf(tbuf, "%02d", timeptr->tm_mday); + snprintf(tbuf, sizeof(tbuf), "%02d", timeptr->tm_mday); break; case 'H': /* hour, 24-hour clock, 00 - 23 */ - sprintf(tbuf, "%02d", timeptr->tm_hour); + snprintf(tbuf, sizeof(tbuf), "%02d", timeptr->tm_hour); break; case 'I': /* hour, 12-hour clock, 01 - 12 */ @@ -167,19 +167,19 @@ my_strftime( i = 12; else if (i > 12) i -= 12; - sprintf(tbuf, "%02d", i); + snprintf(tbuf, sizeof(tbuf), "%02d", i); break; case 'j': /* day of the year, 001 - 366 */ - sprintf(tbuf, "%03d", timeptr->tm_yday + 1); + snprintf(tbuf, sizeof(tbuf), "%03d", timeptr->tm_yday + 1); break; case 'm': /* month, 01 - 12 */ - sprintf(tbuf, "%02d", timeptr->tm_mon + 1); + snprintf(tbuf, sizeof(tbuf), "%02d", timeptr->tm_mon + 1); break; case 'M': /* minute, 00 - 59 */ - sprintf(tbuf, "%02d", timeptr->tm_min); + snprintf(tbuf, sizeof(tbuf), "%02d", timeptr->tm_min); break; case 'p': /* am or pm based on 12-hour clock */ @@ -187,15 +187,15 @@ my_strftime( break; case 'S': /* second, 00 - 61 */ - sprintf(tbuf, "%02d", timeptr->tm_sec); + snprintf(tbuf, sizeof(tbuf), "%02d", timeptr->tm_sec); break; case 'w': /* weekday, Sunday == 0, 0 - 6 */ - sprintf(tbuf, "%d", timeptr->tm_wday); + snprintf(tbuf, sizeof(tbuf), "%d", timeptr->tm_wday); break; case 'x': /* appropriate date representation */ - sprintf(tbuf, "%s %s %2d %d", + snprintf(tbuf, sizeof(tbuf), "%s %s %2d %d", days_a[timeptr->tm_wday], months_a[timeptr->tm_mon], timeptr->tm_mday, @@ -203,7 +203,7 @@ my_strftime( break; case 'X': /* appropriate time representation */ - sprintf(tbuf, "%02d:%02d:%02d", + snprintf(tbuf, sizeof(tbuf), "%02d:%02d:%02d", timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec); @@ -211,11 +211,11 @@ my_strftime( case 'y': /* year without a century, 00 - 99 */ i = timeptr->tm_year % 100; - sprintf(tbuf, "%d", i); + snprintf(tbuf, sizeof(tbuf), "%d", i); break; case 'Y': /* year with century */ - sprintf(tbuf, "%d", timeptr->tm_year + 1900); + snprintf(tbuf, sizeof(tbuf), "%d", timeptr->tm_year + 1900); break; # ifdef SYSV_EXT @@ -230,23 +230,23 @@ my_strftime( break; case 'D': /* date as %m/%d/%y */ - my_strftime(tbuf, sizeof tbuf, "%m/%d/%y", timeptr); + my_strftime(tbuf, sizeof(tbuf), "%m/%d/%y", timeptr); break; case 'e': /* day of month, blank padded */ - sprintf(tbuf, "%2d", timeptr->tm_mday); + snprintf(tbuf, sizeof(tbuf), "%2d", timeptr->tm_mday); break; case 'r': /* time as %I:%M:%S %p */ - my_strftime(tbuf, sizeof tbuf, "%I:%M:%S %p", timeptr); + my_strftime(tbuf, sizeof(tbuf), "%I:%M:%S %p", timeptr); break; case 'R': /* time as %H:%M */ - my_strftime(tbuf, sizeof tbuf, "%H:%M", timeptr); + my_strftime(tbuf, sizeof(tbuf), "%H:%M", timeptr); break; case 'T': /* time as %H:%M:%S */ - my_strftime(tbuf, sizeof tbuf, "%H:%M:%S", timeptr); + my_strftime(tbuf, sizeof(tbuf), "%H:%M:%S", timeptr); break; # endif /* SYSV_EXT */ diff -Nurp tin-1.7.0/src/string.c tin-1.7.1/src/string.c --- tin-1.7.0/src/string.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/string.c Sat Sep 13 21:18:16 2003 @@ -3,7 +3,7 @@ * Module : string.c * Author : Urs Janssen * Created : 1997-01-20 - * Updated : 2003-05-14 + * Updated : 2003-09-13 * Notes : * * Copyright (c) 1997-2003 Urs Janssen @@ -104,6 +104,43 @@ my_strdup( /* + * strtok that understands empty tokens + * ie 2 adjacent delims count as two delims around a \0 + */ +char * +tin_strtok( + char *str, + const char *delim) +{ + static char *buff; + char *oldbuff, *ptr; + + /* + * First call, setup static ptr + */ + if (str) + buff = str; + + /* + * If not at end of string find ptr to next token + * If delim found, break off token + */ + if (buff && (ptr = strpbrk(buff, delim)) != NULL) + *ptr++ = '\0'; + else + ptr = NULL; + + /* + * Advance position in string to next token + * return current token + */ + oldbuff = buff; + buff = ptr; + return oldbuff; +} + + +/* * strncpy that stops at a newline and null terminates */ void @@ -612,7 +649,7 @@ strrstr( } return NULL; } -#endif /* HAVE_STRRSTR */ +#endif /* !HAVE_STRRSTR */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) @@ -632,9 +669,7 @@ wcspart( wchar_t *ptr, *wbuf; /* make sure all characters in from are printable */ - wbuf = my_malloc(size_to * sizeof(wchar_t)); - wcsncpy(wbuf, from, size_to); - wbuf[size_to - 1] = (wchar_t) '\0'; + wbuf = my_wcsdup(from); ptr = wconvert_to_printable(wbuf); to[0] = (wint_t) '\0'; @@ -653,5 +688,123 @@ wcspart( } free(wbuf); +} +#endif /* MULTIBYTE_ABLE && !NOLOCALE */ + + +#define TRUNC_TAIL "..." +/* + * shortens 'mesg' that it occupies at most 'len' screen positions. + * If it was nessary to truncate 'mesg', " ..." is appended to the + * resulting string (still 'len' screen positions wide). + * The resulting string is stored in 'buf'. + */ +char * +trunc( + const char *message, + char *buf, + size_t buf_len, + int len) +{ +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + wchar_t *wmessage, *wbuf; + size_t mesg_len; + + mesg_len = mbstowcs(NULL, message, 0); + if (mesg_len != (size_t)(-1)) { + wmessage = my_malloc(sizeof(wchar_t) * (mesg_len + 1)); + wbuf = my_malloc(sizeof(wchar_t) * (mesg_len + 1)); + + if (mbstowcs(wmessage, message, mesg_len + 1) != (size_t)(-1)) { + wtrunc(wmessage, wbuf, mesg_len + 1, len); + if (wcstombs(buf, wbuf, buf_len) != (size_t)(-1)) { + buf[buf_len - 1] = '\0'; + + free(wbuf); + free(wmessage); + + return buf; + } + } + + free(wbuf); + free(wmessage); + } + /* something went wrong using wide-chars, default back to normal chars */ +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + + snprintf(buf, buf_len, "%-.*s%s", len - 3, message, TRUNC_TAIL); + return buf; +} + +/* + * if you use UTF-8 as local charset and want to use + * U+2026 (HORIZONTAL_ELLIPSIS) instead of "..." uncomment + * the following define + */ +/* #define USE_UTF8_HORIZONTAL_ELLIPSIS 1 */ + +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) +/* the wide-char equivalent of trunc() */ +wchar_t * +wtrunc( + const wchar_t *wmessage, + wchar_t *wbuf, + size_t wbuf_len, + int len) +{ + wchar_t *wtmp; + + /* make sure all characters are printable */ + 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 */ + wcscpy(wbuf, wtmp); + } else { + /* wtmp must be truncated */ +# 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 */ + + wcspart(wbuf, wtmp, len - 1, wbuf_len - 1, FALSE); + wcscat(wbuf, wtail); + } else +# endif /* USE_UTF8_HORIZONTAL_ELLIPSIS */ + { + wchar_t tail[4]; + size_t i; + + i = mbstowcs(tail, TRUNC_TAIL, ARRAY_SIZE(tail)); + tail[3] = (wchar_t)'\0'; + assert(i != (size_t)(-1)); + + wcspart(wbuf, wtmp, len - 3, wbuf_len - 3, FALSE); + wcscat(wbuf, tail); + } + } + free(wtmp); + + return wbuf; +} + + +/* + * duplicates a wide-char string + */ +wchar_t * +my_wcsdup( + const wchar_t *wstr) +{ + size_t len = wcslen(wstr) + 1; + void *ptr = my_malloc(sizeof(wchar_t) * len); + + memcpy(ptr, wstr, sizeof(wchar_t) * len); + return (wchar_t *) ptr; } #endif /* MULTIBYTE_ABLE && !NOLOCALE */ diff -Nurp tin-1.7.0/src/tags.c tin-1.7.1/src/tags.c --- tin-1.7.0/src/tags.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/tags.c Wed Aug 27 04:28:17 2003 @@ -478,6 +478,7 @@ parse_range( case '-': state = FINDMAX; break; + case '.': if (state == FINDMAX) { *range_end = curr; @@ -485,12 +486,14 @@ parse_range( } else *range_start = curr; break; + case '$': if (state == FINDMAX) { *range_end = max; state = DONE; } break; + default: break; } @@ -578,7 +581,7 @@ arts_selected( int i; for_each_art(i) { - if (arts[i].selected) + if (arts[i].selected) return TRUE; } diff -Nurp tin-1.7.0/src/thread.c tin-1.7.1/src/thread.c --- tin-1.7.0/src/thread.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/thread.c Wed Aug 27 04:28:33 2003 @@ -343,7 +343,7 @@ draw_line( #endif /* USE_CURSES */ if (tinrc.strip_blanks) - strip_line(s); + strip_line(s); if (!magic) { tlen = strlen(s); /* note new line length */ CleartoEOLN(); diff -Nurp tin-1.7.0/src/tincfg.tbl tin-1.7.1/src/tincfg.tbl --- tin-1.7.0/src/tincfg.tbl Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/tincfg.tbl Sat Aug 23 01:58:41 2003 @@ -2,7 +2,7 @@ ; Module : tincfg.tbl ; Author : Thomas E. Dickey ; Created : 1996-11-01 -; Updated : 2003-08-10 +; Updated : 2003-08-12 ; Notes : #defines and structs for config.c ; ; Copyright (c) 1996-2003 Thomas E. Dickey @@ -124,6 +124,7 @@ col_title txt_colors MAX_COLOR+1 col_signature txt_colors MAX_COLOR+1 #endif + url_highlight OPT_ON_OFF word_highlight OPT_ON_OFF word_h_display_marks txt_marks MAX_MARK+1 #ifdef HAVE_COLOR @@ -201,7 +202,7 @@ editor_format OPT_STRING inews_prog OPT_STRING mailer_format OPT_STRING - use_mailreader_i OPT_ON_OFF + interactive_mailer txt_interactive_mailers NUM_INTERACTIVE_MAILERS unlink_article OPT_ON_OFF posted_articles_file OPT_STRING keep_dead_articles OPT_ON_OFF diff -Nurp tin-1.7.0/src/trace.c tin-1.7.1/src/trace.c --- tin-1.7.0/src/trace.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/trace.c Mon Aug 25 14:58:17 2003 @@ -78,7 +78,7 @@ _nc_visbuf(const char *s) { return (char *) s; } -#endif /* NCURSES_VERSION */ +#endif /* !HAVE__TRACEF */ char * tin_tracechar( diff -Nurp tin-1.7.0/src/version.c tin-1.7.1/src/version.c --- tin-1.7.0/src/version.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/version.c Sat Aug 23 01:58:41 2003 @@ -3,7 +3,7 @@ * Module : version.c * Author : U. Janssen * Created : 2003-05-11 - * Updated : 2003-06-27 + * Updated : 2003-08-21 * Notes : * * Copyright (c) 2003 Urs Janssen @@ -47,7 +47,7 @@ /* * line is the entire line we should check - * skip must the the leading portion of the version line not including the + * skip must be the leading portion of the version line not including the * version number (which must be a dotted triple) * verson is the version number (dotted triple) we expect to match * @@ -69,7 +69,7 @@ check_upgrade( size_t len = strlen(skip) + strlen(fmt) + 1; /* format buffer len */ rc_majorv = rc_minorv = rc_subv = c_majorv = c_minorv = c_subv = -1; - format = my_malloc(strlen(skip) + 10); + format = my_malloc(len + 1); snprintf(format, len, "%s%s", skip, fmt); sscanf(line, format, &rc_majorv, &rc_minorv, &rc_subv); free(format); diff -Nurp tin-1.7.0/src/xface.c tin-1.7.1/src/xface.c --- tin-1.7.0/src/xface.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/xface.c Wed Aug 27 04:29:19 2003 @@ -106,7 +106,7 @@ slrnface_start( /* We'll abuse fifo filename memory here. It's long enough. */ sprintf(fifo, "%s/.slrnfaces/README", ptr); if ((fp = fopen(fifo, "w")) != NULL) { - fputs(_("This directory is used to create named pipes for communication between\n" + fputs(_("This directory is used to create named pipes for communication between\n" "slrnface and its parent process. It should normally be empty because\n" "the pipe is deleted right after it has been opened by both processes.\n\n" "File names generated by slrnface have the form \"hostname.pid\". It is\n" diff -Nurp tin-1.7.0/src/xref.c tin-1.7.1/src/xref.c --- tin-1.7.0/src/xref.c Sun Aug 10 15:01:07 2003 +++ tin-1.7.1/src/xref.c Sat Aug 23 01:58:41 2003 @@ -3,7 +3,7 @@ * Module : xref.c * Author : I. Lea & H. Brugge * Created : 1993-07-01 - * Updated : 2003-03-14 + * Updated : 2003-08-16 * Notes : * * Copyright (c) 1993-2003 Iain Lea @@ -102,40 +102,35 @@ static void read_xref_header( struct t_article *art) { - /* xref_supported means already supported in xover record */ - if (!xref_supported && read_news_via_nntp && art && !art->xref) { - FILE *fp; - char *ptr, *q; - char buf[HEADER_LEN]; - long artnum = 0L; - - snprintf(buf, sizeof(buf), "XHDR XREF %ld", art->artnum); - if ((fp = nntp_command(buf, OK_HEAD, NULL, 0)) == NULL) - return; - - while ((ptr = tin_fgets(fp, FALSE)) != NULL) { + FILE *fp; + char *ptr, *q; + char buf[HEADER_LEN]; + long artnum = 0L; + + snprintf(buf, sizeof(buf), "XHDR XREF %ld", art->artnum); + if ((fp = nntp_command(buf, OK_HEAD, NULL, 0)) == NULL) + return; + + while ((ptr = tin_fgets(fp, FALSE)) != NULL) { + while (*ptr && isspace((int) *ptr)) + ptr++; + if (*ptr == '.') + break; + /* + * read the article number + */ + artnum = atol(ptr); + if ((artnum == art->artnum) && !art->xref && !strstr(ptr, "(none)")) { + if ((q = strchr(ptr, ' ')) == NULL) /* skip article number */ + continue; + ptr = q; while (*ptr && isspace((int) *ptr)) ptr++; - if (*ptr == '.') - break; - /* - * read the article number - */ - artnum = atol(ptr); - if ((artnum == art->artnum) && !art->xref && !strstr(ptr, "(none)")) { - q = strchr(ptr, ' '); /* skip article number */ - if (q == NULL) - continue; - ptr = q; - while (*ptr && isspace((int) *ptr)) - ptr++; - q = strchr(ptr, '\n'); - if (q) - *q = '\0'; - art->xref = my_strdup(ptr); - } + q = strchr(ptr, '\n'); + if (q) + *q = '\0'; + art->xref = my_strdup(ptr); } - } return; } @@ -157,7 +152,9 @@ art_mark_xref_read( struct t_group *psGrp; #if defined(NNTP_ABLE) && defined(XHDR_XREF) - read_xref_header(art); + /* xref_supported => xref info was already read in xover record */ + if (!xref_supported && read_news_via_nntp && art && !art->xref) + read_xref_header(art); #endif /* NNTP_ABLE && XHDR_XREF */ if (art->xref == NULL)