----------------------------------------------------------------------------- MANIFEST | 130 +-- Makefile | 4 aclocal.m4 | 56 + config.guess | 25 config.sub | 12 configure | 1828 +++++++++++++++++++++++++------------------------ configure.in | 7 doc/CHANGES | 60 + doc/CREDITS | 11 doc/TODO | 25 doc/tin.1 | 456 ++++++------ doc/tin.5 | 255 +++--- include/autoconf.hin | 3 include/extern.h | 7 include/proto.h | 24 include/tin.h | 9 include/tinrc.h | 5 include/version.h | 8 intl/loadmsgcat.c | 8 po/de.gmo |binary po/de.po | 733 ++++++++++--------- po/en_GB.gmo |binary po/en_GB.po | 494 ++++++------- po/et.gmo |binary po/et.po | 734 ++++++++++--------- po/fr.gmo |binary po/fr.po | 1178 +++++++++++++++++-------------- po/messages |binary po/tin.pot | 443 ++++++----- src/active.c | 9 src/art.c | 27 src/attrib.c | 12 src/charset.c | 43 - src/color.c | 47 + src/config.c | 390 +++++----- src/cook.c | 11 src/curses.c | 24 src/feed.c | 8 src/filter.c | 487 ++++++------- src/getline.c | 32 src/group.c | 53 - src/init.c | 8 src/lang.c | 301 ++++---- src/lock.c | 5 src/mail.c | 4 src/makecfg.c | 3 src/misc.c | 43 - src/newsrc.c | 5 src/nntplib.c | 16 src/page.c | 41 - src/post.c | 148 ++- src/prompt.c | 112 ++- src/refs.c | 40 - src/rfc1524.c | 2 src/rfc2046.c | 2 src/rfc2047.c | 411 ++++++++++- src/save.c | 38 - src/screen.c | 10 src/search.c | 12 src/select.c | 138 +-- src/signal.c | 13 src/string.c | 242 +++++- src/tags.c | 20 src/tcurses.c | 44 - src/thread.c | 2 src/tincfg.tbl | 6 tin.spec | 2 67 files changed, 5175 insertions(+), 4151 deletions(-) ----------------------------------------------------------------------------- diff -Nurp tin-1.7.4/MANIFEST tin-1.7.5/MANIFEST --- tin-1.7.4/MANIFEST 2004-02-25 10:59:03.000000000 +0100 +++ tin-1.7.5/MANIFEST 2004-06-15 11:53:03.000000000 +0200 @@ -1,27 +1,27 @@ -MANIFEST for tin-1.7.4 (Wed Feb 25 10:59:03 CET 2004) +MANIFEST for tin-1.7.5 (Tue Jun 15 11:53:02 CEST 2004) ---------------------------------------------------- 12908 ./Makefile - 7380 ./MANIFEST + 7381 ./MANIFEST 1440 ./README 564 ./README.MAC 2209 ./README.VMS 1006 ./README.WIN - 137915 ./aclocal.m4 + 138874 ./aclocal.m4 882 ./conf-tin - 43357 ./config.guess - 31059 ./config.sub - 472592 ./configure - 30339 ./configure.in + 43548 ./config.guess + 31111 ./config.sub + 474446 ./configure + 30416 ./configure.in 7123 ./install.sh 777 ./mkdirs.sh 1505 ./tin.spec 18847 ./doc/ABOUT-NLS - 12389 ./doc/CHANGES + 14960 ./doc/CHANGES 226345 ./doc/CHANGES.old - 4600 ./doc/CREDITS + 4634 ./doc/CREDITS 1469 ./doc/DEBUG_REFS 29542 ./doc/INSTALL - 29938 ./doc/TODO + 30328 ./doc/TODO 699 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1700 ./doc/article.txt @@ -48,8 +48,8 @@ MANIFEST for tin-1.7.4 (Wed Feb 25 10:59 4168 ./doc/mmdf.5 2128 ./doc/newsoverview.5 6963 ./doc/plp_snprintf.3 - 117218 ./doc/tin.1 - 71250 ./doc/tin.5 + 117684 ./doc/tin.1 + 72475 ./doc/tin.5 4733 ./doc/w2r.1 2196 ./doc/wildmat.3 344 ./tools/expiretover @@ -63,81 +63,81 @@ MANIFEST for tin-1.7.4 (Wed Feb 25 10:59 2778 ./include/bool.h 2039 ./include/bugrep.h 9502 ./include/oldconfig.h - 57446 ./include/extern.h + 57686 ./include/extern.h 11429 ./include/keymap.h 15886 ./include/menukeys.h 6340 ./include/newsrc.h 6507 ./include/nntplib.h 665 ./include/plp_snprintf.h 12162 ./include/policy.h - 29681 ./include/proto.h + 30135 ./include/proto.h 5047 ./include/rfc2046.h 3373 ./include/stpwatch.h 5722 ./include/tcurses.h - 62075 ./include/tin.h - 13059 ./include/tinrc.h + 62195 ./include/tin.h + 13273 ./include/tinrc.h 5670 ./include/tnntp.h 2264 ./include/trace.h - 2531 ./include/version.h - 25935 ./src/active.c - 53864 ./src/art.c - 31065 ./src/attrib.c + 2528 ./include/version.h + 25931 ./src/active.c + 53947 ./src/art.c + 31443 ./src/attrib.c 12365 ./src/auth.c - 13846 ./src/charset.c - 7086 ./src/color.c - 89277 ./src/config.c - 29572 ./src/cook.c - 30644 ./src/curses.c + 13650 ./src/charset.c + 8220 ./src/color.c + 89776 ./src/config.c + 29738 ./src/cook.c + 30471 ./src/curses.c 9791 ./src/debug.c 3414 ./src/envarg.c - 26008 ./src/feed.c - 55175 ./src/filter.c - 18235 ./src/getline.c + 26001 ./src/feed.c + 54874 ./src/filter.c + 18336 ./src/getline.c 7254 ./src/global.c - 45228 ./src/group.c + 44936 ./src/group.c 3906 ./src/hashstr.c 8775 ./src/header.c 27937 ./src/help.c 13862 ./src/inews.c - 32564 ./src/init.c + 32717 ./src/init.c 2216 ./src/joinpath.c 38018 ./src/keymap.c - 114256 ./src/lang.c + 113530 ./src/lang.c 4486 ./src/langinfo.c 7033 ./src/list.c - 6672 ./src/lock.c - 13362 ./src/mail.c + 6662 ./src/lock.c + 13370 ./src/mail.c 25885 ./src/main.c - 10227 ./src/makecfg.c + 10197 ./src/makecfg.c 12294 ./src/memory.c 5257 ./src/mimetypes.c - 84456 ./src/misc.c - 40354 ./src/newsrc.c - 37162 ./src/nntplib.c + 83985 ./src/misc.c + 40349 ./src/newsrc.c + 37198 ./src/nntplib.c 7291 ./src/nrctbl.c - 61314 ./src/page.c + 60825 ./src/page.c 24133 ./src/parsdate.y 16966 ./src/plp_snprintf.c 12695 ./src/pgp.c - 132690 ./src/post.c - 15448 ./src/prompt.c + 133347 ./src/post.c + 16878 ./src/prompt.c 10680 ./src/read.c - 25868 ./src/refs.c + 25572 ./src/refs.c 5276 ./src/regex.c - 14488 ./src/rfc1524.c + 14482 ./src/rfc1524.c 5553 ./src/rfc2045.c - 29612 ./src/rfc2046.c - 23826 ./src/rfc2047.c - 37040 ./src/save.c - 11460 ./src/screen.c - 15404 ./src/search.c - 30742 ./src/select.c + 29624 ./src/rfc2046.c + 32745 ./src/rfc2047.c + 37058 ./src/save.c + 11351 ./src/screen.c + 15401 ./src/search.c + 30718 ./src/select.c 7590 ./src/sigfile.c - 12594 ./src/signal.c + 12655 ./src/signal.c 7215 ./src/strftime.c - 19287 ./src/string.c - 13875 ./src/tags.c - 17042 ./src/tcurses.c + 22817 ./src/string.c + 13886 ./src/tags.c + 16949 ./src/tcurses.c 3058 ./src/tmpfile.c 3376 ./src/my_tmpfile.c 40362 ./src/thread.c @@ -210,10 +210,10 @@ MANIFEST for tin-1.7.4 (Wed Feb 25 10:59 1528 ./pcre/testdata/testoutput3 14786 ./pcre/testdata/testoutput4 22706 ./pcre/testdata/testoutput5 - 19633 ./include/autoconf.hin + 19662 ./include/autoconf.hin 5800 ./pcre/pcre.mms 20816 ./src/Makefile.in - 7493 ./src/tincfg.tbl + 7634 ./src/tincfg.tbl 8747 ./src/descrip.mms 954 ./libcanlock/Build 882 ./libcanlock/CHANGES @@ -261,7 +261,7 @@ MANIFEST for tin-1.7.4 (Wed Feb 25 10:59 1932 ./intl/libgettext.h 4397 ./intl/libgnuintl.h 3380 ./intl/loadinfo.h - 14865 ./intl/loadmsgcat.c + 14972 ./intl/loadmsgcat.c 6905 ./intl/localcharset.c 2657 ./intl/locale.alias 9432 ./intl/localealias.c @@ -275,13 +275,13 @@ MANIFEST for tin-1.7.4 (Wed Feb 25 10:59 41 ./intl/VERSION 4962 ./po/Makefile.inn 828 ./po/POTFILES.in - 117864 ./po/tin.pot - 160871 ./po/de.gmo - 190850 ./po/de.po - 7027 ./po/en_GB.gmo - 120248 ./po/en_GB.po - 153223 ./po/et.gmo - 182807 ./po/et.po - 103524 ./po/fr.gmo - 162772 ./po/fr.po -5964933 total + 117310 ./po/tin.pot + 158956 ./po/de.gmo + 189462 ./po/de.po + 6547 ./po/en_GB.gmo + 119471 ./po/en_GB.po + 150987 ./po/et.gmo + 181170 ./po/et.po + 125558 ./po/fr.gmo + 172615 ./po/fr.po +6010906 total diff -Nurp tin-1.7.4/Makefile tin-1.7.5/Makefile --- tin-1.7.4/Makefile 2004-02-25 10:59:01.000000000 +0100 +++ tin-1.7.5/Makefile 2004-06-15 11:52:58.000000000 +0200 @@ -7,9 +7,9 @@ PROJECT = tin LVER = 1 PVER = 7 -SVER = 4 +SVER = 5 VER = $(LVER).$(PVER).$(SVER) -DVER = 20040225 +DVER = 20040615 EXE = tin # directory structure diff -Nurp tin-1.7.4/aclocal.m4 tin-1.7.5/aclocal.m4 --- tin-1.7.4/aclocal.m4 2004-01-20 15:20:58.000000000 +0100 +++ tin-1.7.5/aclocal.m4 2004-02-28 13:20:42.000000000 +0100 @@ -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 : 2004-01-19 +dnl Updated : 2004-02-28 dnl Notes : dnl dnl Copyright (c) 1995-2004 Thomas E. Dickey @@ -61,7 +61,7 @@ AC_DEFUN([AC_ISC_POSIX], ] ) dnl --------------------------------------------------------------------------- -dnl AM_GNU_GETTEXT version: 10 updated: 2002/11/17 17:25:28 +dnl AM_GNU_GETTEXT version: 11 updated: 2004/01/26 20:58:40 dnl -------------- dnl Usage: Just like AM_WITH_NLS, which see. AC_DEFUN([AM_GNU_GETTEXT], @@ -126,6 +126,7 @@ strdup strtoul tsearch __argz_count __ar dnl find the mkinstalldirs script in another subdir but ($top_srcdir). dnl Try to locate it. dnl changed mkinstalldirs to mkdirs.sh for Lynx /je spath 1998-Aug-21 + dnl added check for separate locations of scripts -mirabile 2004-Jan-18 MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh" @@ -133,6 +134,11 @@ strdup strtoul tsearch __argz_count __ar if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh" fi + if test -n "$GNUSYSTEM_AUX_DIR" ; then + if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then + MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs" + fi + fi AC_SUBST(MKINSTALLDIRS) dnl Enable libtool support if the surrounding package wishes it. @@ -407,7 +413,7 @@ fi AC_SUBST($1)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl AM_WITH_NLS version: 15 updated: 2002/11/09 16:19:53 +dnl AM_WITH_NLS version: 17 updated: 2004/01/23 19:52:21 dnl ----------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -563,6 +569,9 @@ return (int) gettext ("")]ifelse([$2], n fi if test "$nls_cv_use_gnu_gettext" = "yes"; then + if test ! -d $srcdir/intl ; then + AC_MSG_ERROR(no NLS library is packaged with this application) + fi dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, @@ -659,6 +668,7 @@ return (int) gettext ("")]ifelse([$2], n dnl files or have a broken "make" program, hence the plural.c rule will dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not dnl present or too old. + if test "$nls_cv_use_gnu_gettext" = "yes"; then AC_CHECK_PROGS([INTLBISON], [bison]) if test -z "$INTLBISON"; then ac_verc_fail=yes @@ -679,6 +689,7 @@ changequote([,])dnl if test $ac_verc_fail = yes; then INTLBISON=: fi + fi dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs @@ -921,7 +932,7 @@ esac $3="$withval" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 2 updated: 2004/01/19 16:20:54 +dnl CF_BUILD_CC version: 3 updated: 2004/02/17 20:55:59 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -931,17 +942,25 @@ dnl dnl $1 = default for $CPPFLAGS dnl $2 = default for $LIBS AC_DEFUN([CF_BUILD_CC],[ +AC_REQUIRE([CF_PROG_EXT]) if test "$cross_compiling" = yes ; then + # defaults that we might want to override : ${BUILD_CC:='$(CC)'} + : ${BUILD_CPP:='$(CC) -E'} : ${BUILD_CFLAGS:=''} : ${BUILD_CPPFLAGS:='ifelse([$1],,,[$1])'} : ${BUILD_LDFLAGS:=''} : ${BUILD_LIBS:='ifelse([$2],,,[$2])'} : ${BUILD_EXEEXT:='$x'} + : ${BUILD_OBJEXT:='o'} AC_ARG_WITH(build-cc, [ --with-build-cc=XXX the build C compiler ($BUILD_CC)], [BUILD_CC="$withval"], [AC_CHECK_PROGS(BUILD_CC, $CC gcc cc)]) + AC_ARG_WITH(build-cpp, + [ --with-build-cpp=XXX the build C preprocessor ($BUILD_CPP)], + [BUILD_CPP="$withval"], + [BUILD_CPP='$(CC) -E']) AC_ARG_WITH(build-cflags, [ --with-build-cflags=XXX the build C compiler-flags], [BUILD_CFLAGS="$withval"]) @@ -954,22 +973,28 @@ if test "$cross_compiling" = yes ; then AC_ARG_WITH(build-libs, [ --with-build-libs=XXX the build libraries], [BUILD_LIBS="$withval"]) + # this assumes we're on Unix. BUILD_EXEEXT= + BUILD_OBJEXT=o else : ${BUILD_CC:='$(CC)'} + : ${BUILD_CPP:='$(CPP)'} : ${BUILD_CFLAGS:='$(CFLAGS)'} : ${BUILD_CPPFLAGS:='$(CPPFLAGS)'} : ${BUILD_LDFLAGS:='$(LDFLAGS)'} : ${BUILD_LIBS:='$(LIBS)'} : ${BUILD_EXEEXT:='$x'} + : ${BUILD_OBJEXT:='o'} fi AC_SUBST(BUILD_CC) +AC_SUBST(BUILD_CPP) AC_SUBST(BUILD_CFLAGS) AC_SUBST(BUILD_CPPFLAGS) AC_SUBST(BUILD_LDFLAGS) AC_SUBST(BUILD_LIBS) AC_SUBST(BUILD_EXEEXT) +AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- dnl CF_BUNDLED_INTL version: 10 updated: 2003/09/14 18:49:13 @@ -1163,7 +1188,7 @@ AC_MSG_RESULT($cf_result) test $cf_result = yes && AC_DEFINE_UNQUOTED(DECL_$2) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CACHE version: 7 updated: 2001/12/19 00:50:10 +dnl CF_CHECK_CACHE version: 9 updated: 2004/01/30 15:59:13 dnl -------------- dnl Check if we're accidentally using a cache from a different machine. dnl Derive the system name, as a check for reusing the autoconf cache. @@ -1172,6 +1197,9 @@ dnl If we've packaged config.guess and c dnl better job than uname). Normally we'll use AC_CANONICAL_HOST, but allow dnl an extra parameter that we may override, e.g., for AC_CANONICAL_SYSTEM dnl which is useful in cross-compiles. +dnl +dnl Note: we would use $ac_config_sub, but that is one of the places where +dnl autoconf 2.5x broke compatibility with autoconf 2.13 AC_DEFUN([CF_CHECK_CACHE], [ if test -f $srcdir/config.guess ; then @@ -1306,7 +1334,7 @@ fi done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_IPV6 version: 2 updated: 2000/04/13 21:38:04 +dnl CF_CHECK_IPV6 version: 3 updated: 2004/01/22 17:38:22 dnl ------------- dnl Check for IPV6 configuration. AC_DEFUN([CF_CHECK_IPV6],[ @@ -1317,7 +1345,7 @@ CF_FUNC_GETADDRINFO if test "$cf_cv_getaddrinfo" != "yes"; then if test "$cf_cv_ipv6type" != "linux"; then - AC_MSG_ERROR( + AC_MSG_WARN( [You must get working getaddrinfo() function, or you can specify "--disable-ipv6"]) else @@ -4110,7 +4138,7 @@ AC_ARG_WITH(curses-dir, [cf_cv_curses_dir=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_DBMALLOC version: 3 updated: 2004/01/19 13:06:01 +dnl CF_WITH_DBMALLOC version: 4 updated: 2004/02/28 05:49:27 dnl ---------------- dnl Configure-option for dbmalloc. The optional parameter is used to override dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. @@ -4121,10 +4149,9 @@ AC_ARG_WITH(dbmalloc, [with_dbmalloc=$withval], [with_dbmalloc=no]) AC_MSG_RESULT($with_dbmalloc) -if test $with_dbmalloc = yes ; then +if test "$with_dbmalloc" = yes ; then AC_CHECK_HEADER(dbmalloc.h, - [AC_CHECK_LIB(dbmalloc,debug_malloc - ifelse($1,,[],[,$1]))]) + [AC_CHECK_LIB(dbmalloc,[debug_malloc]ifelse($1,,[],[,$1]))]) fi ])dnl dnl --------------------------------------------------------------------------- @@ -4148,7 +4175,7 @@ $3="$withval" AC_DEFINE_UNQUOTED($3,"[$]$3")dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_DMALLOC version: 3 updated: 2004/01/19 13:06:01 +dnl CF_WITH_DMALLOC version: 4 updated: 2004/02/28 05:49:27 dnl --------------- dnl Configure-option for dmalloc. The optional parameter is used to override dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. @@ -4159,10 +4186,9 @@ AC_ARG_WITH(dmalloc, [with_dmalloc=$withval], [with_dmalloc=no]) AC_MSG_RESULT($with_dmalloc) -if test $with_dmalloc = yes ; then +if test "$with_dmalloc" = yes ; then AC_CHECK_HEADER(dmalloc.h, - [AC_CHECK_LIB(dmalloc,dmalloc_debug - ifelse($1,,[],[,$1]))]) + [AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse($1,,[],[,$1]))]) fi ])dnl dnl --------------------------------------------------------------------------- diff -Nurp tin-1.7.4/config.guess tin-1.7.5/config.guess --- tin-1.7.4/config.guess 2004-02-18 00:47:10.000000000 +0100 +++ tin-1.7.5/config.guess 2004-06-11 17:32:50.000000000 +0200 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2004-02-16' +timestamp='2004-06-11' # 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 @@ -212,6 +212,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -227,9 +230,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; pmax:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -255,9 +255,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -295,11 +300,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha*:OpenVMS:*:*) echo alpha-hp-vms @@ -847,6 +853,9 @@ EOF ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -1087,7 +1096,7 @@ EOF M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' diff -Nurp tin-1.7.4/config.sub tin-1.7.5/config.sub --- tin-1.7.4/config.sub 2004-02-23 21:57:09.000000000 +0100 +++ tin-1.7.5/config.sub 2004-03-12 20:17:02.000000000 +0100 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2004-02-23' +timestamp='2004-03-12' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -237,7 +237,7 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -262,7 +262,7 @@ case $basic_machine in | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -308,7 +308,7 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -336,7 +336,7 @@ case $basic_machine in | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -1081,7 +1081,7 @@ case $basic_machine in sh64) basic_machine=sh64-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) diff -Nurp tin-1.7.4/configure tin-1.7.5/configure --- tin-1.7.4/configure 2004-02-25 10:59:03.000000000 +0100 +++ tin-1.7.5/configure 2004-06-15 11:53:01.000000000 +0200 @@ -186,6 +186,7 @@ cat <> confdefs.h <&6 -echo "configure:668: checking host system type" >&5 +echo "configure:669: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -760,7 +761,7 @@ case "$host_os" in # Extract the first word of "xlc", so it can be a program name with args. set dummy xlc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:764: checking for $ac_word" >&5 +echo "configure:765: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XLC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -810,7 +811,7 @@ save_CFLAGS="$CFLAGS" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:814: checking for $ac_word" >&5 +echo "configure:815: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -840,7 +841,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:844: checking for $ac_word" >&5 +echo "configure:845: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -891,7 +892,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:895: checking for $ac_word" >&5 +echo "configure:896: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -923,7 +924,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:927: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:928: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -934,12 +935,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 938 "configure" +#line 939 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -965,12 +966,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:969: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:970: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:974: checking whether we are using GNU C" >&5 +echo "configure:975: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,7 +980,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -998,7 +999,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1002: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1003: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1030,7 +1031,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1034: checking how to run the C preprocessor" >&5 +echo "configure:1035: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1045,13 +1046,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1056: \"$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 : @@ -1062,13 +1063,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1073: \"$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 : @@ -1079,13 +1080,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1090: \"$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 : @@ -1111,13 +1112,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1115: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1116: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1135,7 +1136,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1157,7 +1158,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1161: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1162: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1195,7 +1196,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1199: checking for a BSD compatible install" >&5 +echo "configure:1200: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1272,14 +1273,14 @@ EOF do rm -f y.tab.ch echo $ac_n "checking for $cf_prog""... $ac_c" 1>&6 -echo "configure:1276: checking for $cf_prog" >&5 +echo "configure:1277: checking for $cf_prog" >&5 cf_command="$cf_prog conftest.y" cf_result=no - if { (eval echo configure:1279: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then + if { (eval echo configure:1280: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then mv y.tab.c conftest.c rm -f y.tab.h if test "$cf_prog" = 'bison -y' ; then - if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then + if { (eval echo configure:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then cf_result=yes fi else @@ -1303,7 +1304,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:1307: checking for $ac_word" >&5 +echo "configure:1308: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1334,13 +1335,13 @@ done echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1338: checking if we must define _GNU_SOURCE" >&5 +echo "configure:1339: checking if we must define _GNU_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1350,7 +1351,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1360,7 +1361,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1370,7 +1371,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1392,7 +1393,7 @@ test "$cf_cv_gnu_source" = yes && CPPFLA echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1396: checking for strerror in -lcposix" >&5 +echo "configure:1397: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1400,7 +1401,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1416: \"$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 @@ -1435,7 +1436,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1439: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1440: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1491,7 +1492,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1575,12 +1576,12 @@ You have the following choices: fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1579: checking for Cygwin environment" >&5 +echo "configure:1580: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1608,19 +1609,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1612: checking for mingw32 environment" >&5 +echo "configure:1613: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1652,7 +1653,7 @@ esac echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1656: checking for executable suffix" >&5 +echo "configure:1657: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1662,7 +1663,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1683,13 +1684,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1687: checking for object suffix" >&5 +echo "configure:1688: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1724,7 +1725,7 @@ LIB_PREFIX=$LIB_PREFIX echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1728: checking whether ln -s works" >&5 +echo "configure:1729: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1746,13 +1747,17 @@ fi + if test "$cross_compiling" = yes ; then + # defaults that we might want to override : ${BUILD_CC:='$(CC)'} + : ${BUILD_CPP:='$(CC) -E'} : ${BUILD_CFLAGS:=''} : ${BUILD_CPPFLAGS:='-I$(INCDIR)'} : ${BUILD_LDFLAGS:=''} : ${BUILD_LIBS:=''} : ${BUILD_EXEEXT:='$x'} + : ${BUILD_OBJEXT:='o'} # Check whether --with-build-cc or --without-build-cc was given. if test "${with_build_cc+set}" = set; then @@ -1764,7 +1769,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:1768: checking for $ac_word" >&5 +echo "configure:1773: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1796,6 +1801,15 @@ done fi +# Check whether --with-build-cpp or --without-build-cpp was given. +if test "${with_build_cpp+set}" = set; then + withval="$with_build_cpp" + BUILD_CPP="$withval" +else + BUILD_CPP='$(CC) -E' +fi + + # Check whether --with-build-cflags or --without-build-cflags was given. if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" @@ -1823,14 +1837,18 @@ if test "${with_build_libs+set}" = set; BUILD_LIBS="$withval" fi + # this assumes we're on Unix. BUILD_EXEEXT= + BUILD_OBJEXT=o else : ${BUILD_CC:='$(CC)'} + : ${BUILD_CPP:='$(CPP)'} : ${BUILD_CFLAGS:='$(CFLAGS)'} : ${BUILD_CPPFLAGS:='$(CPPFLAGS)'} : ${BUILD_LDFLAGS:='$(LDFLAGS)'} : ${BUILD_LIBS:='$(LIBS)'} : ${BUILD_EXEEXT:='$x'} + : ${BUILD_OBJEXT:='o'} fi @@ -1841,8 +1859,10 @@ fi + + echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1846: checking build system type" >&5 +echo "configure:1866: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1868,7 +1888,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1872: checking for $ac_word" >&5 +echo "configure:1892: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1900,7 +1920,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1904: checking for $ac_word" >&5 +echo "configure:1924: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1935,7 +1955,7 @@ fi # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1939: checking for $ac_word" >&5 +echo "configure:1959: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1967,7 +1987,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1971: checking for $ac_word" >&5 +echo "configure:1991: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2002,7 +2022,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2006: checking for $ac_word" >&5 +echo "configure:2026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2034,7 +2054,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2038: checking for $ac_word" >&5 +echo "configure:2058: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2071,7 +2091,7 @@ if eval "test \"`echo '$''{'cf_cv_subst_ else echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6 -echo "configure:2075: checking for archiver options (symbol AR_OPTS)" >&5 +echo "configure:2095: checking for archiver options (symbol AR_OPTS)" >&5 test -z "$AR_OPTS" && AR_OPTS=rv echo "$ac_t""$AR_OPTS" 1>&6 @@ -2117,7 +2137,7 @@ if test "${with_ispell+set}" = set; then *) # user supplied option-value for "--with-ispell=path" echo $ac_n "checking for ispell""... $ac_c" 1>&6 -echo "configure:2121: checking for ispell" >&5 +echo "configure:2141: checking for ispell" >&5 ac_cv_path_PATH_ISPELL="$withval" cat >> confdefs.h <&6 -echo "configure:2138: checking for $ac_word" >&5 +echo "configure:2158: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_ISPELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2191,7 +2211,7 @@ if test "${with_metamail+set}" = set; th *) # user supplied option-value for "--with-metamail=path" echo $ac_n "checking for metamail""... $ac_c" 1>&6 -echo "configure:2195: checking for metamail" >&5 +echo "configure:2215: checking for metamail" >&5 ac_cv_path_PATH_METAMAIL="$withval" cat >> confdefs.h <&6 -echo "configure:2212: checking for $ac_word" >&5 +echo "configure:2232: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_METAMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2265,7 +2285,7 @@ if test "${with_sum+set}" = set; then *) # user supplied option-value for "--with-sum=path" echo $ac_n "checking for sum""... $ac_c" 1>&6 -echo "configure:2269: checking for sum" >&5 +echo "configure:2289: checking for sum" >&5 ac_cv_path_PATH_SUM="$withval" cat >> confdefs.h <&6 -echo "configure:2286: checking for $ac_word" >&5 +echo "configure:2306: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_SUM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2329,12 +2349,12 @@ fi if test $ac_cv_path_PATH_SUM then echo $ac_n "checking if $ac_cv_path_PATH_SUM takes -r""... $ac_c" 1>&6 -echo "configure:2333: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "configure:2353: checking if $ac_cv_path_PATH_SUM takes -r" >&5 if eval "test \"`echo '$''{'ac_cv_prog_sum_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:2338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } +if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:2358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then ac_cv_prog_sum_r=yes else @@ -2364,7 +2384,7 @@ fi echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:2368: checking for default editor" >&5 +echo "configure:2388: checking for default editor" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then @@ -2392,7 +2412,7 @@ if test -z "$DEFAULT_EDITOR" ; then # Extract the first word of "vi", so it can be a program name with args. set dummy vi; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2396: checking for $ac_word" >&5 +echo "configure:2416: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_EDITOR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2437,7 +2457,7 @@ EOF # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2441: checking for $ac_word" >&5 +echo "configure:2461: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2491,7 +2511,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mailx", so it can be a program name with args. set dummy mailx; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2495: checking for $ac_word" >&5 +echo "configure:2515: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2528,7 +2548,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mail", so it can be a program name with args. set dummy mail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2532: checking for $ac_word" >&5 +echo "configure:2552: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2562,7 +2582,7 @@ fi fi echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:2566: checking for default mailer" >&5 +echo "configure:2586: checking for default mailer" >&5 if test -n "$DEFAULT_MAILER" ; then case $cf_cv_system_name in #(vi @@ -2589,7 +2609,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:2593: checking for incoming-mail directory" >&5 +echo "configure:2613: checking for incoming-mail directory" >&5 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then @@ -2635,7 +2655,7 @@ echo "$ac_t""$DEFAULT_MAILBOX" 1>&6 ## PGP Support echo $ac_n "checking if you want PGP/GPG-Support""... $ac_c" 1>&6 -echo "configure:2639: checking if you want PGP/GPG-Support" >&5 +echo "configure:2659: checking if you want PGP/GPG-Support" >&5 # Check whether --enable-pgp-gpg or --disable-pgp-gpg was given. if test "${enable_pgp_gpg+set}" = set; then @@ -2667,7 +2687,7 @@ if test "${with_pgp+set}" = set; then *) # user supplied option-value for "--with-pgp=path" echo $ac_n "checking for pgp""... $ac_c" 1>&6 -echo "configure:2671: checking for pgp" >&5 +echo "configure:2691: checking for pgp" >&5 ac_cv_path_PATH_PGP="$withval" cat >> confdefs.h <&6 -echo "configure:2688: checking for $ac_word" >&5 +echo "configure:2708: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2742,7 +2762,7 @@ if test "${with_pgpk+set}" = set; then *) # user supplied option-value for "--with-pgpk=path" echo $ac_n "checking for pgpk""... $ac_c" 1>&6 -echo "configure:2746: checking for pgpk" >&5 +echo "configure:2766: checking for pgpk" >&5 ac_cv_path_PATH_PGPK="$withval" cat >> confdefs.h <&6 -echo "configure:2763: checking for $ac_word" >&5 +echo "configure:2783: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGPK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2817,7 +2837,7 @@ if test "${with_gpg+set}" = set; then *) # user supplied option-value for "--with-gpg=path" echo $ac_n "checking for gpg""... $ac_c" 1>&6 -echo "configure:2821: checking for gpg" >&5 +echo "configure:2841: checking for gpg" >&5 ac_cv_path_PATH_GPG="$withval" cat >> confdefs.h <&6 -echo "configure:2838: checking for $ac_word" >&5 +echo "configure:2858: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_GPG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2891,13 +2911,13 @@ fi echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:2895: checking for the default shell program" >&5 +echo "configure:2915: checking for the default shell program" >&5 cf_shell_progs="$cf_cv_default_shell" if test -z "$cf_shell_progs" ; then cf_shell_progs="sh ksh bash zsh pdksh jsh keysh ash dash" # TIN preferred default shell for BSD systems is csh. Others are sh. cat > conftest.$ac_ext < @@ -2910,7 +2930,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:2914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -2920,11 +2940,11 @@ fi rm -f conftest* fi -echo "(line 2924) testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "(line 2944) testing paths of shell programs: $cf_shell_progs ..." 1>&5 if test -s /etc/shells && test `egrep -c -v '^(#| | |$)' /etc/shells` -gt 0; then -echo "(line 2928) testing /etc/shells ..." 1>&5 +echo "(line 2948) testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -2959,14 +2979,14 @@ echo "(line 2928) testing /etc/shells .. echo "$ac_t""$DEFAULT_SHELL" 1>&6 else -echo "(line 2963) testing $PATH ..." 1>&5 +echo "(line 2983) testing $PATH ..." 1>&5 for ac_prog in $cf_shell_progs do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2970: checking for $ac_word" >&5 +echo "configure:2990: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3019,7 +3039,7 @@ EOF ### check for this early, since it'll override several options echo $ac_n "checking if NNTP-support will be used""... $ac_c" 1>&6 -echo "configure:3023: checking if NNTP-support will be used" >&5 +echo "configure:3043: checking if NNTP-support will be used" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then @@ -3041,7 +3061,7 @@ echo "$ac_t""$enableval" 1>&6 USE_SPOOLDIR=yes if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking whether to be NNTP_ONLY""... $ac_c" 1>&6 -echo "configure:3045: checking whether to be NNTP_ONLY" >&5 +echo "configure:3065: checking whether to be NNTP_ONLY" >&5 # Check whether --enable-nntp-only or --disable-nntp-only was given. if test "${enable_nntp_only+set}" = set; then @@ -3073,7 +3093,7 @@ fi ### use option --enable-debug to compile-in test/development code echo $ac_n "checking if you want to compile-in debug support""... $ac_c" 1>&6 -echo "configure:3077: checking if you want to compile-in debug support" >&5 +echo "configure:3097: checking if you want to compile-in debug support" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -3100,7 +3120,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --disable-echo to suppress full display compiling commands echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:3104: checking if you want to see long compiling messages" >&5 +echo "configure:3124: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -3145,7 +3165,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --enable-prototypes to turn on optional prototypes echo $ac_n "checking if you want to compile with fallback prototypes""... $ac_c" 1>&6 -echo "configure:3149: checking if you want to compile with fallback prototypes" >&5 +echo "configure:3169: checking if you want to compile with fallback prototypes" >&5 # Check whether --enable-prototypes or --disable-prototypes was given. if test "${enable_prototypes+set}" = set; then @@ -3169,7 +3189,7 @@ EXTRA_CFLAGS="" if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:3173: checking if you want to turn on gcc warnings" >&5 +echo "configure:3193: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -3195,7 +3215,7 @@ then GCC_VERSION=none if test "$GCC" = yes ; then echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:3199: checking version of $CC" >&5 +echo "configure:3219: checking version of $CC" >&5 GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown echo "$ac_t""$GCC_VERSION" 1>&6 @@ -3206,11 +3226,11 @@ fi if test "$GCC" = yes then cat > conftest.$ac_ext <&6 -echo "configure:3214: checking for $CC warning options" >&5 +echo "configure:3234: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -3229,7 +3249,7 @@ echo "configure:3214: checking for $CC w Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:3233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -3259,7 +3279,7 @@ fi if test "$USE_SPOOLDIR" = "yes"; then ## options for directories echo $ac_n "checking for news-library path""... $ac_c" 1>&6 -echo "configure:3263: checking for news-library path" >&5 +echo "configure:3283: checking for news-library path" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then @@ -3297,7 +3317,7 @@ eval NEWSLIBDIR="$withval" echo "$ac_t""$NEWSLIBDIR" 1>&6 echo $ac_n "checking for news spool-directory path""... $ac_c" 1>&6 -echo "configure:3301: checking for news spool-directory path" >&5 +echo "configure:3321: checking for news spool-directory path" >&5 # Check whether --with-spooldir or --without-spooldir was given. if test "${with_spooldir+set}" = set; then @@ -3335,7 +3355,7 @@ eval SPOOLDIR="$withval" echo "$ac_t""$SPOOLDIR" 1>&6 echo $ac_n "checking for news overview-directory path""... $ac_c" 1>&6 -echo "configure:3339: checking for news overview-directory path" >&5 +echo "configure:3359: checking for news overview-directory path" >&5 # Check whether --with-nov-dir or --without-nov-dir was given. if test "${with_nov_dir+set}" = set; then @@ -3373,7 +3393,7 @@ eval NOVROOTDIR="$withval" echo "$ac_t""$NOVROOTDIR" 1>&6 echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:3377: checking for overview filename" >&5 +echo "configure:3397: checking for overview filename" >&5 # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then @@ -3409,7 +3429,7 @@ fi ## TODO: kick the --with-inews-dir= stuff, the check below should be enough ## (requires some code rework in tin) echo $ac_n "checking for directory containing \"inews\"""... $ac_c" 1>&6 -echo "configure:3413: checking for directory containing \"inews\"" >&5 +echo "configure:3433: checking for directory containing \"inews\"" >&5 # Check whether --with-inews-dir or --without-inews-dir was given. if test "${with_inews_dir+set}" = set; then @@ -3450,7 +3470,7 @@ echo "$ac_t""$INEWSDIR" 1>&6 # Extract the first word of "inews", so it can be a program name with args. set dummy inews; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3454: checking for $ac_word" >&5 +echo "configure:3474: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INEWS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3507,7 +3527,7 @@ fi if test "$USE_SPOOLDIR" = "yes"; then ## options for libraries echo $ac_n "checking for optional INN-NNTP library""... $ac_c" 1>&6 -echo "configure:3511: checking for optional INN-NNTP library" >&5 +echo "configure:3531: checking for optional INN-NNTP library" >&5 # Check whether --with-inn-nntplib or --without-inn-nntplib was given. if test "${with_inn_nntplib+set}" = set; then @@ -3539,7 +3559,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. echo $ac_n "checking if you want socks library""... $ac_c" 1>&6 -echo "configure:3543: checking if you want socks library" >&5 +echo "configure:3563: checking if you want socks library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3559,7 +3579,7 @@ fi echo "$ac_t""$cf_cv_use_libsocks" 1>&6 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6 -echo "configure:3563: checking if you want socks5 library" >&5 +echo "configure:3583: checking if you want socks5 library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3635,7 +3655,7 @@ cat >> confdefs.h <<\EOF EOF cat > conftest.$ac_ext < @@ -3644,7 +3664,7 @@ int main() { accept((char *)0) ; return 0; } EOF -if { (eval echo configure:3648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -3658,7 +3678,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:3662: checking for network libraries" >&5 +echo "configure:3682: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3669,12 +3689,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3673: checking for $ac_func" >&5 +echo "configure:3693: 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:3721: \"$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 @@ -3720,7 +3740,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:3724: checking for gethostname in -lnsl" >&5 +echo "configure:3744: 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 @@ -3728,7 +3748,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3763: \"$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 @@ -3772,7 +3792,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:3776: checking for gethostname in -lsocket" >&5 +echo "configure:3796: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3780,7 +3800,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3815: \"$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 @@ -3836,7 +3856,7 @@ done # I don't know the entrypoints - 97/7/22 TD # AC_HAVE_LIBRARY(inet,cf_cv_netlibs="-linet $cf_cv_netlibs") echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:3840: checking for main in -linet" >&5 +echo "configure:3860: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3844,14 +3864,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3875: \"$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 @@ -3876,12 +3896,12 @@ if test "$ac_cv_func_lsocket" != no ; th for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3880: checking for $ac_func" >&5 +echo "configure:3900: 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:3928: \"$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 @@ -3927,7 +3947,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3931: checking for socket in -lsocket" >&5 +echo "configure:3951: 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 @@ -3935,7 +3955,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3970: \"$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 @@ -3979,7 +3999,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:3983: checking for socket in -lbsd" >&5 +echo "configure:4003: checking for socket in -lbsd" >&5 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3987,7 +4007,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4022: \"$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 @@ -4043,12 +4063,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4047: checking for $ac_func" >&5 +echo "configure:4067: 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:4095: \"$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 @@ -4094,7 +4114,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4098: checking for gethostbyname in -lnsl" >&5 +echo "configure:4118: 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 @@ -4102,7 +4122,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4137: \"$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 @@ -4154,12 +4174,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4158: checking for $ac_func" >&5 +echo "configure:4178: 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:4206: \"$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 @@ -4205,7 +4225,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:4209: checking for strcasecmp in -lresolv" >&5 +echo "configure:4229: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4213,7 +4233,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4248: \"$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 @@ -4296,10 +4316,10 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:4300: checking if the socks library uses socks4 prefix" >&5 +echo "configure:4320: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext < @@ -4308,7 +4328,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -4320,14 +4340,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:4331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_use_socks4=no else @@ -4392,9 +4412,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:4396: checking if socks5p.h is available" >&5 +echo "configure:4416: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -4430,17 +4450,17 @@ for ac_hdr in unistd.h fcntl.h sys/file. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4434: checking for $ac_hdr" >&5 +echo "configure:4454: 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:4444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4464: \"$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* @@ -4467,12 +4487,12 @@ fi done echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:4471: checking for fcntl" >&5 +echo "configure:4491: checking for fcntl" >&5 if eval "test \"`echo '$''{'ac_cv_func_fcntl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fcntl=yes" else @@ -4515,12 +4535,12 @@ else fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:4519: checking for lockf" >&5 +echo "configure:4539: checking for lockf" >&5 if eval "test \"`echo '$''{'ac_cv_func_lockf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_lockf=yes" else @@ -4563,12 +4583,12 @@ else fi echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:4567: checking for flock" >&5 +echo "configure:4587: 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:4615: \"$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 @@ -4612,7 +4632,7 @@ fi echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:4616: checking for file-locking functions" >&5 +echo "configure:4636: checking for file-locking functions" >&5 if eval "test \"`echo '$''{'cf_cv_lockfile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4624,7 +4644,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se case $cf_lock in #(vi fcntl) #(vi cat > conftest.$ac_ext < @@ -4652,7 +4672,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4664,7 +4684,7 @@ rm -f conftest* ;; lockf) #(vi cat > conftest.$ac_ext < @@ -4684,7 +4704,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4696,7 +4716,7 @@ rm -f conftest* ;; flock) cat > conftest.$ac_ext < @@ -4719,7 +4739,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4740,7 +4760,7 @@ echo "$ac_t""$cf_cv_lockfile" 1>&6 echo $ac_n "checking which locking method should be used""... $ac_c" 1>&6 -echo "configure:4744: checking which locking method should be used" >&5 +echo "configure:4764: checking which locking method should be used" >&5 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -4809,7 +4829,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:4813: checking for screen type" >&5 +echo "configure:4833: checking for screen type" >&5 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -4825,7 +4845,7 @@ use_curses=no use_ncurses=no echo $ac_n "checking if you specified curses install-directory""... $ac_c" 1>&6 -echo "configure:4829: checking if you specified curses install-directory" >&5 +echo "configure:4849: checking if you specified curses install-directory" >&5 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -4882,7 +4902,7 @@ pdcurses) #(vi ;; none) echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:4886: checking if you want to use ncurses library" >&5 +echo "configure:4906: checking if you want to use ncurses library" >&5 # Check whether --with-ncurses or --without-ncurses was given. if test "${with_ncurses+set}" = set; then @@ -4895,7 +4915,7 @@ fi echo "$ac_t""$use_ncurses" 1>&6 echo $ac_n "checking if you want curses rather than termcap interface""... $ac_c" 1>&6 -echo "configure:4899: checking if you want curses rather than termcap interface" >&5 +echo "configure:4919: checking if you want curses rather than termcap interface" >&5 # Check whether --enable-curses or --disable-curses was given. if test "${enable_curses+set}" = set; then @@ -4932,7 +4952,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:4936: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:4956: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4943,7 +4963,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -4987,7 +5007,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:4991: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:5011: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5082,14 +5102,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5116,7 +5136,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -5184,14 +5204,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5246,7 +5266,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:5250: checking for ncurses version" >&5 +echo "configure:5270: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5272,7 +5292,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:5276: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:5296: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -5281,7 +5301,7 @@ EOF else cat > conftest.$ac_ext < @@ -5305,7 +5325,7 @@ int main() exit(0); } EOF -if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5336,7 +5356,7 @@ cf_nculib_root=ncurses cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:5340: checking for Gpm_Open in -lgpm" >&5 +echo "configure:5360: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5344,7 +5364,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5379: \"$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 @@ -5371,7 +5391,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:5375: checking for initscr in -lgpm" >&5 +echo "configure:5395: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5379,7 +5399,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5414: \"$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 @@ -5421,7 +5441,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:5425: checking for tgoto in -lmytinfo" >&5 +echo "configure:5445: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5429,7 +5449,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5464: \"$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 @@ -5473,12 +5493,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:5477: checking for initscr" >&5 +echo "configure:5497: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -5521,17 +5541,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:5525: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:5545: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:5535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -5600,17 +5620,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:5604: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:5624: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:5614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -5641,7 +5661,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:5645: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:5665: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -5650,14 +5670,14 @@ echo "configure:5645: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -5684,9 +5704,9 @@ EOF for cf_hdr in stdlib.h wchar.h wctype.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:5688: checking for $cf_hdr" >&5 +echo "configure:5708: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -5694,7 +5714,7 @@ echo "configure:5688: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5718: \"$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* @@ -5721,12 +5741,12 @@ done echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:5725: checking for wide char and multibyte support" >&5 +echo "configure:5745: 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 @@ -5762,7 +5782,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:5766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -5772,7 +5792,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -5798,7 +5818,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=libutf8 else @@ -5839,7 +5859,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:5843: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:5863: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5850,7 +5870,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -5902,7 +5922,7 @@ if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:5906: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:5926: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5997,14 +6017,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6031,7 +6051,7 @@ done do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -6107,14 +6127,14 @@ do cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6169,7 +6189,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6173: checking for ncurses version" >&5 +echo "configure:6193: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6195,7 +6215,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6199: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6219: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -6204,7 +6224,7 @@ EOF else cat > conftest.$ac_ext < @@ -6228,7 +6248,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6259,7 +6279,7 @@ cf_nculib_root=ncursesw cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:6263: checking for Gpm_Open in -lgpm" >&5 +echo "configure:6283: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6267,7 +6287,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6302: \"$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 @@ -6294,7 +6314,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:6298: checking for initscr in -lgpm" >&5 +echo "configure:6318: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6302,7 +6322,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6337: \"$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 @@ -6344,7 +6364,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6348: checking for tgoto in -lmytinfo" >&5 +echo "configure:6368: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6352,7 +6372,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6387: \"$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 @@ -6396,12 +6416,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:6400: checking for initscr" >&5 +echo "configure:6420: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -6444,17 +6464,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:6448: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:6468: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -6523,17 +6543,17 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:6527: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:6547: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:6537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -6564,7 +6584,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:6568: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:6588: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -6573,14 +6593,14 @@ echo "configure:6568: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:6584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -6603,7 +6623,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6607: checking for ncurses version" >&5 +echo "configure:6627: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6629,7 +6649,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6633: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6653: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -6638,7 +6658,7 @@ EOF else cat > conftest.$ac_ext < @@ -6662,7 +6682,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6685,13 +6705,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:6689: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:6709: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6703,7 +6723,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:6707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -6711,7 +6731,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -6747,7 +6767,7 @@ test $cf_cv_need_xopen_extension = yes & echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:6751: checking for extra include directories" >&5 +echo "configure:6771: checking for extra include directories" >&5 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6771,7 +6791,7 @@ echo "$ac_t""$cf_cv_curses_incdir" 1>&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:6775: checking if we have identified curses headers" >&5 +echo "configure:6795: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6784,14 +6804,14 @@ for cf_header in \ ncurses/ncurses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -6814,17 +6834,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6818: checking for $ac_hdr" >&5 +echo "configure:6838: 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:6828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6848: \"$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* @@ -6855,16 +6875,16 @@ done echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:6859: checking if we have identified curses libraries" >&5 +echo "configure:6879: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:6868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -6880,7 +6900,7 @@ if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:6884: checking for tgoto in -lmytinfo" >&5 +echo "configure:6904: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6888,7 +6908,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6923: \"$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 @@ -6922,7 +6942,7 @@ fi ;; hpux10.*|hpux11.*) #(vi echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:6926: checking for initscr in -lcur_colr" >&5 +echo "configure:6946: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6930,7 +6950,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6965: \"$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 @@ -6964,7 +6984,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:6968: checking for initscr in -lHcurses" >&5 +echo "configure:6988: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6972,7 +6992,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7007: \"$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 @@ -7036,12 +7056,12 @@ if test ".$ac_cv_func_initscr" != .yes ; # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:7040: checking for tgoto" >&5 +echo "configure:7060: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -7085,7 +7105,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:7089: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:7109: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7093,7 +7113,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7128: \"$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 @@ -7134,7 +7154,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:7138: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:7158: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7142,7 +7162,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7177: \"$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 @@ -7179,16 +7199,16 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:7183: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:7203: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7204,16 +7224,16 @@ rm -f conftest* : elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:7208: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:7228: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:7217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -7223,14 +7243,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -7251,7 +7271,7 @@ fi echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7255: checking for ncurses version" >&5 +echo "configure:7275: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7277,7 +7297,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7281: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7301: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7286,7 +7306,7 @@ EOF else cat > conftest.$ac_ext < @@ -7310,7 +7330,7 @@ int main() exit(0); } EOF -if { (eval echo configure:7314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7333,13 +7353,13 @@ EOF echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:7337: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:7357: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7351,7 +7371,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:7355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=no else @@ -7359,7 +7379,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_xopen_extension=yes else @@ -7395,7 +7415,7 @@ fi ## substitute externally-installed PCRE library for our bundled version echo $ac_n "checking if you want to use installed version of pcre""... $ac_c" 1>&6 -echo "configure:7399: checking if you want to use installed version of pcre" >&5 +echo "configure:7419: checking if you want to use installed version of pcre" >&5 # Check whether --with-pcre or --without-pcre was given. if test "${with_pcre+set}" = set; then @@ -7468,7 +7488,7 @@ fi debug_malloc=none echo $ac_n "checking if you want to link with dbmalloc for testing""... $ac_c" 1>&6 -echo "configure:7472: checking if you want to link with dbmalloc for testing" >&5 +echo "configure:7492: checking if you want to link with dbmalloc for testing" >&5 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then @@ -7479,20 +7499,20 @@ else fi echo "$ac_t""$with_dbmalloc" 1>&6 -if test $with_dbmalloc = yes ; then +if test "$with_dbmalloc" = yes ; then ac_safe=`echo "dbmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dbmalloc.h""... $ac_c" 1>&6 -echo "configure:7486: checking for dbmalloc.h" >&5 +echo "configure:7506: checking for dbmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7516: \"$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* @@ -7508,34 +7528,27 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for debug_malloc - in -ldbmalloc""... $ac_c" 1>&6 -echo "configure:7514: checking for debug_malloc - in -ldbmalloc" >&5 - , not - s -ac_lib_var=`echo dbmalloc'_'debug_malloc - | sed 'y%./+-%__p_%'` + echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6 +echo "configure:7533: checking for debug_malloc in -ldbmalloc" >&5 +ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldbmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7552: \"$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 @@ -7563,7 +7576,7 @@ fi echo $ac_n "checking if you want to link with dmalloc for testing""... $ac_c" 1>&6 -echo "configure:7567: checking if you want to link with dmalloc for testing" >&5 +echo "configure:7580: checking if you want to link with dmalloc for testing" >&5 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -7574,20 +7587,20 @@ else fi echo "$ac_t""$with_dmalloc" 1>&6 -if test $with_dmalloc = yes ; then +if test "$with_dmalloc" = yes ; then ac_safe=`echo "dmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dmalloc.h""... $ac_c" 1>&6 -echo "configure:7581: checking for dmalloc.h" >&5 +echo "configure:7594: checking for dmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7604: \"$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* @@ -7603,34 +7616,27 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for dmalloc_debug - in -ldmalloc""... $ac_c" 1>&6 -echo "configure:7609: checking for dmalloc_debug - in -ldmalloc" >&5 - , not - s -ac_lib_var=`echo dmalloc'_'dmalloc_debug - | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6 +echo "configure:7621: checking for dmalloc_debug in -ldmalloc" >&5 +ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7640: \"$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 @@ -7658,7 +7664,7 @@ fi echo $ac_n "checking if you want debugging-trace""... $ac_c" 1>&6 -echo "configure:7662: checking if you want debugging-trace" >&5 +echo "configure:7668: checking if you want debugging-trace" >&5 # Check whether --with-trace or --without-trace was given. if test "${with_trace+set}" = set; then @@ -7676,12 +7682,12 @@ EOF EXTRAOBJS="$EXTRAOBJS trace.o" echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:7680: checking for _tracef" >&5 +echo "configure:7686: checking for _tracef" >&5 if eval "test \"`echo '$''{'ac_cv_func__tracef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__tracef=yes" else @@ -7726,7 +7732,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _tracef in -l${cf_with_screen}_g""... $ac_c" 1>&6 -echo "configure:7730: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo "configure:7736: checking for _tracef in -l${cf_with_screen}_g" >&5 ac_lib_var=`echo ${cf_with_screen}_g'_'_tracef | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7734,7 +7740,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${cf_with_screen}_g $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7755: \"$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 @@ -7777,7 +7783,7 @@ fi ## options for miscellaneous definitions echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:7781: checking for domain-name" >&5 +echo "configure:7787: checking for domain-name" >&5 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then @@ -7806,7 +7812,7 @@ echo "$ac_t""$DOMAIN_NAME" 1>&6 if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking for NNTP default-server""... $ac_c" 1>&6 -echo "configure:7810: checking for NNTP default-server" >&5 +echo "configure:7816: checking for NNTP default-server" >&5 # Check whether --with-nntp-default-server or --without-nntp-default-server was given. if test "${with_nntp_default_server+set}" = set; then @@ -7872,7 +7878,7 @@ EOF ## optional features echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6 -echo "configure:7876: checking whether to use MH style mail handling for mailgroups" >&5 +echo "configure:7882: checking whether to use MH style mail handling for mailgroups" >&5 # Check whether --enable-mh-mail-handling or --disable-mh-mail-handling was given. if test "${enable_mh_mail_handling+set}" = set; then @@ -7891,7 +7897,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:7895: checking whether to enable 8-bit keycodes" >&5 +echo "configure:7901: checking whether to enable 8-bit keycodes" >&5 # Check whether --enable-8bit-keys or --disable-8bit-keys was given. if test "${enable_8bit_keys+set}" = set; then @@ -7917,7 +7923,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:7921: checking whether to enable ANSI-color" >&5 +echo "configure:7927: checking whether to enable ANSI-color" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then @@ -7934,7 +7940,7 @@ use_color=$enableval echo "$ac_t""$use_color" 1>&6 echo $ac_n "checking whether to enable posting-etiquette""... $ac_c" 1>&6 -echo "configure:7938: checking whether to enable posting-etiquette" >&5 +echo "configure:7944: checking whether to enable posting-etiquette" >&5 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then @@ -7953,7 +7959,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to strictly observe RFC2047 and break long lines""... $ac_c" 1>&6 -echo "configure:7957: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "configure:7963: checking whether to strictly observe RFC2047 and break long lines" >&5 # Check whether --enable-break-long-lines or --disable-break-long-lines was given. if test "${enable_break_long_lines+set}" = set; then @@ -7972,7 +7978,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to force MM_CHARSET obeyance when decoding mime""... $ac_c" 1>&6 -echo "configure:7976: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "configure:7982: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 # Check whether --enable-mime-strict-charset or --disable-mime-strict-charset was given. if test "${enable_mime_strict_charset+set}" = set; then @@ -7998,7 +8004,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:8002: checking for MIME character-set" >&5 +echo "configure:8008: checking for MIME character-set" >&5 # Check whether --with-mime-default-charset or --without-mime-default-charset was given. if test "${with_mime_default_charset+set}" = set; then @@ -8020,7 +8026,7 @@ EOF echo "$ac_t""$MM_CHARSET" 1>&6 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:8024: checking for default ISO/ASCII table" >&5 +echo "configure:8030: checking for default ISO/ASCII table" >&5 # Check whether --with-iso-to-ascii or --without-iso-to-ascii was given. if test "${with_iso_to_ascii+set}" = set; then @@ -8042,7 +8048,7 @@ EOF echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:8046: checking whether to enable locale support" >&5 +echo "configure:8052: checking whether to enable locale support" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then @@ -8061,7 +8067,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:8065: checking whether to enable posting" >&5 +echo "configure:8071: checking whether to enable posting" >&5 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then @@ -8080,7 +8086,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:8084: checking whether to enable shell escape" >&5 +echo "configure:8090: checking whether to enable shell escape" >&5 # Check whether --enable-shell-escape or --disable-shell-escape was given. if test "${enable_shell_escape+set}" = set; then @@ -8099,7 +8105,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:8103: checking whether to have fascist newsadmin" >&5 +echo "configure:8109: checking whether to have fascist newsadmin" >&5 # Check whether --enable-fascist-newsadmin or --disable-fascist-newsadmin was given. if test "${enable_fascist_newsadmin+set}" = set; then @@ -8118,7 +8124,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable inverse video and highlighting""... $ac_c" 1>&6 -echo "configure:8122: checking whether to enable inverse video and highlighting" >&5 +echo "configure:8128: checking whether to enable inverse video and highlighting" >&5 # Check whether --enable-inverse-video or --disable-inverse-video was given. if test "${enable_inverse_video+set}" = set; then @@ -8137,7 +8143,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:8141: checking whether to enable piping support" >&5 +echo "configure:8147: checking whether to enable piping support" >&5 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then @@ -8156,7 +8162,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:8160: checking whether to enable printer support" >&5 +echo "configure:8166: checking whether to enable printer support" >&5 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then @@ -8175,7 +8181,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to unique tmp-files by appending .pid""... $ac_c" 1>&6 -echo "configure:8179: checking whether to unique tmp-files by appending .pid" >&5 +echo "configure:8185: checking whether to unique tmp-files by appending .pid" >&5 # Check whether --enable-append-pid or --disable-append-pid was given. if test "${enable_append_pid+set}" = set; then @@ -8201,7 +8207,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to fallback to XHDR XREF if XOVER isn't supported""... $ac_c" 1>&6 -echo "configure:8205: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "configure:8211: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 # Check whether --enable-xhdr-xref or --disable-xhdr-xref was given. if test "${enable_xhdr_xref+set}" = set; then @@ -8228,7 +8234,7 @@ echo "$ac_t""$enableval" 1>&6 ### bypass a bug in old versions of leafnode & NNTPcache echo $ac_n "checking whether to send a GROUP command before a LISTGROUP""... $ac_c" 1>&6 -echo "configure:8232: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "configure:8238: checking whether to send a GROUP command before a LISTGROUP" >&5 # Check whether --enable-broken-listgroup-fix or --disable-broken-listgroup-fix was given. if test "${enable_broken_listgroup_fix+set}" = set; then @@ -8248,7 +8254,7 @@ echo "$ac_t""$enableval" 1>&6 ### checks for the location of the system-wide default setting file echo $ac_n "checking for directory containing tin.defaults file""... $ac_c" 1>&6 -echo "configure:8252: checking for directory containing tin.defaults file" >&5 +echo "configure:8258: checking for directory containing tin.defaults file" >&5 # Check whether --with-defaults-dir or --without-defaults-dir was given. if test "${with_defaults_dir+set}" = set; then @@ -8291,7 +8297,7 @@ EOF ### check for ipv6 support echo $ac_n "checking whether to enable IPv6""... $ac_c" 1>&6 -echo "configure:8295: checking whether to enable IPv6" >&5 +echo "configure:8301: checking whether to enable IPv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -8312,7 +8318,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:8316: checking ipv6 stack type" >&5 +echo "configure:8322: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8332,7 +8338,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext < @@ -8350,7 +8356,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext < @@ -8368,7 +8374,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext < @@ -8395,7 +8401,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext < @@ -8413,7 +8419,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext < @@ -8431,7 +8437,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext < @@ -8464,7 +8470,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:8468: checking for IPv6 library if required" >&5 +echo "configure:8474: checking for IPv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -8498,7 +8504,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext < @@ -8509,7 +8515,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -8606,12 +8612,12 @@ rm -f conftest* eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:8610: checking for getaddrinfo" >&5 +echo "configure:8616: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -8654,10 +8660,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:8658: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:8664: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext < @@ -8668,7 +8674,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -8737,10 +8743,10 @@ test -d /usr && { for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8741: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:8747: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext < @@ -8751,7 +8757,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:8755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -8784,7 +8790,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:8788: checking working getaddrinfo" >&5 +echo "configure:8794: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8793,7 +8799,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext < @@ -8872,7 +8878,7 @@ int main() } EOF -if { (eval echo configure:8876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_getaddrinfo=yes else @@ -8902,8 +8908,8 @@ fi if test "$cf_cv_getaddrinfo" != "yes"; then if test "$cf_cv_ipv6type" != "linux"; then - { echo "configure: error: You must get working getaddrinfo() function, -or you can specify "--disable-ipv6"" 1>&2; exit 1; } + echo "configure: warning: You must get working getaddrinfo() function, +or you can specify "--disable-ipv6"" 1>&2 else echo "configure: warning: The getaddrinfo() implementation on your system seems be buggy. You should upgrade your system library to the newest version @@ -8916,12 +8922,12 @@ fi for ac_func in getaddrinfo getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8920: checking for $ac_func" >&5 +echo "configure:8926: 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:8954: \"$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 @@ -8973,7 +8979,7 @@ done ### checks for operator characteristics (should be the last option) echo $ac_n "checking whether to make a coffee while compiling""... $ac_c" 1>&6 -echo "configure:8977: checking whether to make a coffee while compiling" >&5 +echo "configure:8983: checking whether to make a coffee while compiling" >&5 # Check whether --with-coffee or --without-coffee was given. if test "${with_coffee+set}" = set; then @@ -8998,7 +9004,7 @@ fi ### checks for compiler characteristics echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:9002: checking for makeflags variable" >&5 +echo "configure:9008: checking for makeflags variable" >&5 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9043,12 +9049,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:9047: checking for working const" >&5 +echo "configure:9053: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9118,21 +9124,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9122: checking for inline" >&5 +echo "configure:9128: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9159,13 +9165,13 @@ esac echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6 -echo "configure:9163: checking for ansi token expansion/substitution" >&5 +echo "configure:9169: checking for ansi token expansion/substitution" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_expands'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_expands=yes else @@ -9194,13 +9200,13 @@ EOF echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:9198: checking for ansi token concatenation" >&5 +echo "configure:9204: checking for ansi token concatenation" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_concats'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_concats=yes else @@ -9229,20 +9235,20 @@ EOF echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:9233: checking if nested parameters work" >&5 +echo "configure:9239: checking if nested parameters work" >&5 if eval "test \"`echo '$''{'cf_cv_nested_params'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_nested_params=yes else @@ -9268,19 +9274,19 @@ bison*) # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:9272: checking for working alloca.h" >&5 +echo "configure:9278: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:9284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -9301,12 +9307,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:9305: checking for alloca" >&5 +echo "configure:9311: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -9366,12 +9372,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:9370: checking whether alloca needs Cray hooks" >&5 +echo "configure:9376: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9400: checking for $ac_func" >&5 +echo "configure:9406: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9451,7 +9457,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:9455: checking stack direction for C alloca" >&5 +echo "configure:9461: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9459,7 +9465,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -9508,12 +9514,12 @@ esac ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:9512: checking for ANSI C header files" >&5 +echo "configure:9518: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9521,7 +9527,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9531: \"$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* @@ -9538,7 +9544,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -9556,7 +9562,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -9577,7 +9583,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -9588,7 +9594,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9616,12 +9622,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:9620: checking for $ac_hdr that defines DIR" >&5 +echo "configure:9626: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -9629,7 +9635,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:9633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -9654,7 +9660,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:9658: checking for opendir in -ldir" >&5 +echo "configure:9664: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9662,7 +9668,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9683: \"$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 @@ -9695,7 +9701,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:9699: checking for opendir in -lx" >&5 +echo "configure:9705: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9703,7 +9709,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9724: \"$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 @@ -9737,12 +9743,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:9741: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:9747: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9751,7 +9757,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:9755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -9772,12 +9778,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:9776: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:9782: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9793,7 +9799,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:9797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -9872,9 +9878,9 @@ for cf_hdr in \ do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:9876: checking for $cf_hdr" >&5 +echo "configure:9882: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -9882,7 +9888,7 @@ echo "configure:9876: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9892: \"$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* @@ -9918,17 +9924,17 @@ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9922: checking for $ac_hdr" >&5 +echo "configure:9928: 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:9932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9938: \"$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* @@ -9959,17 +9965,17 @@ if test "$ISC" = yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9963: checking for $ac_hdr" >&5 +echo "configure:9969: 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:9973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9979: \"$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* @@ -10004,16 +10010,16 @@ if test "$ac_cv_header_termios_h" = yes esac if test "$termios_bad" = maybe ; then echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:10008: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:10014: checking whether termios.h needs _POSIX_SOURCE" >&5 cat > conftest.$ac_ext < int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:10017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -10022,7 +10028,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -10054,7 +10060,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:10058: checking declaration of size-change" >&5 +echo "configure:10064: checking declaration of size-change" >&5 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10068,7 +10074,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext < #ifdef HAVE_TERMIOS_H @@ -10107,7 +10113,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -10146,7 +10152,7 @@ fi echo $ac_n "checking if sys/time.h conflicts with sys/select.h""... $ac_c" 1>&6 -echo "configure:10150: checking if sys/time.h conflicts with sys/select.h" >&5 +echo "configure:10156: checking if sys/time.h conflicts with sys/select.h" >&5 if eval "test \"`echo '$''{'cf_cv_sys_select_timeval'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10154,7 +10160,7 @@ else for cf_opts in no yes do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_select_timeval=$cf_opts break @@ -10206,12 +10212,12 @@ EOF ### Checks for Datatypes. echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:10210: checking for gid_t" >&5 +echo "configure:10216: checking for gid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_gid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10239,12 +10245,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:10243: checking for mode_t" >&5 +echo "configure:10249: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10272,12 +10278,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:10276: checking for off_t" >&5 +echo "configure:10282: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10305,12 +10311,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:10309: checking for pid_t" >&5 +echo "configure:10315: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10338,12 +10344,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:10342: checking for size_t" >&5 +echo "configure:10348: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10371,12 +10377,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:10375: checking for ssize_t" >&5 +echo "configure:10381: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10404,12 +10410,12 @@ EOF fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:10408: checking for time_t" >&5 +echo "configure:10414: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10437,12 +10443,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:10441: checking for uid_t in sys/types.h" >&5 +echo "configure:10447: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -10472,9 +10478,9 @@ fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:10476: checking for quad_t" >&5 +echo "configure:10482: checking for quad_t" >&5 cat > conftest.$ac_ext < @@ -10487,7 +10493,7 @@ int main() { quad_t x; x = 0 ; return 0; } EOF -if { (eval echo configure:10491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_quad_t=yes else @@ -10506,9 +10512,9 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:10510: checking for long long" >&5 +echo "configure:10516: checking for long long" >&5 cat > conftest.$ac_ext < @@ -10517,7 +10523,7 @@ int main() { long long x; x = 0 ; return 0; } EOF -if { (eval echo configure:10521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_long_long=yes else @@ -10536,9 +10542,9 @@ EOF fi echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:10540: checking for nl_item" >&5 +echo "configure:10546: checking for nl_item" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_nl_item=yes else @@ -10575,7 +10581,7 @@ fi # libuu/uudeview # only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found echo $ac_n "checking for UUInitialize in -luu""... $ac_c" 1>&6 -echo "configure:10579: checking for UUInitialize in -luu" >&5 +echo "configure:10585: checking for UUInitialize in -luu" >&5 ac_lib_var=`echo uu'_'UUInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10583,7 +10589,7 @@ else ac_save_LIBS="$LIBS" LIBS="-luu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10604: \"$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 @@ -10611,17 +10617,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "uudeview.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for uudeview.h""... $ac_c" 1>&6 -echo "configure:10615: checking for uudeview.h" >&5 +echo "configure:10621: checking for uudeview.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10631: \"$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* @@ -10659,7 +10665,7 @@ fi # libidn - Internationalized Domain Names echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:10663: checking for stringprep_check_version in -lidn" >&5 +echo "configure:10669: checking for stringprep_check_version in -lidn" >&5 ac_lib_var=`echo idn'_'stringprep_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10667,7 +10673,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10688: \"$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 @@ -10695,17 +10701,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "stringprep.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stringprep.h""... $ac_c" 1>&6 -echo "configure:10699: checking for stringprep.h" >&5 +echo "configure:10705: checking for stringprep.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10715: \"$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* @@ -10728,17 +10734,17 @@ EOF ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:10732: checking for idna.h" >&5 +echo "configure:10738: checking for idna.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10748: \"$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* @@ -10760,7 +10766,7 @@ if eval "test \"`echo '$ac_cv_header_'$a EOF echo $ac_n "checking for idna_to_unicode_lzlz in -lidn""... $ac_c" 1>&6 -echo "configure:10764: checking for idna_to_unicode_lzlz in -lidn" >&5 +echo "configure:10770: checking for idna_to_unicode_lzlz in -lidn" >&5 ac_lib_var=`echo idn'_'idna_to_unicode_lzlz | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10768,7 +10774,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10789: \"$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 @@ -10800,9 +10806,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l EOF echo $ac_n "checking for IDNA_USE_STD3_ASCII_RULES""... $ac_c" 1>&6 -echo "configure:10804: checking for IDNA_USE_STD3_ASCII_RULES" >&5 +echo "configure:10810: checking for IDNA_USE_STD3_ASCII_RULES" >&5 cat > conftest.$ac_ext < EOF @@ -10851,17 +10857,17 @@ fi # ICU - International Components for Unicode ac_safe=`echo "unicode/unorm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/unorm.h""... $ac_c" 1>&6 -echo "configure:10855: checking for unicode/unorm.h" >&5 +echo "configure:10861: checking for unicode/unorm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10871: \"$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* @@ -10880,17 +10886,17 @@ if eval "test \"`echo '$ac_cv_header_'$a ac_safe=`echo "unicode/ustring.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ustring.h""... $ac_c" 1>&6 -echo "configure:10884: checking for unicode/ustring.h" >&5 +echo "configure:10890: checking for unicode/ustring.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10900: \"$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* @@ -10916,12 +10922,12 @@ EOF EOF echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:10920: checking for unorm_normalize in libicuuc" >&5 +echo "configure:10926: checking for unorm_normalize in libicuuc" >&5 cf_save_LIBS="$LIBS" cf_try_icuuc="no" LIBS="$LIBS -licuuc" cat > conftest.$ac_ext < int main() { @@ -10931,7 +10937,7 @@ int main() { needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); ; return 0; } EOF -if { (eval echo configure:10935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -10948,6 +10954,44 @@ else fi rm -f conftest* echo "$ac_t""$cf_try_icuuc" 1>&6 + ac_safe=`echo "unicode/ubidi.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for unicode/ubidi.h""... $ac_c" 1>&6 +echo "configure:10960: checking for unicode/ubidi.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:10970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_UNICODE_UBIDI_H 1 +EOF + + +else + echo "$ac_t""no" 1>&6 +fi + else echo "$ac_t""no" 1>&6 @@ -10969,24 +11013,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_termlib=terminfo else @@ -11015,16 +11059,16 @@ if test "$cf_cv_termlib" = none; then for cf_func in tigetstr tgetstr do echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:11019: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:11063: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -11051,7 +11095,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:11055: checking for initscr in -lcurses" >&5 +echo "configure:11099: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11059,7 +11103,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11118: \"$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 @@ -11091,7 +11135,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11095: checking for tgoto in -ltermcap" >&5 +echo "configure:11139: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11099,7 +11143,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11158: \"$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 @@ -11143,11 +11187,11 @@ fi # terminfo-based termcap interfaces may be prototyped in , # which may/may not be compatible with echo $ac_n "checking if we should include termcap.h""... $ac_c" 1>&6 -echo "configure:11147: checking if we should include termcap.h" >&5 +echo "configure:11191: checking if we should include termcap.h" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$srcdir/include" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -11178,7 +11222,7 @@ EOF echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:11182: checking for term.h" >&5 +echo "configure:11226: checking for term.h" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11191,7 +11235,7 @@ for cf_header in \ term.h do cat > conftest.$ac_ext < @@ -11200,7 +11244,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:11204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -11241,7 +11285,7 @@ esac echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:11245: checking if we should include curses.h or termcap.h" >&5 +echo "configure:11289: checking if we should include curses.h or termcap.h" >&5 if eval "test \"`echo '$''{'cf_cv_need_curses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11259,7 +11303,7 @@ do test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe @@ -11280,7 +11324,7 @@ else rm -rf conftest* echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts @@ -11364,7 +11408,7 @@ esac echo $ac_n "checking declaration of tputs 3rd param""... $ac_c" 1>&6 -echo "configure:11368: checking declaration of tputs 3rd param" >&5 +echo "configure:11412: checking declaration of tputs 3rd param" >&5 if eval "test \"`echo '$''{'cf_cv_type_outchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11380,10 +11424,10 @@ for Q in int void; do for R in int char; do for S in "" const; do -echo "(line 11384) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "(line 11428) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -11447,14 +11491,14 @@ EOF elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_EXTERN_TCAP_PC 1 @@ -11473,13 +11517,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:11477: checking if external errno is declared" >&5 +echo "configure:11521: checking if external errno is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -11520,13 +11564,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external errno exists""... $ac_c" 1>&6 -echo "configure:11524: checking if external errno exists" >&5 +echo "configure:11568: checking if external errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_errno=yes else @@ -11568,12 +11612,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11572: checking for $ac_func" >&5 +echo "configure:11616: 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:11644: \"$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 @@ -11623,13 +11667,13 @@ else echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:11627: checking if external sys_nerr is declared" >&5 +echo "configure:11671: checking if external sys_nerr is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -11670,13 +11714,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6 -echo "configure:11674: checking if external sys_nerr exists" >&5 +echo "configure:11718: checking if external sys_nerr exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_sys_nerr=yes else @@ -11715,13 +11759,13 @@ fi echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:11719: checking if external sys_errlist is declared" >&5 +echo "configure:11763: checking if external sys_errlist is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -11762,13 +11806,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6 -echo "configure:11766: checking if external sys_errlist exists" >&5 +echo "configure:11810: checking if external sys_errlist exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_have_sys_errlist=yes else @@ -11872,12 +11916,12 @@ for ac_func in \ $cf_tc_funcs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11876: checking for $ac_func" >&5 +echo "configure:11920: 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:11948: \"$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 @@ -11926,12 +11970,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:11930: checking for flock" >&5 +echo "configure:11974: 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:12002: \"$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 @@ -11976,7 +12020,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:11980: checking for flock in -lbsd" >&5 +echo "configure:12024: 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 @@ -11984,7 +12028,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:12043: \"$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 @@ -12024,12 +12068,12 @@ fi echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:12028: checking for wide char and multibyte support" >&5 +echo "configure:12072: 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 @@ -12065,7 +12109,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:12069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=yes else @@ -12075,7 +12119,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -12101,7 +12145,7 @@ char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:12105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_multibyte_able=libutf8 else @@ -12135,9 +12179,9 @@ EOF echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:12139: checking if gettimeofday takes two arguments" >&5 +echo "configure:12183: checking if gettimeofday takes two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_gettimeofday_2args=yes else @@ -12168,12 +12212,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:12172: checking return type of signal handlers" >&5 +echo "configure:12216: 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 @@ -12190,7 +12234,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:12194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -12210,7 +12254,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:12214: checking declaration of signal arguments" >&5 +echo "configure:12258: 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 @@ -12219,7 +12263,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -12227,7 +12271,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:12231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -12253,13 +12297,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:12257: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:12301: 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 < @@ -12268,7 +12312,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:12272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -12289,13 +12333,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:12293: checking if we have sigaction/related functions" >&5 +echo "configure:12337: 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:12361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_sigaction_funcs=yes else @@ -12335,7 +12379,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:12339: checking for fork" >&5 +echo "configure:12383: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12344,7 +12388,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:12402: \"$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 @@ -12376,12 +12420,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:12380: checking for memmove" >&5 +echo "configure:12424: 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:12452: \"$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 @@ -12423,12 +12467,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:12427: checking for bcopy" >&5 +echo "configure:12471: 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:12499: \"$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 @@ -12467,7 +12511,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:12471: checking if bcopy does overlapping moves" >&5 +echo "configure:12515: 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 @@ -12476,7 +12520,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:12537: \"$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 @@ -12527,9 +12571,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:12531: checking if select expects int * arguments" >&5 +echo "configure:12575: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -12549,7 +12593,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:12553: checking whether closedir returns void" >&5 +echo "configure:12597: 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 @@ -12557,13 +12601,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:12567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12611: \"$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 @@ -12589,7 +12633,7 @@ fi # autoconf 2.5x assumes setvbuf is not reversed when cross-compiling if test "$cross_compiling" != yes ; then echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:12593: checking whether setvbuf arguments are reversed" >&5 +echo "configure:12637: 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 @@ -12597,7 +12641,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. */ @@ -12611,7 +12655,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:12615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12659: \"$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 @@ -12649,12 +12693,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12653: checking for $ac_func" >&5 +echo "configure:12697: 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:12725: \"$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 @@ -12704,13 +12748,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:12708: checking for type sigaction_t" >&5 +echo "configure:12752: 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 < @@ -12718,7 +12762,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:12722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -12738,13 +12782,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:12742: checking for nonconflicting termios.h" >&5 +echo "configure:12786: 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:12814: \"$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 @@ -12797,13 +12841,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:12801: checking for passwd.pw_gecos" >&5 +echo "configure:12845: 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 < @@ -12814,7 +12858,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:12818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -12834,13 +12878,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:12838: checking for tm.tm_gmtoff" >&5 +echo "configure:12882: 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:12908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -12880,7 +12924,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:12884: checking for long file names" >&5 +echo "configure:12928: 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 @@ -12928,17 +12972,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:12932: checking for $ac_hdr" >&5 +echo "configure:12976: 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:12942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12986: \"$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* @@ -12975,17 +13019,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:12979: checking for $ac_hdr" >&5 +echo "configure:13023: 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:12989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13033: \"$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* @@ -13015,17 +13059,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:13019: checking for $ac_hdr" >&5 +echo "configure:13063: 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:13029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13073: \"$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* @@ -13066,13 +13110,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:13070: checking for union wait" >&5 +echo "configure:13114: 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:13131: \"$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 @@ -13094,7 +13138,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:13157: \"$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 @@ -13134,7 +13178,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:13138: checking if the system function returns usable child-status" >&5 +echo "configure:13182: 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 @@ -13143,7 +13187,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -13176,7 +13220,7 @@ int main() } EOF -if { (eval echo configure:13180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13224: \"$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 @@ -13187,11 +13231,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:13239: \"$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 @@ -13234,13 +13278,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:13238: checking for obsolete/broken version of ncurses" >&5 +echo "configure:13282: 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 < @@ -13254,7 +13298,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -13279,13 +13323,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:13283: checking if curses supports color attributes" >&5 +echo "configure:13327: 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 < @@ -13300,7 +13344,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:13304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_color_curses=yes else @@ -13351,7 +13395,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:13355: checking for redefinable signal constants" >&5 +echo "configure:13399: 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 @@ -13363,7 +13407,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:13438: \"$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 @@ -13416,13 +13460,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:13420: checking for ANSI qsort" >&5 +echo "configure:13464: 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:13482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -13462,7 +13506,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:13466: checking if application can dump core" >&5 +echo "configure:13510: 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 @@ -13471,7 +13515,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -13512,7 +13556,7 @@ int main() #endif } EOF -if { (eval echo configure:13516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13560: \"$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 @@ -13558,18 +13602,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:13562: checking for missing "${ac_func}" extern" >&5 +echo "configure:13606: 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 13568) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13612) 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:13631: \"$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 @@ -13591,7 +13635,7 @@ if { (eval echo configure:13587: \"$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:13649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13650,18 +13694,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:13654: checking for missing "${ac_func}" extern" >&5 +echo "configure:13698: 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 13660) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13704) 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:13723: \"$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 @@ -13683,7 +13727,7 @@ if { (eval echo configure:13679: \"$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:13741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13740,18 +13784,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:13744: checking for missing "${ac_func}" extern" >&5 +echo "configure:13788: 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 13750) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13794) 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:13813: \"$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 @@ -13773,7 +13817,7 @@ if { (eval echo configure:13769: \"$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:13831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13881,18 +13925,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:13885: checking for missing "${ac_func}" extern" >&5 +echo "configure:13929: 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 13891) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 13935) 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:13954: \"$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 @@ -13914,7 +13958,7 @@ if { (eval echo configure:13910: \"$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:13972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -13968,18 +14012,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:13972: checking for missing "${ac_func}" extern" >&5 +echo "configure:14016: 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 13978) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14022) 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:14041: \"$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 @@ -14001,7 +14045,7 @@ if { (eval echo configure:13997: \"$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:14059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14058,18 +14102,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:14062: checking for missing "${ac_func}" extern" >&5 +echo "configure:14106: 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 14068) testing for missing "${ac_func}" external ..." 1>&5 +echo "(line 14112) 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:14131: \"$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 @@ -14091,7 +14135,7 @@ if { (eval echo configure:14087: \"$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:14149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14139,7 +14183,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:14143: checking for working TIOCGWINSZ" >&5 +echo "configure:14187: 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 @@ -14150,7 +14194,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:14223: \"$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 @@ -14222,7 +14266,7 @@ esac # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14226: checking for $ac_word" >&5 +echo "configure:14270: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14253,17 +14297,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:14257: checking for $ac_hdr" >&5 +echo "configure:14301: 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:14267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14311: \"$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* @@ -14292,12 +14336,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14296: checking for $ac_func" >&5 +echo "configure:14340: 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:14368: \"$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 @@ -14345,7 +14389,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:14349: checking for working mmap" >&5 +echo "configure:14393: 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 @@ -14353,7 +14397,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:14541: \"$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 @@ -14517,12 +14561,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:14521: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:14565: 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 < @@ -14584,17 +14628,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:14588: checking for $ac_hdr" >&5 +echo "configure:14632: 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:14598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14642: \"$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* @@ -14625,12 +14669,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:14629: checking for $ac_func" >&5 +echo "configure:14673: 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:14701: \"$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 @@ -14694,7 +14738,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:14698: checking for iconv" >&5 +echo "configure:14742: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14702,7 +14746,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -14712,7 +14756,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:14716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -14724,7 +14768,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -14734,7 +14778,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:14738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14782: \"$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 @@ -14755,13 +14799,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:14759: checking for iconv declaration" >&5 +echo "configure:14803: 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 < @@ -14780,7 +14824,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -14809,19 +14853,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:14813: checking for nl_langinfo and CODESET" >&5 +echo "configure:14857: 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:14825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -14844,19 +14888,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:14848: checking for LC_MESSAGES" >&5 +echo "configure:14892: 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:14860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14904: \"$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 @@ -14877,7 +14921,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:14881: checking whether NLS is requested" >&5 +echo "configure:14925: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -14901,7 +14945,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:14905: checking whether included gettext is requested" >&5 +echo "configure:14949: 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 @@ -14922,17 +14966,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:14926: checking for libintl.h" >&5 +echo "configure:14970: 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:14936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14980: \"$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* @@ -14949,12 +14993,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:14953: checking for GNU gettext in libc" >&5 +echo "configure:14997: 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; @@ -14963,7 +15007,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:14967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15011: \"$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 @@ -14979,14 +15023,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:14983: checking for GNU gettext in libintl" >&5 +echo "configure:15027: 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; @@ -14995,7 +15039,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:14999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15043: \"$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 @@ -15028,12 +15072,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15032: checking for $ac_func" >&5 +echo "configure:15076: 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:15104: \"$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 @@ -15086,7 +15130,7 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15090: checking for $ac_word" >&5 +echo "configure:15134: 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 @@ -15120,7 +15164,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:15124: checking for $ac_word" >&5 +echo "configure:15168: 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 @@ -15158,7 +15202,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15162: checking for $ac_word" >&5 +echo "configure:15206: 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 @@ -15204,12 +15248,15 @@ fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then + if test ! -d $srcdir/intl ; then + { echo "configure: error: no NLS library is packaged with this application" 1>&2; exit 1; } + fi INTLOBJS="\$(GETTOBJS)" # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15213: checking for $ac_word" >&5 +echo "configure:15260: 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 @@ -15243,7 +15290,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:15247: checking for $ac_word" >&5 +echo "configure:15294: 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 @@ -15280,7 +15327,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15284: checking for $ac_word" >&5 +echo "configure:15331: 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 @@ -15347,12 +15394,13 @@ fi BUILD_INCLUDED_LIBINTL=yes fi - for ac_prog in bison + if test "$nls_cv_use_gnu_gettext" = "yes"; then + for ac_prog in bison 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:15356: checking for $ac_word" >&5 +echo "configure:15404: 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 @@ -15385,7 +15433,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:15389: checking version of bison" >&5 +echo "configure:15437: 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;; @@ -15398,6 +15446,7 @@ echo "configure:15389: checking version if test $ac_verc_fail = yes; then INTLBISON=: fi + fi for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" @@ -15432,7 +15481,7 @@ echo "configure:15389: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:15436: checking for catalogs to be installed" >&5 +echo "configure:15485: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -15459,13 +15508,18 @@ echo "configure:15436: checking for cata fi fi - MKINSTALLDIRS= + MKINSTALLDIRS= if test -n "$ac_aux_dir"; then MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh" fi if test -z "$MKINSTALLDIRS"; then MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh" fi + if test -n "$GNUSYSTEM_AUX_DIR" ; then + if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then + MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs" + fi + fi INTL_LIBTOOL_SUFFIX_PREFIX= @@ -15483,7 +15537,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:15487: checking if we should use included message-library" >&5 +echo "configure:15541: checking if we should use included message-library" >&5 # Check whether --enable-included-msgs or --disable-included-msgs was given. if test "${enable_included_msgs+set}" = set; then @@ -15538,17 +15592,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15542: checking for $ac_hdr" >&5 +echo "configure:15596: 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:15552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15621,9 +15675,9 @@ LIBS="$LIBS $LIBICONV" for cf_hdr in iconv.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:15625: checking for $cf_hdr" >&5 +echo "configure:15679: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -15631,7 +15685,7 @@ echo "configure:15625: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15689: \"$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* @@ -15657,13 +15711,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:15661: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:15715: 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:15738: \"$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 @@ -15708,7 +15762,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:15712: checking for X" >&5 +echo "configure:15766: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -15771,12 +15825,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:15780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15834: \"$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* @@ -15845,14 +15899,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:15910: \"$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. @@ -15952,7 +16006,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:15956: checking for open in -lc_s" >&5 +echo "configure:16010: 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 @@ -15960,7 +16014,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:16029: \"$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 @@ -15988,7 +16042,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:15992: checking for gethostname in -lbsd" >&5 +echo "configure:16046: 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 @@ -15996,7 +16050,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:16065: \"$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 @@ -16024,7 +16078,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:16028: checking for gethostname in -lnsl_s" >&5 +echo "configure:16082: 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 @@ -16032,7 +16086,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:16101: \"$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 @@ -16060,7 +16114,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:16064: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:16118: 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 @@ -16068,7 +16122,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:16137: \"$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 @@ -16096,7 +16150,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:16100: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:16154: 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 @@ -16104,7 +16158,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:16173: \"$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 @@ -16156,7 +16210,7 @@ fi ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:16160: checking for socket in -lsocket" >&5 +echo "configure:16214: 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 @@ -16164,7 +16218,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:16233: \"$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 @@ -16203,7 +16257,7 @@ else fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:16207: checking for gethostname in -lnsl" >&5 +echo "configure:16261: 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 @@ -16211,7 +16265,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:16280: \"$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 @@ -16273,17 +16327,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:16277: checking whether -R must be followed by a space" >&5 +echo "configure:16331: 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:16341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -16299,14 +16353,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:16364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -16338,7 +16392,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:16342: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:16396: 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 @@ -16346,7 +16400,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:16415: \"$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 @@ -16379,7 +16433,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:16383: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:16437: 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 @@ -16387,7 +16441,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:16456: \"$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 @@ -16427,12 +16481,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:16431: checking for gethostbyname" >&5 +echo "configure:16485: 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:16513: \"$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 @@ -16476,7 +16530,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:16480: checking for gethostbyname in -lnsl" >&5 +echo "configure:16534: 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 @@ -16484,7 +16538,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:16553: \"$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 @@ -16525,12 +16579,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:16529: checking for connect" >&5 +echo "configure:16583: 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:16611: \"$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 @@ -16574,7 +16628,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:16578: checking for connect in -lsocket" >&5 +echo "configure:16632: 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 @@ -16582,7 +16636,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:16651: \"$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 @@ -16617,12 +16671,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:16621: checking for remove" >&5 +echo "configure:16675: 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:16703: \"$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 @@ -16666,7 +16720,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:16670: checking for remove in -lposix" >&5 +echo "configure:16724: 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 @@ -16674,7 +16728,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:16743: \"$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 @@ -16709,12 +16763,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:16713: checking for shmat" >&5 +echo "configure:16767: 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:16795: \"$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 @@ -16758,7 +16812,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:16762: checking for shmat in -lipc" >&5 +echo "configure:16816: 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 @@ -16766,7 +16820,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:16835: \"$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 @@ -16810,7 +16864,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:16814: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:16868: 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 @@ -16818,7 +16872,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:16887: \"$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 @@ -16895,14 +16949,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:16906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -16920,7 +16974,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:16924: checking for XOpenDisplay in -lX11" >&5 +echo "configure:16978: 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 @@ -16928,7 +16982,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:16997: \"$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 @@ -16960,7 +17014,7 @@ else fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:16964: checking for XtAppInitialize in -lXt" >&5 +echo "configure:17018: 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 @@ -16968,7 +17022,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:17037: \"$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 @@ -17047,14 +17101,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:17058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17107,7 +17161,7 @@ fi echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:17111: checking for XextCreateExtension in -lXext" >&5 +echo "configure:17165: 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 @@ -17115,7 +17169,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:17184: \"$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 @@ -17165,13 +17219,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:17169: checking for $cf_test in $cf_path" >&5 +echo "configure:17223: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:17172: checking for $cf_test" >&5 +echo "configure:17226: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -17180,7 +17234,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -17227,23 +17281,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:17231: checking for $cf_lib in $cf_path" >&5 +echo "configure:17285: 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:17235: checking for $cf_test in $cf_lib" >&5 +echo "configure:17289: 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:17301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -17322,14 +17376,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:17333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -17347,7 +17401,7 @@ rm -f conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:17351: checking for XOpenDisplay in -lX11" >&5 +echo "configure:17405: 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 @@ -17355,7 +17409,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:17424: \"$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 @@ -17387,14 +17441,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:17391: checking for XCurses library" >&5 +echo "configure:17445: 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 < @@ -17404,7 +17458,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:17408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_cv_lib_XCurses=yes else @@ -17659,11 +17713,13 @@ s%@PROG_EXT@%$PROG_EXT%g s%@LIB_PREFIX@%$LIB_PREFIX%g s%@LN_S@%$LN_S%g s%@BUILD_CC@%$BUILD_CC%g +s%@BUILD_CPP@%$BUILD_CPP%g s%@BUILD_CFLAGS@%$BUILD_CFLAGS%g s%@BUILD_CPPFLAGS@%$BUILD_CPPFLAGS%g s%@BUILD_LDFLAGS@%$BUILD_LDFLAGS%g s%@BUILD_LIBS@%$BUILD_LIBS%g s%@BUILD_EXEEXT@%$BUILD_EXEEXT%g +s%@BUILD_OBJEXT@%$BUILD_OBJEXT%g s%@build@%$build%g s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g diff -Nurp tin-1.7.4/configure.in tin-1.7.5/configure.in --- tin-1.7.4/configure.in 2004-02-25 10:59:01.000000000 +0100 +++ tin-1.7.5/configure.in 2004-06-15 11:52:58.000000000 +0200 @@ -2,7 +2,7 @@ dnl Project : tin - a Usenet reader dnl Module : configure.in dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2004-02-09 +dnl Updated : 2004-06-06 dnl Notes : dnl dnl Copyright (c) 1995-2004 Thomas E. Dickey @@ -41,7 +41,7 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=1.7.4 +VERSION=1.7.5 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -848,6 +848,9 @@ AC_CHECK_HEADER(unicode/unorm.h,[ LIBS=$cf_save_LIBS ) AC_MSG_RESULT($cf_try_icuuc) + AC_CHECK_HEADER(unicode/ubidi.h, [ + AC_DEFINE(HAVE_UNICODE_UBIDI_H) + ]) ]) ]) diff -Nurp tin-1.7.4/doc/CHANGES tin-1.7.5/doc/CHANGES --- tin-1.7.4/doc/CHANGES 2004-02-25 10:51:32.000000000 +0100 +++ tin-1.7.5/doc/CHANGES 2004-06-15 11:41:03.000000000 +0200 @@ -1,3 +1,61 @@ +-- 1.7.5 release 20040615 "Gighay" -- + + 024) Herbert Xu + BUG. negative tinrc.groupname_max_length set via 'M'enu could lead to + a crash + FIX. extern.h, proto.h, active.c, config.c, group.c, init.c, select.c + + 022) Urs Janssen + BUG. long cmd-line group could overflow a buffer in match_group_list() + BUG. empty newsgroups file leads to a crash + FIX. active.c, mail.c + +U027) Urs Janssen + BUG. can't link when configured with --with-included-gettext + BUG. checknadd_headers() didn't handle folded headers + ADD. replace raw 8bit chars in From:-header + ADD. remove empty headers before passing article to inews + ADD. minor code cleanup + ADD. config.guess, config.sub update + ADD. configure check for unicode/ubidi.h + FIX. intl/loadmsgcat.c, configure.in, proto.h, autoconf.hin, art.c + cook.c, getline.c, filter.c, misc.c, nntplib.c, post.c, refs.c + config.guess, config.sub, fr.po, et.po + +U026) Matt Anton + ADD. added a some missing french translations + FIX. fr.po + +U025) Elmar W. Tischhauser + ADD. mime_forward (message/rfc822) attributes option + FIX. proto.h, tin.h, attrib.c, post.c, rfc2047.c, tin.5 + +U024) Thomas E. Dickey + BUG. didn't build with pdcurses + BUG. unportable linewrapping used in configure macro + FIX. aclocal.m4, tcurses.c + +U023) Michael Bienia + BUG. in case of a reconnect unmalloced memory could be freed + BUG. didn't always initialize articles score + BUG. expand_rel_abs_pathname() truncated pathnames in tinrc + ADD. dynamic Menu option-width. + ADD. minimalistic BiDi support (tinrc.render_bidi) + ADD. check for valid UTF-8 in process_text_body_part() + ADD. minor code cleanup + ADD. redrawing support inside prompt_slk_response() + ADD. use dash instead hyphen for options in manpages + ADD. check for senseless tinrc-values + FIX. extern.h, proto.h, tin.h, tinrc.h, art.c, charset.c, color.c + config.c, cook.c, curses.c, feed.c, filter.c, getline.c, init.c + lang.c, makecfg.c, misc.c, newsrc.c, page.c, prompt.c, save.c + screen.c, search.c, select.c, signal.c, string.c, tags.c + tcurses.c, tincfg.tbl, tin.1, tin.5, de.po, en_GB.po + -- 1.7.4 release 20040225 "Benbecula" -- U022) Lech Szychowski @@ -29,7 +87,7 @@ U019) Michael Bienia foo.bar.baz.ex.* -> foo.bar.baz.* foo.bar.* -> + foo.bar.* -> foo.* -> *) + [20040423 Urs Janssen ] + o add TLS support (see draft-ietf-nntpext-tls-nntp-01.txt; might be useful) @@ -159,12 +165,14 @@ o should the postponed 'file' (and post mailbox_format (even if that's a one file/message format, thus the 'file' actually needs to be a directory?). -o add maildir support (besides MBOX{O,RD} and MMDF}, +o add maildir/maildir++ support (besides MBOX{O,RD} and MMDF}, MH (not only reading but also writing), mailstore, BABYL, Kendra (MMDF - like with 20*CTRL-A as sep.) and add man-pages for the various formats. + like with 20*CTRL-A as sep.), MBX (indexed MBOX from UW-IMAP) and add + man-pages for the various formats. (see for BABYL, for maildir, - for MBOXCL and MBOXCL2) + for MBOXCL and MBOXCL2, + for MBX) [20020215 Urs Janssen ] o add $LOCKEXT support @@ -228,11 +236,6 @@ 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 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 - o attributes (still) needs some work, some entrys aren't really useful on a per group basis but others would (e.g. Reply-To) once we have a 'attributes-menu' we could remove most of the @@ -258,6 +261,8 @@ o add IPv6 support newsserver it always uses DNS (gethostbyname()/gethostbyaddr() checked /etc/hosts first) and getaddrinfo() seems to have a (huge) delay in some cases. use getipnodebyname()/getipnodebyaddr() (if available) instead. + check for gethostbyaddr_r()/gethostbyname_r() and use them instead + of gethostbyaddr()/gethostbyname() if available. o add cmd-line/tinrc-switch to fetch only headers of unread articles; in that case, make 'r' reading the rest of the articles @@ -638,6 +643,10 @@ o tin.defaults could use more documenta Not yet classified ------------------ +o should 'tin -z foo.bar' only start up if there is any unread news in + foo.bar? + [20040325 Urs Janssen ] + o trn uses ~/.nntpauth (format is "^server\s+user\s+password"), shall we also try ~/.nntpauth if we can't find a matching entry in ~/.newsauth? diff -Nurp tin-1.7.4/doc/tin.1 tin-1.7.5/doc/tin.1 --- tin-1.7.4/doc/tin.1 2004-02-15 02:04:01.000000000 +0100 +++ tin-1.7.5/doc/tin.1 2004-06-01 18:14:23.000000000 +0200 @@ -3,13 +3,13 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2004-02-15 +.\" Updated : 2004-05-31 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature .\" .\" -.TH tin 1 "February 15th, 2003" "1.7.4" "A Usenet newsreader" +.TH tin 1 "May 31st, 2004" "1.7.5" "A Usenet newsreader" .\" .\" .SH NAME @@ -20,13 +20,13 @@ tin, rtin \- A Usenet newsreader .B tin .RB [\|[\| \-h \||\| \-H \||\| \-V \|]\ \|| .RB [\|[\|[\| \-a \|] -.RB [\| \-dlnq \||\| -Q \|] +.RB [\| \-dlnq \||\| \-Q \|] .RB [\| \-ArzxX \|]\|] -.RB [\|[\| \-R \||\| -S \|] +.RB [\|[\| \-R \||\| \-S \|] .RB \|\| \-s .IR News-dir \|] .RB [\| \-cuvZ \|] -.RB [\| \-N \||\| -M +.RB [\| \-N \||\| \-M .IR address \|] .RB [\| \-o \||\| \-w \|]\|] .RB [\| \-D @@ -48,7 +48,7 @@ tin, rtin \- A Usenet newsreader .SH DESCRIPTION .B tin is a full-screen easy to use Usenet newsreader. It can read news locally -(e.g., \fI/var/spool/news\fR) or remotely (\fBrtin\fP or \fBtin -r\fP +(e.g., \fI/var/spool/news\fR) or remotely (\fBrtin\fP or \fBtin \-r\fP option) via a NNTP (Network News Transport Protocol) server. It will automatically utilize NOV .BR newsoverview (5) @@ -62,7 +62,7 @@ command to view a list of the commands a level. .PP On startup \fBtin\fP will show a list of the newsgroups found in -\fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR. An arrow '->' or highlighted +\fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR. An arrow '\->' or highlighted bar will point to the first newsgroup. Move to a group by using the terminal arrow keys (terminal dependent) or \fBDown2\fP ('\fBj\fP') and \fBUp2\fP ('\fBk\fP'). Use PgUp/PgDn (terminal dependent) or @@ -84,7 +84,7 @@ Successful program execution. Usage, syntax, configuration file or network error. .RE .PP -Batch mode (''\fB-Z\fP''): +Batch mode (''\fB\-Z\fP''): .RS +.5i .TP .B 0 @@ -100,145 +100,145 @@ Unread news .\" .SH OPTIONS .TP 12 -.B -a +.B \-a Toggle ANSI color (default is off). .TP -.B -A +.B \-A Force authentication on initial connect. .TP -.B -c +.B \-c Create/update index files for every group in -\fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR or file specified by the ''\fB-f\fP'' +\fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR or file specified by the ''\fB\-f\fP'' option and mark all articles as read. .TP -.B -d +.B \-d Don't load newsgroup descriptions (interactive mode). .TP -.BI -D " debug-level" +.BI \-D " debug-level" Enter debug-level (1 = NNTP, 2 = all, 3 = newsrc, 4 = memory allocation). .TP -.BI -f " file" +.BI \-f " file" Use the specified file of subscribed to newsgroups in place of -\fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR. .TP -.BI -g " server" +.BI \-g " server" Use the server and newsrc specified in -\fI${TIN_HOMEDIR-"$HOME"}/.tin/newsrctable\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/newsrctable\fR. .TP -.BI -G " article-limit" +.BI \-G " article-limit" Limit the number of articles/group to retrieve from the server. .TP -.B -h +.B \-h Help listing all command-line options. .TP -.B -H +.B \-H Brief introduction to \fBtin\fP that is also shown the first time it is started. .TP -.BI -I " dir" +.BI \-I " dir" Directory in which to store newsgroup index files. Default is -\fI${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news\fR. +\fI${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news\fR. This option has no effect if \fBtin\fP retrieves its index files via NNTP and \fBcache_overview_files\fP is turned off. .TP -.BI -l +.BI \-l Get number of articles per group from the -\fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file. If +\fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file. If reading via NNTP this is done with the LIST command (\fBRFC977\fP). This might result in incorrect article counts but is usually faster than the default which is to read the -\fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file +\fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file (either directly or via LIST) and then check the article count via -NNTP GROUP command (\fBRFC977\fP) ''\fB-ln\fP''. +NNTP GROUP command (\fBRFC977\fP) ''\fB\-ln\fP''. .TP -.BI -m " dir" -Mailbox directory to use. Default is \fI${TIN_HOMEDIR-"$HOME"}/Mail\fR. +.BI \-m " dir" +Mailbox directory to use. Default is \fI${TIN_HOMEDIR\-"$HOME"}/Mail\fR. .TP -.BI -M " user" +.BI \-M " user" Mail unread articles to specified user for later reading. For more information read section "AUTOMATIC MAILING AND SAVING NEW NEWS". .TP -.B -n +.B \-n Only load groups from the -\fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file that are -subscribed to in the user's \fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR. This +\fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file that are +subscribed to in the user's \fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR. This allows a noticeable speedup when connecting via a slow line, but \fBtin\fP -can not tell which groups are moderated. See also ''\fB-l\fP''. +can not tell which groups are moderated. See also ''\fB\-l\fP''. .TP -.B -N +.B \-N Mail unread articles to yourself for later reading. For more information read section "AUTOMATIC MAILING AND SAVING NEW NEWS". .TP -.B -o +.B \-o Quick post all postponed articles and exit. In order for this to be really -quick, it should be used with ''\fB-n\fP'' if possible. +quick, it should be used with ''\fB\-n\fP'' if possible. .TP -.BI -p " port" +.BI \-p " port" Port to use if reading via NNTP (default is 119). This also overrides the environment variable $\fBNNTPPORT\fP if set. .TP -.B -q +.B \-q Don't check for new newsgroups. .TP -.B -Q +.B \-Q Quick start. Start \fBtin\fP as quickly as possible. Currently this is -equivalent to ''\fB-nqd\fP''. +equivalent to ''\fB\-nqd\fP''. .TP -.B -r +.B \-r Read news remotely from the default NNTP server specified in the environment variable $\fBNNTPSERVER\fP or contained in the file \fI/etc/nntpserver\fR. .TP -.B -R -Read news saved by the ''\fB-S\fP'' option. +.B \-R +Read news saved by the ''\fB\-S\fP'' option. .TP -.BI -s " dir" +.BI \-s " dir" Save/read articles to/in directory. Default is -\fI${TIN_HOMEDIR-"$HOME"}/News\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/News\fR. .TP -.B -S -Save unread articles for later reading by the ''\fB-R\fP'' option. For more +.B \-S +Save unread articles for later reading by the ''\fB\-R\fP'' option. For more information read section "AUTOMATIC MAILING AND SAVING NEW NEWS". .TP -.B -u +.B \-u Create/update index files for every group in -\fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR or file specified by the ''\fB-f\fP'' +\fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR or file specified by the ''\fB\-f\fP'' option. This option is disabled if \fBtin\fP retrieves its index files via a NNTP server and \fBcache_overview_files\fP is turned off. .TP -.B -v -Verbose mode for ''\fB-c\fP'', ''\fB-M\fP'', ''\fB-N\fP'', ''\fB-S\fP'', -\&''\fB-u\fP'' and ''\fB-Z\fP'' options. +.B \-v +Verbose mode for ''\fB\-c\fP'', ''\fB\-M\fP'', ''\fB\-N\fP'', ''\fB\-S\fP'', +\&''\fB\-u\fP'' and ''\fB\-Z\fP'' options. .TP -.B -V +.B \-V Print version and date information. .TP -.B -w +.B \-w Quick mode to post an article and then exit. In order for this to be really -quick, it should be used with ''\fB-n\fP'' if possible. +quick, it should be used with ''\fB\-n\fP'' if possible. .TP -.B -x +.B \-x No posting mode. You cannot post articles if you use this option. .TP -.B -X -No overwrite mode. \fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR and files in -\fI${TIN_HOMEDIR-"$HOME"}/.tin\fR +.B \-X +No overwrite mode. \fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR and files in +\fI${TIN_HOMEDIR\-"$HOME"}/.tin\fR will not be overwritten but may be created if they don't exist. .TP -.B -z +.B \-z Only start \fBtin\fP if there is any new/unread news. If there is news \fBtin\fP will position cursor at first group with unread news. Useful for putting in login file. .TP -.B -Z +.B \-Z Check if there is any new/unread news and exit with appropriate status. If -\&''\fB-v\fP'' option is specified the number of unread articles in each +\&''\fB\-v\fP'' option is specified the number of unread articles in each group is printed. An exit code 0 indicates no news, 1 that an error occurred and 2 that new/unread news exists. Useful for writing scripts. .PP \fBtin\fP can also dynamically change its options by the \fBOptionMenu\fP ('\fBM\fP') command. Any changes are written to -\fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR. For more information see section +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc\fR. For more information see section "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" and .BR tin (5). .PP @@ -256,13 +256,13 @@ Once you use \fBSelectYankActive\fP ('\f or \fBSelectToggleReadDisplay\fP ('\fBr\fP') to toggle the read/unread status, then the command-line groups will be gone. You can use \fBSelectSyncWithActive\fP ('\fBY\fP') to reread the -\fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file and get +\fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file and get them back. .PP -NB: With the ''\fB-n\fP'' flag, only unsubscribed groups in the -\fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR file (or the newsrc-file given by the -\&''\fB-f\fP'' command-line switch or via -\fI${TIN_HOMEDIR-"$HOME"}/.tin/newsrctable\fR) can be matched. +NB: With the ''\fB\-n\fP'' flag, only unsubscribed groups in the +\fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR file (or the newsrc-file given by the +\&''\fB\-f\fP'' command-line switch or via +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/newsrctable\fR) can be matched. .\" .\" .SH USAGE @@ -276,7 +276,7 @@ news system and news users. A user starting \fBtin\fP for the first time can be automatically subscribed to a list of newsgroups that are deemed appropriate by the news administrator. The subscriptions file should be created in your news lib -directory (i.e., \fI${TIN_LIBDIR-NEWSLIBDIR}/subscriptions\fR) and should +directory (i.e., \fI${TIN_LIBDIR\-NEWSLIBDIR}/subscriptions\fR) and should have file permissions set to 0644. If you read news via NNTP, then your news server must support the LIST SUBSCRIPTIONS command. It is part of the Common NNTP Extensions (\fBRFC2980\fP) and all modern servers should understand it. @@ -293,7 +293,7 @@ unread articles displayed on the same li .PP .\" FIXME - make this autoscale .nf -->M 1 2 comp.security.announce Announcements from the CERT abou +\->M 1 2 comp.security.announce Announcements from the CERT abou M 2 1 news.admin.announce Announcements for news adminstra 3 22 news.software.misc News-related software other than 4 1475 news.software.nntp The Network News Transfer Protoc @@ -348,7 +348,7 @@ recent articles and the number of killed The characters after the numbers are depending to the configuration and if your are in \fBshow_only_unread_arts\fP mode or not. Some numbers could be missing if the specific option is not enabled. It might also contain an 'M', -\&'X' or '=' (see above; doesn't work with the ''\fB-n\fP'' command-line +\&'X' or '=' (see above; doesn't work with the ''\fB\-n\fP'' command-line switch!) if the group is moderated, set to no posting or postings to it get redirected. .PP @@ -367,7 +367,7 @@ might also be shown right before the sub .nf de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M --> 1 + 3 108 bincancels in de.talk.sex Christopher Lueg 1 + 3 108 bincancels in de.talk.sex Christopher Lueg Fremdcancel-FAQ Thomas Roessler 1 [ 7] What is this funny tree in the thr Robert F. Simmig - 2 [ 12] +-> Sephan Wagner Tin thread-level (was: What is Bob Johnson tin threading menu Brian Richardson +\-> 1 [ 7] What is this funny tree in the thr Robert F. Simmig + 2 [ 12] +\-> Sephan Wagner Tin thread-level (was: What is Bob Johnson tin threading menu Brian Richardson .fi .PP @@ -482,7 +482,7 @@ editor); \fBPostponeAll\fP ('\fBA\fP') = way to delete a postponed article from the postponed-file, you have to use the following command sequence instead: reload it with \fBPostponed\fP, enter editor with \fBPromptYes\fP, quit editor, discard posting with -\fBQuit\fP ('\fB^O\fP''\fBy\fP''\fBq\fP'). See also ''\fB-o\fP'' +\fBQuit\fP ('\fB^O\fP''\fBy\fP''\fBq\fP'). See also ''\fB\-o\fP'' command-line switch. .TP .B Help 'h' @@ -495,7 +495,7 @@ Help screen of commands available on the Toggle the display of help mini menu at the bottom of the screen. .TP .B Postponed2 'O' -Reload postponed article. See also ''\fB-o\fP'' command-line switch. +Reload postponed article. See also ''\fB\-o\fP'' command-line switch. .TP .B DisplayPostHist 'W' List articles posted by user. The date posted, the newsgroup and the @@ -513,7 +513,7 @@ Print \fBtin\fP version information. Select group 4. .TP .B SelectResetNewsrc '^R' -Reset \fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR file. This will destroy all +Reset \fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR file. This will destroy all records of which articles have been read, so use this carefully. .TP .B SetRange '#' @@ -558,7 +558,7 @@ even those not currently yanked in. .B ToggleInfoLastLine 'i' Toggle the display of the description of the current newsgroup in the last line. This will not be available if \fBtin\fP was started with the -\&''\fB-d\fP'' option. +\&''\fB\-d\fP'' option. .TP .B ToggleInverseVideo 'I' Toggle inverse video. @@ -589,7 +589,7 @@ unread articles. Command has no effect i command-line when \fBtin\fP was started. .TP .B SelectBugReport 'R' -Mail a bug report or comment to . This is the best way of +Mail a bug report or comment to . This is the best way of getting bugs fixed and features added/changed. .TP .B SelectSubscribe 's' @@ -613,7 +613,7 @@ Unsubscribe to groups matching user spec .B Post 'w' Post an article to current group. If posting fails for some reason, you'll get the chance to \fBPostEdit\fP ('\fBe\fP') the article again, -\fBPostPostpone\fP ('\fBo\fP') it for later processing (see also ''\fB-o\fP'' +\fBPostPostpone\fP ('\fBo\fP') it for later processing (see also ''\fB\-o\fP'' command-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). .TP .B SelectQuitNoWrite 'X' @@ -621,11 +621,11 @@ Quit \fBtin\fP without saving any change .TP .B SelectYankActive 'y' Yanks in all groups. Toggles the displayed groups between all the groups in -the \fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file and just -those that are subscribed to in \fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR. +the \fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file and just +those that are subscribed to in \fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR. .TP .B SelectSyncWithActive 'Y' -Reread the \fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file +Reread the \fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file to see if any new news has arrived since starting \fBtin\fP. .TP .B SelectMarkGrpUnread 'z', SelectMarkGrpUnread2 'Z' @@ -649,7 +649,7 @@ more information. Choose a range of articles to be affected by the next command. See the section "RANGES" for more information. .TP -.B LastViewed '-' +.B LastViewed '\-' Re-enter the last message that was viewed. .TP .B SearchRepeat '\\\\' @@ -769,7 +769,7 @@ Mark article/thread as read and move ont Open the thread under the current cursor position. .TP .B LookupMessage 'L' -Look up article by ''Message-ID:''. +Look up article by ''Message\-ID:''. .TP .B GroupMail 'm' Mail current article / thread / auto-selected (hot) articles / articles @@ -807,7 +807,7 @@ Quit \fBtin\fP - don't ask the user to c Toggle the display between all articles and unread articles. .TP .B GroupBugReport 'R' -Mail a bug report or comment to . This is the best way of +Mail a bug report or comment to . This is the best way of getting bugs fixed and features added/changed. .TP .B GroupSave 's' @@ -838,7 +838,7 @@ Untag all articles that were tagged. Post an article to current group. If posting fails for some reason, you'll get the chance to edit the article again via \fBPostEdit\fP ('\fBe\fP'), postpone it via \fBPostPostpone\fP ('\fBo\fP') for later processing (see -also ''\fB-o\fP'' command-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). +also ''\fB\-o\fP'' command-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). .TP .B GroupRepost 'x' Repost an already posted article / thread / auto-selected (hot) articles / @@ -871,7 +871,7 @@ Select article 4 within thread. Choose a range of articles to be affected by the next command. See the section "RANGES" for more information. .TP -.B LastViewed '-' +.B LastViewed '\-' Re-enter the last message that was viewed. .TP .B SearchRepeat '\\\\' @@ -940,7 +940,7 @@ Toggle inverse video. Mark article as read and move onto the next unread article. .TP .B LookupMessage 'L' -Look up article by ''Message-ID:''. +Look up article by ''Message\-ID:''. .TP .B ThreadMail 'm' Mail current article / thread / auto-selected (hot) articles / articles @@ -954,7 +954,7 @@ Return to previous level. Quit \fBtin\fP - don't ask the user to confirm. .TP .B ThreadBugReport 'R' -Mail a bug report or comment to . This is the best way +Mail a bug report or comment to . This is the best way of getting bugs fixed and features added/changed. .TP .B ThreadSave 's' @@ -976,7 +976,7 @@ Untag all tagged threads. Post an article to current group. If posting fails for some reason, you'll get the chance to edit the article again via \fBPostEdit\fP ('\fBe\fP'), postpone it for later processing via \fBPostPostpone\fP -('\fBo\fP') (see also ''\fB-o\fP'' command-line switch) or discard it via +('\fBo\fP') (see also ''\fB\-o\fP'' command-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). .TP .B ThreadMarkArtUnread 'z' @@ -1040,7 +1040,7 @@ after a formfeed is not displayed. This and turns the hidden text back on. Scrolling down will also reveal the text, scrolling up will hide it again. .TP -.B LastViewed '-' +.B LastViewed '\-' Re-enter the last message that was viewed. .TP .B SearchRepeat '\\\\' @@ -1153,7 +1153,7 @@ Mark rest of thread as read and move ont Show the thread menu that the current article is a part of. .TP .B LookupMessage 'L' -Look up article by ''Message-ID:''. +Look up article by ''Message\-ID:''. .TP .B PageMail 'm' Mail current article / thread / auto-selected (hot) articles / articles @@ -1225,7 +1225,7 @@ View or save multimedia attachments. Post an article to the current group. If posting fails for some reason, you'll get the chance to edit the article again via \fBPostEdit\fP ('\fBe\fP'), postpone it for later processing via \fBPostPostpone\fP -('\fBo\fP') (see also ''\fB-o\fP'' command-line switch) or discard it +('\fBo\fP') (see also ''\fB\-o\fP'' command-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). .TP .B PageRepost 'x' @@ -1247,17 +1247,17 @@ At startup, \fBtin\fP reads in the confi .BR tin (5)). They contain a list of variables that can be used to configure the way \fBtin\fP works. If it exists, the global configuration file, -\fI${TIN_LIBDIR-NEWSLIBDIR}/tinrc\fR is read. After that, the user's own -configuration file is read from \fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR. The +\fI${TIN_LIBDIR\-NEWSLIBDIR}/tinrc\fR is read. After that, the user's own +configuration file is read from \fI${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc\fR. The global file is useful for distributing system-wide defaults to new users who have no private tinrc yet. .PP The variables are user configurable by editing -\fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR directly. Most of them can also be +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc\fR directly. Most of them can also be set in the GLOBAL OPTIONS MENU which is accessed by pressing \fBOptionMenu\fP ('\fBM\fP') at all levels. It allows the user to customize the behavior of \fBtin\fP. The options are saved to the file -\fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR when you exit \fBtin\fP so don't +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc\fR when you exit \fBtin\fP so don't edit the file directly whilst \fBtin\fP is running. .PP In the options menu use the cursor keys in the usual way to move @@ -1276,14 +1276,14 @@ your changes. .PP Here is a full list of all the available variables. The name in braces is the name of the corresponding setting in -\fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc\fR. .TP 4 .B Add posted articles to filter (add_posted_to_filter) If ON add posted articles which start a new thread to filter for highlighting follow-ups. Default is ON. .TP -.B Insert 'User-Agent:'-header (advertising) -Turn ON advertising in header (''User-Agent:''). Default is ON. +.B Insert 'User\-Agent:'-header (advertising) +Turn ON advertising in header (''User\-Agent:''). Default is ON. .TP .B Skip multipart/alternative parts (alternative_handling) If ON strip multipart/alternative messages automatically. Default is ON. @@ -1296,7 +1296,7 @@ The character used to show that an artic .TP .B Character to show returning arts (art_marked_return) The character used to show that an article will return as an unread article -when the group is next entered. Default is '-'. +when the group is next entered. Default is '\-'. .TP .B Character to show selected articles (art_marked_selected) The character used to show that an article/thread is auto-selected (hot). @@ -1341,15 +1341,15 @@ Default is ON. .B Reconnect to server automatically (auto_reconnect) Default is OFF. .TP -.B Use Archive-name: header for save (auto_save) -If ON articles/threads with ''Archive-name:'' in header will be -automatically saved with the Archive-name & part/patch no and post +.B Use Archive\-name: header for save (auto_save) +If ON articles/threads with ''Archive\-name:'' in header will be +automatically saved with the Archive\-name & part/patch no and post processed if \fBpost_process_type\fP is set to something other than 'No'. Default is OFF. .TP .B Save articles in batch mode (batch_save) If set ON articles/threads will be saved in batch mode when save -\&''\fB-S\fP'' or mail ''\fB-M\fP, \fB-N\fP'' is specified on the command +\&''\fB\-S\fP'' or mail ''\fB\-M\fP, \fB\-N\fP'' is specified on the command line. Default is ON. .TP .B Show mini menu & posting etiquette (beginner_level) @@ -1398,8 +1398,8 @@ and \fBword_highlight\fP. Color of words emphasized like *this*. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP -.B Color of highlighting with -stroke- (col_markstroke) -Color of words emphasized like -this-. See also \fBword_h_display_marks\fP +.B Color of highlighting with \-stroke\- (col_markstroke) +Color of words emphasized like \-this\-. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP .B Color of mini help menu (col_minihelp) @@ -1505,11 +1505,11 @@ Default for quick (1 key) kill filter he .IP 2,3 ''From:'' .IP 4 - ''Message-ID:'' & full ''References:'' line + ''Message\-ID:'' & full ''References:'' line .IP 5 - ''Message-ID:'' & last ''References:'' entry only + ''Message\-ID:'' & last ''References:'' entry only .IP 6 - ''Message-ID:'' entry only + ''Message\-ID:'' entry only .IP 7 ''Lines:'' .RE @@ -1535,11 +1535,11 @@ Default for quick (1 key) auto-selection .IP 2,3 ''From:'' .IP 4 - ''Message-ID:'' & full ''References:'' line + ''Message\-ID:'' & full ''References:'' line .IP 5 - ''Message-ID:'' & last ''References:'' entry only + ''Message\-ID:'' & last ''References:'' entry only .IP 6 - ''Message-ID:'' entry only + ''Message\-ID:'' entry only .IP 7 ''Lines:'' .RE @@ -1557,15 +1557,15 @@ format. This feature is mainly for use w .BR elm (1) mail program. It allows the user to save articles/threads/groups simply by giving '=' as the filename to save to. -Default is \fI${TIN_HOMEDIR-"$HOME"}/Mail\fR. +Default is \fI${TIN_HOMEDIR\-"$HOME"}/Mail\fR. .TP .B Invocation of your mail command (default_mailer_format) The format string used to create the mailer command with parameters that is used for mailing articles to other people. Default is '%M "%T" < %F' (e.g., /bin/mail "iain" < .article). The flexible format allows other mailers with -different command-line parameters to be used such as 'elm -s "%S" "%T" < -"%F"' (e.g., elm -s "subject" "iain" < .article) or 'sendmail -oi -oem -t < -%F' (e.g. sendmail -oi -oem -t < .article). +different command-line parameters to be used such as 'elm \-s "%S" "%T" < +"%F"' (e.g., elm \-s "subject" "iain" < .article) or 'sendmail \-oi \-oem \-t < +%F' (e.g. sendmail \-oi \-oem \-t < .article). .TP .B (default_move_group) .TP @@ -1600,7 +1600,7 @@ System Administrator. .TP .B Directory to save arts/threads in (default_savedir) Directory where articles/threads are saved. Default is -\fI${TIN_HOMEDIR-"$HOME"}/News\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/News\fR. .TP .B (default_select_pattern) .TP @@ -1612,14 +1612,14 @@ up to or replying to an article. If the signature will be randomly generated from files that are in the specified directory. If the path starts with a ! the program the path points to will be executed to generate a signature. \fBtin\fP will pass the name of the -current newsgroup as argument to the program. --none will suppress any +current newsgroup as argument to the program. \-\-none will suppress any signature. -Default is \fI${TIN_HOMEDIR-"$HOME"}/.Sig\fR. +Default is \fI${TIN_HOMEDIR\-"$HOME"}/.Sig\fR. .TP .B (default_subject_search) .TP -.B Draw -> instead of highlighted bar (draw_arrow) -Allows groups/articles to be selected by an arrow '->' if set ON or +.B Draw \-> instead of highlighted bar (draw_arrow) +Allows groups/articles to be selected by an arrow '\->' if set ON or by an highlighted bar if set OFF. Default is OFF. .TP .B Force redraw after certain commands (force_screen_redraw) @@ -1632,10 +1632,6 @@ are fetched from the server. If \fBgetar fetching articles from your first unread minus absolute value of \fBgetart_limit\fP. Default is 0, which means no limit. .TP -.B Article recentness time limit (recent_time) -If set to 0, this feature is deactivated, otherwise it means the number of -days. Default is 2. -.TP .B Catchup group using left key (group_catchup_on_exit) If ON catchup group when leaving with the left arrow key. Default is ON. .TP @@ -1655,8 +1651,8 @@ article viewer. Default is 'No'. .B External inews (inews_prog) Path, name and options of external .BR inews (1). -If you are reading via NNTP the default value is --internal (use built-in -NNTP inews), else it is "inews -h". The article is passed to +If you are reading via NNTP the default value is \-\-internal (use built-in +NNTP inews), else it is "inews \-h". The article is passed to \fBinews_prog\fP on STDIN via '< article'. .TP .B (info_in_last_line) @@ -1681,9 +1677,9 @@ If ON use inverse video for page headers Default is ON. .TP .B Keep failed arts in ~/dead.articles (keep_dead_articles) -If ON keep all failed postings in \fI${TIN_HOMEDIR-"$HOME"}/dead.articles\fR +If ON keep all failed postings in \fI${TIN_HOMEDIR\-"$HOME"}/dead.articles\fR besides keeping the last failed posting in -\fI${TIN_HOMEDIR-"$HOME"}/dead.article\fR. Default is ON. +\fI${TIN_HOMEDIR\-"$HOME"}/dead.article\fR. Default is ON. .TP .B Filter which articles (kill_level) This option controls the processing and display of articles that are killed. @@ -1726,7 +1722,7 @@ conversion) is performed (i.e., local ch .TP .B Quote line when mailing (mail_quote_format) Format of quote line when replying (via mail) to an article (%A=Address, -%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname, +%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message\-ID, %N=Fullname, %C=Firstname, %I=Initials). Default is "In article %M you wrote:" .TP .B Format of the mailbox (mailbox_format) @@ -1751,7 +1747,7 @@ If ON mark articles that are saved as re Path, name and options of external .BR metamail (1) program used to view non-textual parts of articles. -To use the built-in viewer, set to --internal. This is the default +To use the built-in viewer, set to \-\-internal. This is the default value when .BR metamail (1) is not installed. Leave it blank if you don't want any @@ -1807,8 +1803,8 @@ Character attribute of words emphasized terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP -.B Attribute of highlighting with -stroke- (mono_markstroke) -Character attribute of words emphasized like -this-. It depends on your +.B Attribute of highlighting with \-stroke\- (mono_markstroke) +Character attribute of words emphasized like \-this\-. It depends on your terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP @@ -1819,22 +1815,22 @@ Do not change them unless you understand .B Display these header fields (or *) (news_headers_to_display) Which news headers you wish to see. If you want to see _all_ the headers, place an '*' as this value. This is the only way a wildcard can be used. -If you enter 'X-' as the value, you will see all headers beginning -with 'X-' (like X-Alan or X-Pape). You can list more than one by delimiting +If you enter 'X\-' as the value, you will see all headers beginning +with 'X\-' (like X\-Alan or X\-Pape). You can list more than one by delimiting with spaces. Not defining anything turns off this option. .TP .B Do not display these header fields (news_headers_to_not_display) Same as \fBnews_headers_to_display\fP except it denotes the opposite. An -example of using both options might be if you thought X- headers were A Good +example of using both options might be if you thought X\- headers were A Good Thing(tm), but thought Alan and Pape were miscreants... well then you would do something like this: -\fInews_headers_to_display=X-\fR -\fInews_headers_to_not_display=X-Alan X-Pape\fR. +\fInews_headers_to_display=X\-\fR +\fInews_headers_to_not_display=X\-Alan X\-Pape\fR. Not defining anything turns off this option. .TP .B Quote line when following up (news_quote_format) Format of quote line when posting/following up an article (%A=Address, -%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname, +%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message\-ID, %N=Fullname, %C=Firstname, %I=Initials). Default is "%F wrote:". .TP .B Unicode normalization form (normalization_form) @@ -1900,7 +1896,7 @@ files only. .TP .B Filename to be used for storing posted articles (posted_articles_file) Keep posted articles in -\fI${TIN_HOMEDIR-"$HOME"}/Mail/\fBposted_articles_file\fP\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/Mail/\fBposted_articles_file\fP\fR. If no filename is set then postings will not be saved. Default is 'posted'. .TP @@ -1912,8 +1908,8 @@ the ''Subject:'' and ''From:'' fields ar If ON only save/print/pipe/mail unread articles (tagged articles excepted). Default is OFF. .TP -.B Show empty Followup-To in editor (prompt_followupto) -If ON show empty ''Followup-To:'' header when editing an article. Default is OFF. +.B Show empty Followup\-To in editor (prompt_followupto) +If ON show empty ''Followup\-To:'' header when editing an article. Default is OFF. .TP .B Characters used as quote-marks (quote_chars) The character used in quoting included text to article followups and mail @@ -1945,8 +1941,16 @@ A regular expression that will be applie matching lines are shown in \fBcol_quote3\fP. If \fBquote_regex3\fP is blank, then \fBtin\fP uses a built-in default. .TP +.B Article recentness time limit (recent_time) +If set to 0, this feature is deactivated, otherwise it means the number of +days. Default is 2. +.TP +.B Render BiDi (render_bidi) +If ON \fBtin\fP does the rendering of bi-directional text. If OFF \fBtin\fP +leaves the rendering of bi-directional text to the terminal. Default is OFF. +.TP .B Interval in seconds to reread active (reread_active_file_secs) -The news \fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file is +The news \fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file is reread at regular intervals to show if any new news has arrived. Default is 1200. Setting this to 0 will disable this feature. .TP @@ -1993,12 +1997,12 @@ displayed. .TP .B Show description of each newsgroup (show_description) If ON show a short group description text after newsgroup name at the group -selection level. The ''\fB-d\fP'' command-line flag will override the +selection level. The ''\fB\-d\fP'' command-line flag will override the setting and turn descriptions off. The text used is taken from the -\fI${TIN_LIBDIR-NEWSLIBDIR}/newsgroups\fR file and if supported (requires +\fI${TIN_LIBDIR\-NEWSLIBDIR}/newsgroups\fR file and if supported (requires .B tin to be build with mh-mail-handling support) from -\fI${TIN_HOMEDIR-"$HOME"}/.tin/mailgroups\fR for mailgroups. Default is ON. +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/mailgroups\fR for mailgroups. Default is ON. .TP .B Show lines/score in listings (show_info) Which information about the thread or article should be shown. Default is 1, @@ -2030,7 +2034,7 @@ is OFF. If OFF don't show signatures when displaying articles. Default is ON. .TP -.B Prepend signature with '\en-- \en' (sigdashes) +.B Prepend signature with '\en\-\- \en' (sigdashes) If ON prepend the signature with sigdashes. Default is ON. .TP .B Add signature when reposting (signature_repost) @@ -2115,7 +2119,7 @@ display when reading on a slow terminal .TP .B Remove bogus groups from newsrc (strip_bogus) Bogus groups are groups that are present in your -\fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR file that no longer exist on the news +\fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR file that no longer exist on the news server. There are 3 options. 0 means do nothing & always keep bogus groups. 1 means bogus groups will be permanently removed. 2 means that bogus groups will appear on the Group Selection Menu, prefixed with a 'D'. This allows @@ -2124,9 +2128,9 @@ Keep). .TP .B No unsubscribed groups in newsrc (strip_newsrc) If ON, then unsubscribed groups will be permanently removed from your -\fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR file. Default is OFF. +\fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR file. Default is OFF. .TP -.B Regex used to highlight -strokes- (strokes_regex) +.B Regex used to highlight \-strokes\- (strokes_regex) A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. If \fBstrokes_regex\fP is blank, then \fBtin\fP uses a built-in default. @@ -2149,7 +2153,7 @@ toggled in the article viewer via \fBPag Defines which threading method to use. It's possible to set the threading type on a per group basis by setting the group attribute variable \fBthread_arts\fP to 0 - 4 in the file -\fI${TIN_HOMEDIR-"$HOME"}/.tin/attributes\fR. (See also "GROUP ATTRIBUTES".) +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/attributes\fR. (See also "GROUP ATTRIBUTES".) The default is Both Subject and References. The choices are: .RS +.5i @@ -2218,10 +2222,10 @@ Allows the mouse key support in a to be enabled/disabled. Default is OFF. .TP -.B Use slrnface to show ''X-Face:''s (use_slrnface) +.B Use slrnface to show ''X\-Face:''s (use_slrnface) If enabled \fBtin\fP uses .BR slrnface (1) -to interpret the ''X-Face:'' header. For this option to have any effect, +to interpret the ''X\-Face:'' header. For this option to have any effect, \fBtin\fP must be running in an .BR xterm (1x) and @@ -2275,15 +2279,15 @@ width. .TP .B Quote line when cross-posting (xpost_quote_format) Format is the same as for \fBnews_quote_format\fP, this is used when -answering to a crossposting to several groups with no ''Followup-To:'' +answering to a crossposting to several groups with no ''Followup\-To:'' set. .\" .\" .SS "GROUP ATTRIBUTES" \fBtin\fP allows certain attributes to be set on a per group basis. If it exists, the global attributes file, -\fI${TIN_LIBDIR-NEWSLIBDIR}/attributes\fR is read. After that, the user's -own attributes file \fI${TIN_HOMEDIR-"$HOME"}/.tin/attributes\fR is read. +\fI${TIN_LIBDIR\-NEWSLIBDIR}/attributes\fR is read. After that, the user's +own attributes file \fI${TIN_HOMEDIR\-"$HOME"}/.tin/attributes\fR is read. The global attributes file is useful for distributing system-wide defaults to new users who have no private attributes file yet. A later version will provide a menu interface to set all the attributes. At present you will have @@ -2307,7 +2311,7 @@ you specify. This can be anything from t of lines in an article. .PP When \fBtin\fP starts up the user's kill-file -\fI${TIN_HOMEDIR-"$HOME"}/.tin/filter\fR (see also +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/filter\fR (see also .BR tin (5)) is read. Each time a newsgroup is entered the rules are applied and articles killed or selected when they meet certain criteria. @@ -2318,7 +2322,7 @@ setting. By default killed articles will auto-selection rule are marked with a ''*''. .PP Filtering rules can be manually entered into -\fI${TIN_HOMEDIR-"$HOME"}/.tin/filter\fR (but don't do this whilst running +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/filter\fR (but don't do this whilst running \fBtin\fP else you will lose your changes) or by using an on-screen menu within \fBtin\fP. .PP @@ -2384,7 +2388,7 @@ again via \fBPostEdit\fP ('\fBe\fP') or When posting a followup to an article or replying direct to the author of an article via email the text of the article can be quoted. The beginning of the quoted text can contain information about the quoted article (e.g., Name -and the Message-ID of the article). To allow for different situations +and the Message\-ID of the article). To allow for different situations certain information from the article can be used in the quoted string. The following variables are expanded if found in the tinrc variables \fBmail_quote_format\fP, \fBnews_quote_format\fP or \fBxpost_quote_format\fP: @@ -2395,7 +2399,7 @@ following variables are expanded if foun \fB%D\fP Date \fB%F\fP Full address (%N <%A>) \fB%G\fP Groupname -\fB%M\fP Message-ID +\fB%M\fP Message\-ID \fB%N\fP Fullname of author \fB%C\fP Firstname of author \fB%I\fP Initials of author @@ -2473,15 +2477,15 @@ via \fBpost_process_type\fP. .\" .\" .SS "AUTOMATIC MAILING AND SAVING NEW NEWS" -\fBtin\fP allows new/unread news articles to be mailed (''\fB-M\fP'' and -\&''\fB-N\fP'' option) or saved (''\fB-S\fP'' option) in batch mode for later +\fBtin\fP allows new/unread news articles to be mailed (''\fB\-M\fP'' and +\&''\fB\-N\fP'' option) or saved (''\fB\-S\fP'' option) in batch mode for later reading. Useful when going on holiday and you don't want to return and find that expire has removed a whole load of unread articles. Best to run via .BR cron (1) everyday while away, after which you will be mailed a report of which articles were mailed/saved from which newsgroups and the total number of articles mailed/saved. Articles are saved in a private news structure under -your directory (default is \fI${TIN_HOMEDIR-"$HOME"}/News\fR). Be +your directory (default is \fI${TIN_HOMEDIR\-"$HOME"}/News\fR). Be careful of using this option if you read a lot of groups because you could overflow your file system. .PP @@ -2493,18 +2497,18 @@ then set \fBbatch_save\fP to ON in tinrc you don't want using attributes. .PP .TP 2i -.B tin -M iain -c -f newsrc.mail +.B tin \-M iain \-c \-f newsrc.mail (mail any unread articles in newsgroups specified in file newsrc.mail to the local user iain and mark them as read) .PP .TP 2i -.B tin -S -c -f newsrc.save +.B tin \-S \-c \-f newsrc.save (save any unread articles in newsgroups specified in file newsrc.save and mark them as read) .PP .TP 2i -.B tin -R -(read any articles saved by \fBtin -S\fP) +.B tin \-R +(read any articles saved by \fBtin \-S\fP) .\" .\" .SS RANGES @@ -2541,15 +2545,15 @@ examples. .\" .SS SIGNATURES \fBtin\fP will recognize a signature in either -\fI${TIN_HOMEDIR-"$HOME"}/.signature\fR or \fI${TIN_HOMEDIR-"$HOME"}/.Sig\fR. -If \fI${TIN_HOMEDIR-"$HOME"}/.signature\fR exists, then the signature +\fI${TIN_HOMEDIR\-"$HOME"}/.signature\fR or \fI${TIN_HOMEDIR\-"$HOME"}/.Sig\fR. +If \fI${TIN_HOMEDIR\-"$HOME"}/.signature\fR exists, then the signature will be pulled into the editor for mail commands only. A signature in -\fI${TIN_HOMEDIR-"$HOME"}/.signature\fR will not be pulled into the +\fI${TIN_HOMEDIR\-"$HOME"}/.signature\fR will not be pulled into the editor for posting commands since .BR inews (1) will append the signature itself. .PP -A signature in \fI${TIN_HOMEDIR-"$HOME"}/.Sig\fR will be pulled into the +A signature in \fI${TIN_HOMEDIR\-"$HOME"}/.Sig\fR will be pulled into the editor for both posting and mailing commands. .PP The following is an example of a \fI.Sig\fR file: @@ -2599,7 +2603,7 @@ the is resized. .PP \fBtin\fP will reread the -\fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file at set +\fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file at set intervals (\fBreread_active_file_secs\fP) to show any newly arrived news. .PP If you find large number of new newsgroups cluttering up your screen, @@ -2684,7 +2688,7 @@ Note that this cache can use up large am read a lot of groups and/or high traffic groups. .PP Each user creates/updates his/her own index files that are stored in -\fI${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news/\fR. If +\fI${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news/\fR. If you are reading via NNTP then the news server name will be appended to keep the indexes for different servers separate. If you are reading off the local spool and local overview files already exist @@ -2695,19 +2699,19 @@ turning on caching will have little or n Entering a group the first time tends to be slow because the index file must be built from scratch. To alleviate the slowness start \fBtin\fP to create all index files for the groups you subscribe to -with \fBtin -u -v\fP and go for a coffee. Subsequent readings of a +with \fBtin \-u \-v\fP and go for a coffee. Subsequent readings of a group will only need to do incremental updating of the index file and will be much faster as only new articles will need to be cached. .PP As indexing might take some time you may want to run \fBtin\fP form the system batcher .BR cron (1) -with the ''\fB-u\fP'' option: +with the ''\fB\-u\fP'' option: .PP .RS .nf .ft CW -30 6 * * * /usr/local/bin/tin -u +30 6 * * * /usr/local/bin/tin \-u .ft P .fi .RE @@ -2720,8 +2724,8 @@ with something like: .RS .nf .ft CW -find ${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news* \\ --type f -name "[0-9]*.[0-9]" -atime +28 | xargs rm -f +find ${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news* \\ +\-type f \-name "[0\-9]*.[0\-9]" \-atime +28 | xargs rm \-f .ft P .fi .RE @@ -2735,7 +2739,7 @@ For a detailed description see .PP .IR $MAILCAPS .br -.IR ${TIN_HOMEDIR-"$HOME"}/.mailcap +.IR ${TIN_HOMEDIR\-"$HOME"}/.mailcap .br .IR /etc/mailcap .br @@ -2749,87 +2753,87 @@ For a detailed description see .IR /etc/nntpserver .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.cancelsecret +.IR ${TIN_HOMEDIR\-"$HOME"}/.cancelsecret .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.mime.types +.IR ${TIN_HOMEDIR\-"$HOME"}/.mime.types .br .IR /etc/mime.types .br .IR /etc/tin/mime.types .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.newsauth +.IR ${TIN_HOMEDIR\-"$HOME"}/.newsauth .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.newsrc +.IR ${TIN_HOMEDIR\-"$HOME"}/.newsrc .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/.oldnewsrc +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/.oldnewsrc .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.signature +.IR ${TIN_HOMEDIR\-"$HOME"}/.signature .br -.IR ${TIN_HOMEDIR-"$HOME"}/.Sig +.IR ${TIN_HOMEDIR\-"$HOME"}/.Sig .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.sigfixed +.IR ${TIN_HOMEDIR\-"$HOME"}/.sigfixed .PP .IR ${TIN_HOMEDIR-"$HOME"}/.tin/.inputhistory .PP -.IR ${TIN_INDEX_MAILDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.mail/ +.IR ${TIN_INDEX_MAILDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.mail/ .PP -.IR ${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news/ +.IR ${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news/ .PP -.IR ${TIN_INDEX_SAVEDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.save/ +.IR ${TIN_INDEX_SAVEDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.save/ .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/active.mail +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/active.mail .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/active.save +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/active.save .PP -.\" .IR ${TIN_LIBDIR-NEWSLIBDIR}/attributes +.\" .IR ${TIN_LIBDIR\-NEWSLIBDIR}/attributes .IR /etc/tin/attributes .br -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/attributes +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/attributes .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/filter +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/filter .PP -.IR /etc/tin/keymap${${LC_ALL-"${LC_CTYPE-"${LC_MESSAGES-"$LANG"}"}"}:+".${LC_ALL-"${LC_CTYPE-"${LC_MESSAGES-"$LANG"}"}"}"} +.IR /etc/tin/keymap${${LC_ALL\-"${LC_CTYPE\-"${LC_MESSAGES\-"$LANG"}"}"}:+".${LC_ALL\-"${LC_CTYPE\-"${LC_MESSAGES\-"$LANG"}"}"}"} .br -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/keymap${${LC_ALL-"${LC_CTYPE-"${LC_MESSAGES-"$LANG"}"}"}:+".${LC_ALL-"${LC_CTYPE-"${LC_MESSAGES-"$LANG"}"}"}"} +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/keymap${${LC_ALL\-"${LC_CTYPE\-"${LC_MESSAGES\-"$LANG"}"}"}:+".${LC_ALL\-"${LC_CTYPE\-"${LC_MESSAGES\-"$LANG"}"}"}"} .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/mailgroups +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/mailgroups .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/newsrctable +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/newsrctable .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/posted +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/posted .PP -.IR ${TIN_HOMEDIR-"$HOME"}/Mail/posted +.IR ${TIN_HOMEDIR\-"$HOME"}/Mail/posted .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/postponed.articles +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/postponed.articles .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/$NNTPSERVER:${NNTPPORT+":$NNTPPORT"}/serverrc +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/$NNTPSERVER:${NNTPPORT+":$NNTPPORT"}/serverrc .PP -.\" .IR ${TIN_LIBDIR-NEWSLIBDIR}/tinrc +.\" .IR ${TIN_LIBDIR\-NEWSLIBDIR}/tinrc .IR /etc/tin/tinrc .br -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/tinrc +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc .PP .IR /etc/tin/tin.defaults @@ -2838,22 +2842,22 @@ For a detailed description see .IR /usr/local/share/locale/${LC_MESSAGES}/LC_MESSAGES/tin.mo .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active} +.IR ${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active} .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/active.times +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/active.times .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/newsgroups +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/newsgroups .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/organization +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/organization .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/overview.fmt +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/overview.fmt .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/subscriptions +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/subscriptions .PP .\" .\" @@ -2886,19 +2890,19 @@ Define this variable if you do not want .TP .B TIN_INDEX_NEWSDIR Define this variable if you do not want the \fI.news\fR directory in -\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's news index files in \fI/tmp/.news\fR you would set $\fBTIN_INDEX_NEWSDIR\fP to \fI/tmp\fR. .TP .B TIN_INDEX_MAILDIR Define this variable if you do not want the \fI.mail\fR directory in -\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's mail index files in \fI/tmp/.mail\fR you would set $\fBTIN_INDEX_MAILDIR\fP to \fI/tmp\fR. .TP .B TIN_INDEX_SAVEDIR Define this variable if you do not want the \fI.save\fR directory in -\fI${TIN_HOMEDIR-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/\fR. E.g., if you want all \fBtin\fP's save index files in \fI/tmp/.save\fR you would set $\fBTIN_INDEX_SAVEDIR\fP to \fI/tmp\fR. .TP @@ -2926,14 +2930,14 @@ is prepended to $\fBTIN_ACTIVEFILE\fP. .TP .B NNTPSERVER The default NNTP server to remotely read news from. This variable only -needs to be set if the ''\fB-r\fP'' command-line option is specified and -the file \fI/etc/nntpserver\fR does not exist. The ''\fB-g\fP'' command +needs to be set if the ''\fB\-r\fP'' command-line option is specified and +the file \fI/etc/nntpserver\fR does not exist. The ''\fB\-g\fP'' command line option overrides $\fBNNTPSERVER\fP. .TP .B NNTPPORT The NNTP TCP-port to read news from. This variable only needs to be set if the TCP-port is not 119 (the default). -The ''\fB-p\fP'' command-line option overrides $\fBNNTPPORT\fP. +The ''\fB\-p\fP'' command-line option overrides $\fBNNTPPORT\fP. .TP .B DISTRIBUTION Set the article header field ''Distribution:'' to the contents of the @@ -2953,7 +2957,7 @@ instead of $\fBORGANIZATION\fP. DomainOS specific, same as $\fBORGANIZATION\fP on other OSs (see above). .TP .B REPLYTO -Set the article header field ''Reply-To:'' to the return address specified +Set the article header field ''Reply\-To:'' to the return address specified by the variable. This is useful if you wish to receive replies at a different address. .TP @@ -2985,7 +2989,7 @@ This variable has precedence over the de .BR vi (1)) that is used in all editing operations within \fBtin\fP (e.g., posting, replying, follow-ups, ...). Evaluation order is -\fI${VISUAL-"${EDITOR-vi}"}\fR. See +\fI${VISUAL\-"${EDITOR\-vi}"}\fR. See .BR environ (5) for more infos. .TP @@ -3009,7 +3013,7 @@ syntax. For example, setting will automatically subscribe the user to all new groups in the comp.os.unix hierarchy, and all talk groups other than talk.politics groups (which will be queried for as usual). Of course this does not work if \fBtin\fP -is started with the ''\fB-X\fP'' command-line switch. +is started with the ''\fB\-X\fP'' command-line switch. .TP .B AUTOUNSUBSCRIBE Is handled like the $\fBAUTOSUBSCRIBE\fP variable, but groups matching the @@ -3169,7 +3173,7 @@ trouble with any of the mentioned server NUM_SIMULTANEOUS_GROUP_COMMAND to 1 in active.c and recompile. See also the TODO-file which comes with the source. .br -Before mailing a bug-report to please check if you +Before mailing a bug-report to please check if you are using the latest (stable) release, and if not, please upgrade first! Have a look a the doc/TODO file for known bugs. If you still think you've found a bug, please use the \fB*BugReport\fP ('\fBR\fP') diff -Nurp tin-1.7.4/doc/tin.5 tin-1.7.5/doc/tin.5 --- tin-1.7.4/doc/tin.5 2004-02-04 11:42:12.000000000 +0100 +++ tin-1.7.5/doc/tin.5 2004-06-01 18:14:38.000000000 +0200 @@ -2,10 +2,10 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2003-01-12 +.\" Updated : 2004-05-31 .\" Notes : needs a some work .\" -.TH tin 5 "January 12th, 2004" "1.7.4" "A Usenet newsreader" +.TH tin 5 "May 31st, 2004" "1.7.5" "A Usenet newsreader" .SH NAME tin, rtin \- related files @@ -26,7 +26,7 @@ newsreader. .PP .IR $MAILCAPS .br -.IR ${TIN_HOMEDIR-"$HOME"}/.mailcap +.IR ${TIN_HOMEDIR\-"$HOME"}/.mailcap .br .IR /etc/mailcap .br @@ -49,7 +49,7 @@ Each individual mailcap entry consists o command to execute, and (possibly) a set of optional "flag" values. .sp The "type" field is simply any legal content type name. It is the string -that will be matched against the "Content-Type" header to decide if this is +that will be matched against the "Content\-Type" header to decide if this is the mailcap entry that matches the current message. Additionally, the type field may specify a subtype or a wildcard to match all subtypes. .sp @@ -120,7 +120,7 @@ since a test can call a program, it can .TP .B needsterminal The "needsterminal" field indicates that the view-command must be run on an -interactive terminal. This is needed to inform window- oriented user agents +interactive terminal. This is needed to inform window-oriented user agents that an interactive terminal is needed. (The decision is not left exclusively to the view-command because in some circumstances it may not be possible for such programs to tell whether or not they are on interactive @@ -176,7 +176,7 @@ Example: image/*;\\ .br .in +.3i -xv -8 -geometry +0 '%s';\\ +xv \-8 \-geometry +0 '%s';\\ .br description=%{name} %t-Image;\\ .br @@ -188,15 +188,15 @@ nametemplate=%s.IMAGE message/rfc822;\\ .br .in +.3i -if test -x /usr/bin/less \\;\\ +if test \-x /usr/bin/less \\;\\ .in +.3i then less '%s' \\;\\ else more '%s' \\; fi;\\ .in -.3i .br -edit=${EDITOR-vi} '%s';\\ +edit=${EDITOR\-vi} '%s';\\ .br -compose=${EDITOR-vi} '%s';\\ +compose=${EDITOR\-vi} '%s';\\ .br print=a2ps %s;\\ .br @@ -211,20 +211,20 @@ needsterminal .sp .RS default NNTP-server to read news from if not reading from the local spool. -\&'\fB-g\fP \fIserver\fR', $\fBNNTPSERVER\fP have higher priority (in +\&'\fB\-g\fP \fIserver\fR', $\fBNNTPSERVER\fP have higher priority (in that order), the default server given at compile time has lower priority. .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.cancelsecret +.IR ${TIN_HOMEDIR\-"$HOME"}/.cancelsecret .sp .RS secret to be used for canlocks .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.mime.types +.IR ${TIN_HOMEDIR\-"$HOME"}/.mime.types .br .IR /etc/mime.types .br @@ -235,7 +235,7 @@ mime type / filename extension pairs .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.newsauth +.IR ${TIN_HOMEDIR\-"$HOME"}/.newsauth .sp .RS "\fInntpserver\fR \fIpassword\fR [\fIuser\fR]" pairs for NNTP servers @@ -264,10 +264,10 @@ news.example.net news guest .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.newsrc +.IR ${TIN_HOMEDIR\-"$HOME"}/.newsrc .sp .RS -"\fInewsgroup\fR\fIflag\fR [\fIarticle\fR[,\fIarticle\fR | -\fIarticle\fR]...]" lines. +"\fInewsgroup\fR\fIflag\fR [\fIarticle\fR[,\fIarticle\fR | \-\fIarticle\fR]...]" lines. .TP .B newsgroup the name of the newsgroup. @@ -283,67 +283,67 @@ Example: .RS # sample .newsrc file .br -news.software.b! 1-666,669 +news.software.b! 1\-666,669 .br -news.software.nntp: 1-13245,13247,13249 +news.software.nntp: 1\-13245,13247,13249 .br -news.software.readers: 1-19567,19571-19597 +news.software.readers: 1\-19567,19571\-19597 .RE .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/.oldnewsrc +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/.oldnewsrc .sp .RS -backup of \fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR +backup of \fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.signature +.IR ${TIN_HOMEDIR\-"$HOME"}/.signature .br -.IR ${TIN_HOMEDIR-"$HOME"}/.Sig +.IR ${TIN_HOMEDIR\-"$HOME"}/.Sig .sp .RS signature .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.sigfixed +.IR ${TIN_HOMEDIR\-"$HOME"}/.sigfixed .sp .RS fixed part of a randomly generated signature .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/.inputhistory +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/.inputhistory .sp .RS history of last used strings .RE .PP -.IR ${TIN_INDEX_MAILDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.mail/ +.IR ${TIN_INDEX_MAILDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.mail/ .sp .RS mailgroups index files .RE .PP -.IR ${TIN_INDEX_NEWSDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.news/ +.IR ${TIN_INDEX_NEWSDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.news/ .sp .RS newsgroups index files .RE .PP -.IR ${TIN_INDEX_SAVEDIR-"${TIN_HOMEDIR-"$HOME"}/.tin"}/.save/ +.IR ${TIN_INDEX_SAVEDIR\-"${TIN_HOMEDIR\-"$HOME"}/.tin"}/.save/ .sp .RS saved newsgroups index files .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/active.mail +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/active.mail .sp .RS active file ("\fImail_group_name\fR \fImaxnum\fR \fIminnum\fR @@ -377,10 +377,10 @@ They are accessed via /home/foo/Mail/inb .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/active.save +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/active.save .sp .RS -active file of user's saved newsgroups, used by \fBtin -R\fP. +active file of user's saved newsgroups, used by \fBtin \-R\fP. .RE .PP @@ -390,11 +390,11 @@ active file of user's saved newsgroups, .\" ${TIN_LIBDIR-/news/etc"}/attributes .IR /etc/tin/attributes .br -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/attributes +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/attributes .sp .RS The group attributes files may be used to override some global settings from -\fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR on a per group basis. Order is +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc\fR on a per group basis. Order is important as last match counts; this allows to refine attributes for narrowed scopes. Note that the \fIscope=\fR line has to be specified before the attributes are specified for that list. All attributes @@ -434,7 +434,7 @@ Mailbox to save sent mails. The format o via the tinrc \fBmailbox_format\fP variable. .TP .B followup_to -Set ''Followup-To:''-header to the specified group(s). +Set ''Followup\-To:''-header to the specified group(s). .TP .B from Identical to the tinrc variable \fBmail_address\fP @@ -446,6 +446,21 @@ Identical to the tinrc variable \fBdefau Used when a group is a mailing list. All responses to the group will be directed to this email address instead .TP +.B mime_forward +Determines whether usenet articles are forwarded as attachment or +inline. When set to OFF, the forwarded article will be included in +the body of the mail, while setting this variable to ON will cause +the article to be attached as a separate MIME part. Enabling +\fBmime_forward\fP is particularly useful for articles consisting of +multiple MIME parts such as PGP/MIME signed messages or being encoded +in a different character set than your local one. It is also useful +if the receiver should be able to operate on the entire forwarded +article (i.e., view or save it without your comments). On the other +hand, if you want to forward only some parts of the article or to +insert 'inline' annotations, you might want to disable this option. +Please note that for this option to have effect, the tinrc variable +\fBinteractive_mailer\fP has to be set to 0 (which is the default). +.TP .B mime_types_to_save A comma separated list of MIME major/minor Content-Types that will be saved when using the view/save and save/autosave features. @@ -505,7 +520,7 @@ string starts with a / or ~ then it is a containing the text to insert. .TP .B x_comment_to -Insert ''X-Comment-To:''-header, this is only useful in FIDO groups. +Insert ''X\-Comment\-To:''-header, this is only useful in FIDO groups. .TP .B x_headers A string including header-name and the contents of the header that will @@ -548,7 +563,7 @@ Identical to the tinrc variable \fBdefau .B ispell Path and options for .BR ispell (1)-like -spell-checker, e.g. "aspell --mode=email --dont-backup check" +spell-checker, e.g. "aspell \-\-mode=email \-\-dont\-backup check" .TP .B mm_network_charset Identical to the tinrc variable of the same name @@ -560,31 +575,31 @@ with working .BR iconv (3), others might have to compile .BR tin (1) -with --disable-mime-strict-charset. +with \-\-disable\-mime\-strict\-charset. .PP .TP Example: .RS .nf # include extra headers -# assume ISO-8859-1 as charset if no charset is declared +# assume ISO\-8859\-1 as charset if no charset is declared scope=* x_headers=~/.tin/headers -undeclared_charset=ISO-8859-1 +undeclared_charset=ISO\-8859\-1 # in *sources* set post process type to shar only scope=*sources* post_proc_type=1 # in *binaries* turn on full post processing, -# remove tmp files and set Followup-To: poster +# remove tmp files and set Followup\-To: poster scope=*binaries* post_proc_type=2 delete_tmp_files=ON followup_to=poster # in fido.* newsgroups change quote_chars -# and add X-Comment-To: line +# and add X\-Comment\-To: line scope=fido.* quote_chars=%s>_ x_comment_to=ON @@ -592,19 +607,19 @@ x_comment_to=ON # in *.test newsgroups, don't append signature # and preset Subject scope=*.test -sigfile=--none -x_headers=Subject: test - ignore - no reply +sigfile=\-\-none +x_headers=Subject: test \- ignore \- no reply -# assume ISO-2022-JP-2 as charset +# assume ISO\-2022\-JP\-2 as charset scope=fj.*,japan.* -undeclared_charset=ISO-2022-JP-2 +undeclared_charset=ISO\-2022\-JP\-2 .fi .RE .RE .PP .\" TODO: add missing descriptions and explain things in detail. -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/filter +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/filter .sp .RS The filter file is used to assign scores to certain articles. Based on the @@ -642,13 +657,13 @@ of ''John Doe '', bef the filter rule. .TP .B msgid -Match against ''Message-ID:'' and full ''References:'' +Match against ''Message\-ID:'' and full ''References:'' .TP .B msgid_last -Match against ''Message-ID:'' and last ''References:'' entry only +Match against ''Message\-ID:'' and last ''References:'' entry only .TP .B msgid_only -Match against ''Message-ID:'' +Match against ''Message\-ID:'' .TP .B refs_only Match against ''References:'' @@ -679,15 +694,15 @@ group=* type=1 case=1 score=hot -subj=\\b(cd|[rk]?)?tin(d|pre)?[-.0-9]*\\b +subj=\\b(cd|[rk]?)?tin(d|pre)?[\-.0\-9]*\\b .fi .RE .RE .PP -.IR /etc/tin/keymap${${LC_ALL-"${LC_CTYPE-"${LC_MESSAGES-"$LANG"}"}"}:+".${LC_ALL-"${LC_CTYPE-"${LC_MESSAGES-"$LANG"}"}"}"} +.IR /etc/tin/keymap${${LC_ALL\-"${LC_CTYPE\-"${LC_MESSAGES\-"$LANG"}"}"}:+".${LC_ALL\-"${LC_CTYPE\-"${LC_MESSAGES\-"$LANG"}"}"}"} .br -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/keymap${${LC_ALL-"${LC_CTYPE-"${LC_MESSAGES-"$LANG"}"}"}:+".${LC_ALL-"${LC_CTYPE-"${LC_MESSAGES-"$LANG"}"}"}"} +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/keymap${${LC_ALL\-"${LC_CTYPE\-"${LC_MESSAGES\-"$LANG"}"}"}:+".${LC_ALL\-"${LC_CTYPE\-"${LC_MESSAGES\-"$LANG"}"}"}"} .\" sorry that one got a bit complex ,-) .sp .RS @@ -701,7 +716,7 @@ Below is a list of all keynames and thei \fBSetRange\fP # \fBLastPage\fP $ \fBToggleColor\fP & -\fBLastViewed\fP - +\fBLastViewed\fP \- \fBSearchSubjF\fP / \fBSearchSubjB\fP ? \fBSearchAuthB\fP A @@ -933,7 +948,7 @@ Below is a list of all keynames and thei .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/mailgroups +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/mailgroups .sp .RS This file provides short descriptions of each mailgroup. (requires @@ -949,11 +964,11 @@ is a short single-line description of th .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/newsrctable +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/newsrctable .sp .RS "\fInntpserver\fR \fInewsrc\fR [\fIshortname\fR [\fI...\fR]]" -pairs to use with the ''\fB-g\fP'' command-line switch. +pairs to use with the ''\fB\-g\fP'' command-line switch. .TP .B nntpserver full qualified domain name of the newsserver. @@ -968,21 +983,21 @@ Example: .RS # sample newsrctable file .br -news.tin.org .newsrc-tin.org tinorg +news.tin.org .newsrc\-tin.org tinorg .br -news.ka.nu /tmp/nrc-nu kanu nu +news.ka.nu /tmp/nrc\-nu kanu nu .RE .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/posted +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/posted .sp .RS posting history .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/Mail/posted +.IR ${TIN_HOMEDIR\-"$HOME"}/Mail/posted .sp .RS Copy of all posted articles in @@ -992,7 +1007,7 @@ format. The filename can be changed by s .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/postponed.articles +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/postponed.articles .sp .RS Pool of postponed articles. This file is in @@ -1001,7 +1016,7 @@ format. .RE .PP -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/serverrc +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/$NNTPSERVER${NNTPPORT+":$NNTPPORT"}/serverrc .sp .RS File to store $\fBNNTPSERVER\fP and $\fBNNTPPORT\fP related @@ -1025,7 +1040,7 @@ to keep track of new newsgroups on the s .\" .IR ${TIN_LIBDIR-"/news/etc"}/tinrc .IR /etc/tin/tinrc .br -.IR ${TIN_HOMEDIR-"$HOME"}/.tin/tinrc +.IR ${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc .sp .RS At startup, @@ -1034,8 +1049,8 @@ reads in the configuration file. This co "\fIvariable\fR=\fIvalue\fR" pairs that can be used to configure the way .BR tin (1) works. If it exists, the global configuration file, -\fI${TIN_LIBDIR}-NEWSLIBDIR}/tinrc\fR is read first. After that, the -users own configuration file \fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR is read. +\fI${TIN_LIBDIR}\-NEWSLIBDIR}/tinrc\fR is read first. After that, the +users own configuration file \fI${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc\fR is read. The global file is useful for distributing system-wide defaults to new users who have no private tinrc yet (see also \fB/etc/tin/tin.defaults\fP). .TP @@ -1044,7 +1059,7 @@ If ON add posted articles which start a highlighting follow-ups. Default is ON. .TP .B advertising -Turn ON advertising in header (''User-Agent:''). Default is ON. +Turn ON advertising in header (''User\-Agent:''). Default is ON. .TP .B alternative_handling If ON strip multipart/alternative messages automatically. Default is ON. @@ -1057,7 +1072,7 @@ The character used to show that an artic .TP .B art_marked_return The character used to show that an article will return as an unread article -when the group is next entered. Default is '-'. +when the group is next entered. Default is '\-'. .TP .B art_marked_selected The character used to show that an article/thread is auto-selected (hot). @@ -1105,14 +1120,14 @@ Default is ON. Reconnect to server automatically. Default is OFF. .TP .B auto_save -If ON articles/threads with ''Archive-name:'' in header will be +If ON articles/threads with ''Archive\-name:'' in header will be automatically saved with the Archive-name & part/patch no and post processed if \fBpost_process_type\fP is set to something other than 'No'. Default is OFF. .TP .B batch_save If set ON articles/threads will be saved in batch mode when save -\&''\fB-S\fP'' or mail ''\fB-M\fP, \fB-N\fP'' is specified on the command +\&''\fB\-S\fP'' or mail ''\fB\-M\fP, \fB\-N\fP'' is specified on the command line. Default is ON. .TP .B beginner_level @@ -1160,7 +1175,7 @@ Color of words emphasized like *this*. S and \fBword_highlight\fP. .TP .B col_markstroke -Color of words emphasized like -this-. See also \fBword_h_display_marks\fP +Color of words emphasized like \-this\-. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP .B col_minihelp @@ -1267,11 +1282,11 @@ Default for quick (1 key) kill filter he .IP 2,3 ''From:'' .IP 4 - ''Message-ID:'' & full ''References:'' line + ''Message\-ID:'' & full ''References:'' line .IP 5 - ''Message-ID:'' & last ''References:'' entry only + ''Message\-ID:'' & last ''References:'' entry only .IP 6 - ''Message-ID:'' entry only + ''Message\-ID:'' entry only .IP 7 ''Lines:'' .RE @@ -1296,11 +1311,11 @@ Default for quick (1 key) auto-selection .IP 2,3 ''From:'' .IP 4 - ''Message-ID:'' & full ''References:'' line + ''Message\-ID:'' & full ''References:'' line .IP 5 - ''Message-ID:'' & last ''References:'' entry only + ''Message\-ID:'' & last ''References:'' entry only .IP 6 - ''Message-ID:'' entry only + ''Message\-ID:'' entry only .IP 7 ''Lines:'' .RE @@ -1318,15 +1333,15 @@ format. This feature is mainly for use w .BR elm (1) mail program. It allows the user to save articles/threads/groups simply by giving '=' as the filename to save to. Default is -\fI${TIN_HOMEDIR-"$HOME"}/Mail\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/Mail\fR. .TP .B default_mailer_format The format string used to create the mailer command with parameters that is used for mailing articles to other people. Default is '%M "%T" < %F' (e.g., /bin/mail "iain" < .article). The flexible format allows other mailers with -different command line parameters to be used such as 'elm -s "%S" "%T" < -"%F"' (e.g., elm -s "subject" "iain" < .article) or 'sendmail -oem -t < %F' -(e.g. sendmail -oem -t < .article). +different command line parameters to be used such as 'elm \-s "%S" "%T" < +"%F"' (e.g., elm \-s "subject" "iain" < .article) or 'sendmail \-oem \-t < %F' +(e.g. sendmail \-oem \-t < .article). .\" TODO: document %S, %T, %M, %F, %U ... .TP .B default_move_group @@ -1363,7 +1378,7 @@ may have been disabled by the System Adm .TP .B default_savedir Directory where articles/threads are saved. Default is -\fI${TIN_HOMEDIR-"$HOME"}/News\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/News\fR. .TP .B default_select_pattern .TP @@ -1377,13 +1392,13 @@ directory. If the path starts with a ! t be executed to generate a signature. .BR tin (1) will pass the name of the current newsgroup as argument to the -program. --none will suppress any signature. -Default is \fI${TIN_HOMEDIR-"$HOME"}/.Sig\fR. +program. \-\-none will suppress any signature. +Default is \fI${TIN_HOMEDIR\-"$HOME"}/.Sig\fR. .TP .B default_subject_search .TP .B draw_arrow -Allows groups/articles to be selected by an arrow '->' if set ON or by an +Allows groups/articles to be selected by an arrow '\->' if set ON or by an highlighted bar if set OFF. .TP .B force_screen_redraw @@ -1417,8 +1432,8 @@ Default is 'No'. .B inews_prog Path, name and options of external .BR inews (1). -If you are reading via NNTP the default value is "--internal" (use built-in -NNTP inews), else it is "inews -h". The article is passed to +If you are reading via NNTP the default value is "\-\-internal" (use built-in +NNTP inews), else it is "inews \-h". The article is passed to \fBinews_prog\fP on STDIN via '< article'. .TP .B info_in_last_line @@ -1438,9 +1453,9 @@ If ON use inverse video for page headers Default is ON. .TP .B keep_dead_articles -If ON keep all failed postings in \fI${TIN_HOMEDIR-"$HOME"}/dead.articles\fR +If ON keep all failed postings in \fI${TIN_HOMEDIR\-"$HOME"}/dead.articles\fR besides keeping the last failed posting in -\fI${TIN_HOMEDIR-"$HOME"}/dead.article\fR. Default is ON. +\fI${TIN_HOMEDIR\-"$HOME"}/dead.article\fR. Default is ON. .TP .B kill_level This option controls the processing and display of articles that are @@ -1484,7 +1499,7 @@ conversion) is performed (i.e., local ch .TP .B mail_quote_format Format of quote line when replying (via mail) to an article (%A=Address, -%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname, +%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message\-ID, %N=Fullname, %C=Firstname, %I=Initials). Default is "In article %M you wrote:" .TP .B mailbox_format @@ -1509,7 +1524,7 @@ current thread or article, all tagged, u Path, name and options of external .BR metamail (1) program used to view non-textual parts of articles. -To use the built-in viewer, set to --internal. This is the default +To use the built-in viewer, set to \-\-internal. This is the default value when .BR metamail (1) is not installed. Leave it blank if you don't want any automatic @@ -1566,7 +1581,7 @@ terminal which attributes are usable. Se and \fBword_highlight\fP. .TP .B mono_markstroke -Character attribute of words emphasized like -this-. It is depending on your +Character attribute of words emphasized like \-this\-. It is depending on your terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP @@ -1579,22 +1594,22 @@ what they are for. .B news_headers_to_display Which news headers you wish to see. If you want to see _all_ the headers, place an '*' as this value. This is the only way a wildcard can be used. -If you enter 'X-' as the value, you will see all headers beginning -with 'X-' (like X-Alan or X-Pape). You can list more than one by delimiting +If you enter 'X\-' as the value, you will see all headers beginning +with 'X\-' (like X\-Alan or X\-Pape). You can list more than one by delimiting with spaces. Not defining anything turns off this option. .TP .B news_headers_to_not_display Same as \fBnews_headers_to_display\fP except it denotes the opposite. An -example of using both options might be if you thought X- headers were A Good +example of using both options might be if you thought X\- headers were A Good Thing(tm), but thought Alan and Pape were miscreants... well then you would do something like this: -\fBnews_headers_to_display=X-\fP -\fBnews_headers_to_not_display=X-Alan X-Pape\fP +\fBnews_headers_to_display=X\-\fP +\fBnews_headers_to_not_display=X\-Alan X\-Pape\fP Not defining anything turns off this option. .TP .B news_quote_format Format of quote line when posting/following up an article (%A=Address, -%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname, +%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message\-ID, %N=Fullname, %C=Firstname, %I=Initials). Default is "%F wrote:". .TP .B normalization_form @@ -1667,7 +1682,7 @@ not want to be executed, be careful with .TP .B posted_articles_file Keep posted articles in -\fI${TIN_HOMEDIR-"$HOME"}/Mail/\fBposted_articles_file\fP\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/Mail/\fBposted_articles_file\fP\fR. If no filename is set then postings will not be saved. Default is 'posted'. .TP @@ -1680,7 +1695,7 @@ If ON only save/print/pipe/mail unread a Default is OFF. .TP .B prompt_followupto -If ON show empty ''Followup-To:'' header when editing an article. +If ON show empty ''Followup\-To:'' header when editing an article. Default is OFF. .TP .B quote_chars @@ -1733,8 +1748,12 @@ uses a built-in default. If set to 0, this feature is deactivated, otherwise it means the number of days. Default is 2. .TP +.B render_bidi +If ON \fBtin\fP does the rendering of bi-directional text. If OFF \fBtin\fP +leaves the rendering of bi-directional text to the terminal. Default is OFF. +.TP .B reread_active_file_secs -The news \fI${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active}\fR file +The news \fI${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active}\fR file is reread at regular intervals to show if any new news has arrived. Default is 1200. Setting this to 0 will disable this feature. .TP @@ -1781,12 +1800,12 @@ displayed. .TP .B show_description If ON show a short group description text after newsgroup name at the group -selection level. The ''\fB-d\fP'' command-line flag will override the setting +selection level. The ''\fB\-d\fP'' command-line flag will override the setting and turn descriptions off. The text used is taken from the -\fI${TIN_LIBDIR-NEWSLIBDIR}/newsgroups\fR file and if supported (requires +\fI${TIN_LIBDIR\-NEWSLIBDIR}/newsgroups\fR file and if supported (requires .BR tin (1) to be build with mh-mail-handling support) from -\fI${TIN_HOMEDIR-"$HOME"}/.tin/mailgroups\fR for mailgroups. Default is ON. +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/mailgroups\fR for mailgroups. Default is ON. .TP .B show_info Which information about the thread or article should be shown. Default is 1, @@ -1901,7 +1920,7 @@ display when reading on a slow terminal .TP .B strip_bogus Bogus groups are groups that are present in your -\fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR file that no longer exist on the news +\fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR file that no longer exist on the news server. There are 3 options. 0 means do nothing & always keep bogus groups. 1 means bogus groups will be permanently removed. 2 means that bogus groups will appear on the Group Selection Menu, prefixed with a 'D'. This allows @@ -1909,7 +1928,7 @@ you to unsubscribe from them as and when .TP .B strip_newsrc If ON, then unsubscribed groups will be permanently removed from -your \fI${TIN_HOMEDIR-"$HOME"}/.newsrc\fR file. Default is OFF. +your \fI${TIN_HOMEDIR\-"$HOME"}/.newsrc\fR file. Default is OFF. .TP .B strokes_regex A regular expression that will be applied when reading articles. All @@ -1935,7 +1954,7 @@ Defines which threading method to use. T 4) Thread multipart articles on Subject. It's also possible to set the threading type on a per group basis by setting the group attribute variable \fBthread_arts\fP to 0 - 4 in the file -\fI${TIN_HOMEDIR-"$HOME"}/.tin/attributes\fR. +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/attributes\fR. .TP .B thread_catchup_on_exit If ON catchup group/thread when leaving with the left arrow key. Default is @@ -1969,7 +1988,7 @@ matching words are shown in \fBcol_markd uses a built-in default. .TP .B unlink_article -If ON remove \fI${TIN_HOMEDIR-"$HOME"}/.article\fR after posting. Default is +If ON remove \fI${TIN_HOMEDIR\-"$HOME"}/.article\fR after posting. Default is ON. .TP .B url_handler @@ -1997,7 +2016,7 @@ Default is OFF. .B use_slrnface If enabled .BR slrnface (1) -will be used to interpret the ''X-Face:'' header. For this option to have any +will be used to interpret the ''X\-Face:'' header. For this option to have any effect, .BR tin (1) must be running in an @@ -2056,7 +2075,7 @@ stops at the end of the thread list. Def .TP .B xpost_quote_format Format is the same as for \fBnews_quote_format\fP, this is used when -answering to a crossposting to several groups with no ''Followup-To:'' +answering to a crossposting to several groups with no ''Followup\-To:'' set. .RE .PP @@ -2066,8 +2085,8 @@ set. .RS Yet another global configuration file with "\fIvariable\fR=\fIvalue\fR" pairs. This one is for the more general options which usually can't be -controlled via \fI${TIN_LIBDIR-NEWSLIBDIR}/tinrc\fR and/or -\fI${TIN_HOMEDIR-"$HOME"}/.tin/tinrc\fR like resetting (to override the +controlled via \fI${TIN_LIBDIR\-NEWSLIBDIR}/tinrc\fR and/or +\fI${TIN_HOMEDIR\-"$HOME"}/.tin/tinrc\fR like resetting (to override the built-in default) the \fInewslibdir\fR. .TP .B domainname @@ -2109,7 +2128,7 @@ Allow unregistered top level domains .TP .B disable_sender Don't generate a ''Sender:''-header. This has no effect if -\fBinews_prog\fP is not set to --internal. +\fBinews_prog\fP is not set to \-\-internal. .TP .B spooldir Base of your newsspool (Bnews, Cnews and INN traditional spool style), common @@ -2163,7 +2182,7 @@ $\fBLANG\fP .\" as with inn >= 2.2.x getting more and more popular .\" we should think about checking for the new Paths .\" (described shown below). -.IR ${TIN_LIBDIR-NEWSLIBDIR}"/"${TIN_ACTIVEFILE-active} +.IR ${TIN_LIBDIR\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE\-active} .sp .RS This file lists the newsgroups that the local site receives. Each newsgroup @@ -2223,7 +2242,7 @@ uses the LIST (\fBRFC977\fP) command ins .RE .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/active.times +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/active.times .sp .RS This file provides a chronological record of when newsgroups are created. It @@ -2250,7 +2269,7 @@ uses the NEWGROUPS (\fBRFC977\fP) comman .RE .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/newsgroups +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/newsgroups .sp .RS This file provides short descriptions of each newsgroup. It is normally @@ -2273,7 +2292,7 @@ uses the LIST NEWSGROUPS (\fBRFC2980\fP) .RE .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/organization +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/organization .sp .RS This file specifies might hold a default organization to be used @@ -2282,7 +2301,7 @@ if set. .RE .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/overview.fmt +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/overview.fmt .\" is the Path correct? or is it /news/etc/overview.fmt .sp .RS @@ -2302,12 +2321,12 @@ uses the LIST OVERVIEW.FMT (\fBRFC2980\f .RE .PP -.IR ${TIN_LIBDIR-NEWSLIBDIR}/subscriptions +.IR ${TIN_LIBDIR\-NEWSLIBDIR}/subscriptions .\" is the Path correct? or is it /news/etc/subscriptions .sp .RS This file contains a list of newsgroups - one per line - which the client -should subscribe to when the user has no ${TIN_HOMEDIR-"$HOME"}/.newsrc for +should subscribe to when the user has no ${TIN_HOMEDIR\-"$HOME"}/.newsrc for the newsserver. .BR tin (1) only tries to read the file if you read directly from the local spool, diff -Nurp tin-1.7.4/include/autoconf.hin tin-1.7.5/include/autoconf.hin --- tin-1.7.4/include/autoconf.hin 2004-02-09 15:42:48.000000000 +0100 +++ tin-1.7.5/include/autoconf.hin 2004-06-06 20:12:24.000000000 +0200 @@ -3,7 +3,7 @@ * Module : autoconf.hin * Author : Thomas Dickey * Created : 1995-08-24 - * Updated : 2004-02-09 + * Updated : 2004-06-06 * Notes : #include files, #defines & struct's * * Copyright (c) 1995-2004 Thomas Dickey @@ -620,6 +620,7 @@ */ # undef HAVE_UNICODE_UNORM_H # undef HAVE_UNICODE_USTRING_H +# undef HAVE_UNICODE_UBIDI_H # undef HAVE_LIBICUUC /* diff -Nurp tin-1.7.4/include/extern.h tin-1.7.5/include/extern.h --- tin-1.7.4/include/extern.h 2004-02-23 11:45:21.000000000 +0100 +++ tin-1.7.5/include/extern.h 2004-06-06 20:24:18.000000000 +0200 @@ -3,7 +3,7 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-02-23 + * Updated : 2004-06-06 * Notes : * * Copyright (c) 1997-2004 Iain Lea @@ -1198,7 +1198,6 @@ extern int cCOLS; extern int cLINES; extern int curr_line; extern int debug; -extern int groupname_len; extern int i_key_search_last; extern int input_context; extern int iso2asc_supported; @@ -1259,6 +1258,7 @@ extern struct t_newnews *newnews; extern struct t_option option_table[]; extern struct t_save *save; +extern t_bool *OPT_ON_OFF_list[]; extern t_bool can_post; extern t_bool check_for_new_newsgroups; extern t_bool cmd_line; @@ -1600,4 +1600,7 @@ extern struct opttxt txt_xpost_quote_for #ifdef HAVE_UNICODE_NORMALIZATION extern struct opttxt txt_normalization_form; #endif /* HAVE_UNICODE_NORMALIZATION */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + extern struct opttxt txt_render_bidi; +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ #endif /* !EXTERN_H */ diff -Nurp tin-1.7.4/include/proto.h tin-1.7.5/include/proto.h --- tin-1.7.4/include/proto.h 2004-02-23 11:45:29.000000000 +0100 +++ tin-1.7.5/include/proto.h 2004-06-12 16:16:35.000000000 +0200 @@ -3,7 +3,7 @@ * Module : proto.h * Author : Urs Janssen * Created : - * Updated : 2004-02-23 + * Updated : 2004-06-12 * Notes : * * Copyright (c) 1997-2004 Urs Janssen @@ -95,7 +95,7 @@ extern void draw_pager_line(const char * /* config.c */ extern char **ulBuildArgv(char *cmd, int *new_argc); -extern char *fmt_option_prompt(char *dst, int len, t_bool editing, int option); +extern char *fmt_option_prompt(char *dst, size_t len, t_bool editing, int option); extern char *quote_space_to_dash(char *str); extern const char *print_boolean(t_bool value); extern int change_config_file(struct t_group *group); @@ -315,15 +315,13 @@ extern void *my_realloc1(const char *fil #endif /* !USE_CURSES */ /* misc.c */ +extern char *buffer_to_ascii(char *c); extern char *escape_shell_meta(const char *source, int quote_area); extern char *get_tmpfilename(const char *filename); extern char *idna_decode(char *in); extern char *quote_wild(char *str); extern char *quote_wild_whitespace(char *str); extern char *strip_line(char *line); -#if defined(CHARSET_CONVERSION) || defined(HAVE_UNICODE_NORMALIZATION) - extern char *utf8_valid(char *line); -#endif /* CHARSET_CONVERSION || HAVE_UNICODE_NORMALIZATION */ extern const char *eat_re(char *s, t_bool eat_was); extern const char *get_val(const char *env, const char *def); extern const char *gnksa_strerror(int errcode); @@ -364,6 +362,9 @@ extern void show_inverse_video_status(vo extern void strip_name(const char *from, char *address); extern void tin_done(int ret); extern void toggle_inverse_video(void); +#if defined(CHARSET_CONVERSION) || defined(HAVE_UNICODE_NORMALIZATION) + extern char *utf8_valid(char *line); +#endif /* CHARSET_CONVERSION || HAVE_UNICODE_NORMALIZATION */ #ifdef CHARSET_CONVERSION extern t_bool buffer_to_network(char *line, int mmnwcharset); #endif /* CHARSET_CONVERSION */ @@ -474,18 +475,19 @@ extern void quick_post_article(t_bool po /* prompt.c */ extern char *prompt_string_default(const char *prompt, char *def, const char *failtext, int history); extern char *sized_message(char **result, const char *format, const char *subject); -extern int prompt_list(int row, int col, int var, constext *help_text, constext *prompt_text, constext *list[], int size); extern int prompt_num(int ch, const char *prompt); extern int prompt_yn(int line, const char *prompt, t_bool default_answer); extern int prompt_msgid(void); extern t_bool prompt_default_string(const char *prompt, char *buf, int buf_len, char *default_prompt, int which_hist); extern t_bool prompt_menu_string(int line, const char *prompt, char *var); extern t_bool prompt_option_char(int option); +extern t_bool prompt_option_list(int option); extern t_bool prompt_option_num(int option); +extern t_bool prompt_option_on_off(int option); extern t_bool prompt_option_string(int option); extern t_bool prompt_string(const char *prompt, char *buf, int which_hist); extern void prompt_continue(void); -extern void prompt_on_off(int row, int col, t_bool *var, constext *help_text, constext *prompt_text); +extern void prompt_slk_redraw(void); /* read.c */ extern char *tin_fgets(FILE *fp, t_bool header); @@ -533,6 +535,8 @@ extern char *rfc1522_decode(const char * extern char *rfc1522_encode(char *s, const char *charset, t_bool ismail); extern int mmdecode(const char *what, int encoding, int delimiter, char *where); extern void rfc15211522_encode(const char *filename, constext *mime_encoding, struct t_group *group, t_bool allow_8bit_header, t_bool ismail); +extern void compose_mail_mime_forwarded(const char *filename, FILE *articlefp, t_bool include_text, struct t_group *group); +extern void compose_mail_text_plain(const char *filename, struct t_group *group); /* save.c */ extern int check_start_save_any_news(int function, t_bool catchup); @@ -572,7 +576,6 @@ extern int choose_new_group(void); extern int skip_newgroups(void); extern void draw_group_arrow(void); extern void selection_page(int start_groupnum, int num_cmd_line_groups); -extern void set_groupname_len(t_bool all_groups); extern void show_selection_page(void); extern void toggle_my_groups(const char *group); @@ -635,11 +638,16 @@ extern void str_lwr(char *str); # define strrstr(s,p) my_strrstr(s,p) #endif /* !HAVE_STRRSTR */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + extern char *wchar_t2char(const wchar_t *wstr); extern void wcspart(wchar_t *to, const wchar_t *from, int columns, int size_to, t_bool pad); + extern wchar_t *char2wchar_t(const char *str); extern wchar_t *wstrunc(const wchar_t *wmessage, wchar_t *wbuf, size_t wbuf_len, int len); extern wchar_t *my_wcsdup(const wchar_t *wstr); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ extern char *strunc(const char *message, char *buf, size_t buf_len, int len); +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + extern char *render_bidi(const char *str, t_bool *is_rtl); +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ #ifdef HAVE_UNICODE_NORMALIZATION extern char *normalize(const char *str); #endif /* HAVE_UNICODE_NORMALIZATION */ diff -Nurp tin-1.7.4/include/tin.h tin-1.7.5/include/tin.h --- tin-1.7.4/include/tin.h 2004-02-23 11:45:37.000000000 +0100 +++ tin-1.7.5/include/tin.h 2004-06-06 20:24:04.000000000 +0200 @@ -3,7 +3,7 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-02-23 + * Updated : 2004-06-06 * Notes : #include files, #defines & struct's * * Copyright (c) 1997-2004 Iain Lea , Rich Skrenta @@ -100,7 +100,7 @@ #include enum context { cMain, cArt, cConfig, cFilter, cGroup, cHelp, cInfopager, cPage, cSelect, cThread }; -enum icontext { cNone, cGetline }; +enum icontext { cNone, cGetline, cPromptSLK }; enum resizer { cNo, cYes, cRedraw }; enum rc_state { RC_IGNORE, RC_CHECK, RC_UPGRADE, RC_DOWNGRADE, RC_ERROR }; @@ -1378,10 +1378,10 @@ enum { * unicode normalization */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) -# if defined(HAVE_LIBICUUC) +# ifdef HAVE_LIBICUUC # define HAVE_UNICODE_NORMALIZATION 1 # else -# ifdef HAVE_LIBIDN +# if defined(HAVE_LIBIDN) && defined(HAVE_STRINGPREP_H) # define HAVE_UNICODE_NORMALIZATION 2 # endif /* HAVE_LIBIDN */ # endif /* HAVE_LIBICUUC */ @@ -1534,6 +1534,7 @@ struct t_attribute { unsigned int post_proc_type:2; /* 0=none, 1=shar, 2=uudecode */ unsigned int x_comment_to:1; /* insert X-Comment-To: in Followup */ unsigned int tex2iso_conv:1; /* Convert TeX2ISO */ + unsigned int mime_forward:1; /* forward articles as attachment or inline */ char *fcc; /* Fcc folder for mail */ #ifdef CHARSET_CONVERSION int mm_network_charset; /* network charset */ diff -Nurp tin-1.7.4/include/tinrc.h tin-1.7.5/include/tinrc.h --- tin-1.7.4/include/tinrc.h 2003-12-28 15:29:59.000000000 +0100 +++ tin-1.7.5/include/tinrc.h 2004-06-06 20:23:55.000000000 +0200 @@ -3,7 +3,7 @@ * Module : tinrc.h * Author : Jason Faultless * Created : 1999-04-13 - * Updated : 2003-12-09 + * Updated : 2004-06-06 * Notes : * * Copyright (c) 1999-2004 Jason Faultless @@ -252,6 +252,9 @@ struct t_config { # ifdef HAVE_UNICODE_NORMALIZATION int normalization_form; # endif /* HAVE_UNICODE_NORMALIZATION */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + t_bool render_bidi; +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ }; #endif /* !TINRC_H */ diff -Nurp tin-1.7.4/include/version.h tin-1.7.5/include/version.h --- tin-1.7.4/include/version.h 2004-02-25 10:59:01.000000000 +0100 +++ tin-1.7.5/include/version.h 2004-06-15 11:52:58.000000000 +0200 @@ -40,13 +40,13 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "1.7.4" +# define VERSION "1.7.5" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20040225" -# define RELEASENAME "Benbecula" +# define RELEASEDATE "20040615" +# define RELEASENAME "Gighay" /* config-file versions - must by dotted triples */ # define TINRC_VERSION "1.3.7" -# define ATTRIBUTES_VERSION "1.0.2" +# define ATTRIBUTES_VERSION "1.0.3" # define FILTER_VERSION "1.0.0" # define SERVERCONFIG_VERSION "1.0.0" diff -Nurp tin-1.7.4/intl/loadmsgcat.c tin-1.7.5/intl/loadmsgcat.c --- tin-1.7.4/intl/loadmsgcat.c 2004-01-20 15:21:00.000000000 +0100 +++ tin-1.7.5/intl/loadmsgcat.c 2004-03-02 10:19:20.000000000 +0100 @@ -27,6 +27,8 @@ # include #endif +#undef freea + /* see AC_FUNC_ALLOCA macro */ #ifdef __GNUC__ # define alloca __builtin_alloca @@ -43,12 +45,18 @@ # else # ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# else +# define freea(n) free(n) # endif # endif # endif # endif #endif +#ifndef freea +#define freea(n) /* nothing */ +#endif + #include #include #include Binary files tin-1.7.4/po/de.gmo and tin-1.7.5/po/de.gmo differ diff -Nurp tin-1.7.4/po/de.po tin-1.7.5/po/de.po --- tin-1.7.4/po/de.po 2004-02-25 10:34:09.000000000 +0100 +++ tin-1.7.5/po/de.po 2004-06-04 13:32:26.000000000 +0200 @@ -6,7 +6,7 @@ # msgid "" msgstr "Project-Id-Version: tin 1.7.4\n" - "POT-Creation-Date: 2004-02-25 10:33+0100\n" + "POT-Creation-Date: 2004-06-04 13:31+0200\n" "PO-Revision-Date: 2003-03-13 04:15+0200\n" "Last-Translator: Sven Hartge , Kai Bojens " "\n" @@ -14,276 +14,282 @@ msgstr "Project-Id-Version: tin 1.7.4\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" + "Report-Msgid-Bugs-To: \n" #: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Fehlerhafter Overview-Datensatz (%d Felder) '%s'" -#: src/attrib.c:585 +#: src/attrib.c:590 msgid "# Do not edit this comment block\n" "#\n" msgstr "# Diesen Kommentarabschnitt nicht verändern\n" "#\n" -#: src/attrib.c:586 +#: src/attrib.c:591 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=STRING [notwendig]\n" "# Gültigkeitsbereich, zB. alt.*,!alt.bin*\n" -#: src/attrib.c:587 +#: src/attrib.c:592 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=STRING\n" "# Verzeichnis der Mailfolder, z.B. ~/Mail\n" -#: src/attrib.c:588 +#: src/attrib.c:593 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=STRING\n" "# Verzeichnis zum Speichern, z.B. ~user/News\n" -#: src/attrib.c:589 +#: src/attrib.c:594 msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=STRING\n" "# Datei zum Speichern, z.B. =linux\n" -#: src/attrib.c:590 +#: src/attrib.c:595 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=STRING\n" "# Signatur, z.B. $var/sig\n" -#: src/attrib.c:591 +#: src/attrib.c:596 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=STRING\n" "# Organization-Header; ist das erste Zeichen ein '/', wird der\n" "# Wert aus dieser Datei gelesen.\n" -#: src/attrib.c:592 +#: src/attrib.c:597 msgid "# followup_to=STRING\n" msgstr "# followup_to=STRING\n" "# Voreinstellung für den Followup-To-Header\n" -#: src/attrib.c:593 +#: src/attrib.c:598 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=STRING\n" "# Gruppe ist eine gegatete Mailingliste, z.B. majordomo@example.org\n" -#: src/attrib.c:594 +#: src/attrib.c:599 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=STRING\n" "# Zusätzliche Header, z.B. ~/.tin/extra-headers\n" -#: src/attrib.c:595 +#: src/attrib.c:600 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=STRING\n" "# Text wird automatisch zu Beginn des Artikels eingefügt,\n" "# z.B. ~/.tin/extra-body-text\n" -#: src/attrib.c:596 +#: src/attrib.c:601 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=STRING\n" "# Absender, einfach den gewünschten Wert eintragen,\n" "# keine Anführungszeichen verwenden\n" -#: src/attrib.c:597 +#: src/attrib.c:602 msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=STRING\n" "# Einleitungszeile, z.B. news_quote_format=In %%M, %%F wrote:\n" -#: src/attrib.c:598 +#: src/attrib.c:603 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=STRING\n" "# Zeichen für Zitate in Antworten, %%s oder %%S ergibt Autoreninitialien\n" -#: src/attrib.c:599 +#: src/attrib.c:604 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=STRING\n" "# z.B. image/*,!image/bmp\n" -#: src/attrib.c:601 +#: src/attrib.c:606 msgid "# ispell=STRING\n" msgstr "# ispell=STRING\n" "# Aufruf der Rechtschreibprüfung,\n" "# z.B. ispell -C -ddeutsch -w äöüÄÖÜß@ -Tlatin1\n" -#: src/attrib.c:603 +#: src/attrib.c:608 msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" "# Führe GroupMarkUnselArtRead Kommando automatisch beim Betreten\n" "# der Gruppe aus\n" -#: src/attrib.c:604 +#: src/attrib.c:609 msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" "# Artikel mit 'Archive-name:'-Header automatisch in die darin\n" "# angegebene Datei speichern\n" -#: src/attrib.c:605 +#: src/attrib.c:610 msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" "# Im Batch-Modus werden die Article beachtet\n" -#: src/attrib.c:606 +#: src/attrib.c:611 msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" "# Gespeicherte, zur Nachbearbeitung weitergegebene Artikel ohne\n" "# Nachfrage löschen\n" -#: src/attrib.c:607 +#: src/attrib.c:612 msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" "# nur ungelesene Artikel anzeigen\n" -#: src/attrib.c:608 +#: src/attrib.c:613 msgid "# thread_arts=NUM" msgstr "# thread_arts=ZAHL\n" "# Threading nach:" -#: src/attrib.c:615 +#: src/attrib.c:620 msgid "# show_author=NUM\n" msgstr "# show_author=ZAHL\n" "# Anzeige des From-Felds\n" -#: src/attrib.c:621 +#: src/attrib.c:626 msgid "# show_info=NUM\n" msgstr "# show_info=ZAHL\n" -#: src/attrib.c:627 +#: src/attrib.c:632 msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=ZAHL\n" "# Artikel sortieren nach:\n" -#: src/attrib.c:645 +#: src/attrib.c:650 msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=ZAHL\n" "# Threads sortieren nach:\n" -#: src/attrib.c:650 +#: src/attrib.c:655 msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=ZAHL\n" "# Nachbearbeitung\n" -#: src/attrib.c:655 +#: src/attrib.c:660 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=STRING\n" "# Voreinstellung für Gültigkeitsbereich neuer Kill-Einträge,\n" "# z.B. talk.*\n" -#: src/attrib.c:656 +#: src/attrib.c:661 msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" "# Kill verfällt automatisch\n" -#: src/attrib.c:657 +#: src/attrib.c:662 msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" "# Kill beachtet Gross/Kleinschreibung\n" -#: src/attrib.c:658 +#: src/attrib.c:663 msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=ZAHL\n" "# Killen nach:\n" -#: src/attrib.c:659 src/attrib.c:666 +#: src/attrib.c:664 src/attrib.c:671 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0=Subject (Gross/Kleinschreibung beachten), 1=Subject (G/K ignorieren)\n" -#: src/attrib.c:660 src/attrib.c:667 +#: src/attrib.c:665 src/attrib.c:672 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2=From (G/K beachten), 3=From (G/K ignorieren)\n" -#: src/attrib.c:661 src/attrib.c:668 +#: src/attrib.c:666 src/attrib.c:673 msgid "# 4=msgid 5=lines\n" msgstr "# 4=Message-ID, 5=Zeilen\n" -#: src/attrib.c:662 +#: src/attrib.c:667 msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=STRING\n" "# Voreinstellung für Gültigkeitsbereich neuer Auswahlregeln (Hochscoren)\n" -#: src/attrib.c:663 +#: src/attrib.c:668 msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" "# Regel verfällt automatisch\n" -#: src/attrib.c:664 +#: src/attrib.c:669 msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" "# Regel beachtet Gross/Kleinschreibung\n" -#: src/attrib.c:665 +#: src/attrib.c:670 msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" "# Auswählen (Hochscoren) nach:\n" -#: src/attrib.c:669 +#: src/attrib.c:674 msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" "# X-Comment-To:-Header einfügen.\n" "# (Nur sinnvoll in nach Fido Technology Network gegateten Gruppen.)\n" -#: src/attrib.c:670 +#: src/attrib.c:675 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=STRING\n" "# Datei in der eine Kopie der Mail abgelegt werden soll,# z.B: " "=mailbox\n" -#: src/attrib.c:671 +#: src/attrib.c:676 msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" "# Automatische Umwandlung von TeX-Umlauten\n" -#: src/attrib.c:673 +#: src/attrib.c:677 +msgid "# mime_forward=ON/OFF\n" +msgstr "# mime_forward=ON/OFF\n" + "# Weitergeleitete Artikel als MIME-Anhang senden\n" + +#: src/attrib.c:679 msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=Zeichensatz\n" "# Erlaubt sind folgende:" -#: src/attrib.c:680 +#: src/attrib.c:686 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=STRING\n" "# Voreinstellung ist US-ASCII\n" -#: src/attrib.c:682 +#: src/attrib.c:688 msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Es empfiehlt sich, zuerst allgemein gültige und danach spezielle,\n" -#: src/attrib.c:683 +#: src/attrib.c:689 msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# nur für bestimmte Newsgruppen gültige Einträge aufzuführen.\n" "#\n" -#: src/attrib.c:684 +#: src/attrib.c:690 msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:690 +#: src/attrib.c:696 msgid "# include extra headers\n" msgstr "# Zusätzliche Header einfügen\n" -#: src/attrib.c:698 +#: src/attrib.c:704 msgid "# in *sources* set post process type to shar only\n" msgstr "# in *sources* nur Nachbearbeitung mit shar\n" -#: src/attrib.c:702 +#: src/attrib.c:708 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "# in *binaries* Nachbearbeitung, temporäre Dateien löschen\n" -#: src/attrib.c:703 +#: src/attrib.c:709 msgid "# and set Followup-To: poster\n" msgstr "# und Antwort per EMail (Followup-To: poster) anfordern\n" -#: src/cook.c:809 +#: src/cook.c:814 msgid "(unknown)" msgstr "(unbekannt)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:612 src/filter.c:620 +#: src/filter.c:600 src/filter.c:608 msgid "Removed from the previous rule: " msgstr "Aus der vorigen Regel gelöscht: " @@ -940,7 +946,7 @@ msgstr "\n" msgid "Insecure permissions of %s (%o)" msgstr "Unsichere Zugriffsbeschränkungen auf %s (%o)" -#: src/lang.c:199 src/newsrc.c:410 +#: src/lang.c:199 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "Ungültige Antwort auf GROUP-Befehl, %s" @@ -3964,7 +3970,7 @@ msgstr "Terminal unterstützt keine Farbe msgid "Trying %s" msgstr "Versuche %s" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:297 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:296 msgid "None" msgstr "Nichts" @@ -4337,13 +4343,13 @@ msgstr "Filtereinstellungen" #: src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 src/lang.c:1995 src/lang.c:2029 #: src/lang.c:2081 src/lang.c:2088 src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 #: src/lang.c:2189 src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 -#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 src/lang.c:2350 msgid " toggles, sets, cancels." msgstr " schaltet um, setzt, bricht ab." #: src/lang.c:1344 -msgid "Show mini menu & posting etiquette :" -msgstr "Zeigt Minimenü & Posting etiquette :" +msgid "Show mini menu & posting etiquette" +msgstr "Zeigt Minimenü & Posting etiquette" #: src/lang.c:1345 msgid "# If ON show a mini menu of useful commands at each level\n" @@ -4356,8 +4362,8 @@ msgid "Show short description for each n msgstr "Zeige Kurzbeschreibung für Gruppe. wechselt & setzt." #: src/lang.c:1351 -msgid "Show description of each newsgroup :" -msgstr "Zeige Beschreibung der Newsgruppen :" +msgid "Show description of each newsgroup" +msgstr "Zeige Beschreibung der Newsgruppen" #: src/lang.c:1352 msgid "# If ON show group description text after newsgroup name at\n" @@ -4372,8 +4378,8 @@ msgstr "Zeigt Subject & From (Autor) Fel "setzt." #: src/lang.c:1358 -msgid "In group menu, show author by :" -msgstr "Im Gruppenmenü, zeige Autor an nach:" +msgid "In group menu, show author by" +msgstr "Im Gruppenmenü, zeige Autor an nach" #: src/lang.c:1359 msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" @@ -4384,24 +4390,24 @@ msgid "Draw -> or highlighted bar for se msgstr "Zeige -> oder Hervorhebung für Auswahl. wechselt & setzt." #: src/lang.c:1364 -msgid "Draw -> instead of highlighted bar :" -msgstr "Zeige -> anstatt einer Markierung :" +msgid "Draw -> instead of highlighted bar" +msgstr "Zeige -> anstatt einer Markierung" #: src/lang.c:1365 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Falls ON benutze -> andernfalls benutze eine Markierung zur Auswahl\n" #: src/lang.c:1370 -msgid "Use inverse video for page headers :" -msgstr "Inverse Darstellung für die Header :" +msgid "Use inverse video for page headers" +msgstr "Inverse Darstellung für die Header" #: src/lang.c:1371 msgid "# If ON use inverse video for page headers at different levels\n" msgstr "# Falls ON nutze inverse Darstellung für Header bei verschiedenen Ebenen\n" #: src/lang.c:1376 -msgid "Thread articles by :" -msgstr "Threade Artikel anhand :" +msgid "Thread articles by" +msgstr "Threade Artikel anhand" #: src/lang.c:1377 msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" @@ -4410,8 +4416,8 @@ msgstr "# Zeige Artikel nach 0=(nichts) "# 4=(Mehrteilige Artikel).\n" #: src/lang.c:1383 -msgid "Score of a thread :" -msgstr "Bewertung eines Threads :" +msgid "Score of a thread" +msgstr "Bewertung eines Threads" #: src/lang.c:1384 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" @@ -4422,8 +4428,8 @@ msgid "Sort articles by Subject, From, D msgstr "Sortiere Artikel nach Subject, From, Datum oder Bewertung." #: src/lang.c:1389 -msgid "Sort articles by :" -msgstr "Sortiere Artikel nach :" +msgid "Sort articles by" +msgstr "Sortiere Artikel nach" #: src/lang.c:1390 msgid "# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n" @@ -4440,8 +4446,8 @@ msgstr "Threads nach Bewertung (Score) o "setzt" #: src/lang.c:1397 -msgid "Sort threads by :" -msgstr "Sortiere Threads nach :" +msgid "Sort threads by" +msgstr "Sortiere Threads nach" #: src/lang.c:1398 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" @@ -4452,8 +4458,8 @@ msgid "Put cursor at first/last unread a msgstr "Setze Cursor an ersten/letzten ungel. Artikel. wechselt & setzt." #: src/lang.c:1403 -msgid "Goto first unread article in group :" -msgstr "Setze Cursor auf ersten ungel. Art.:" +msgid "Goto first unread article in group" +msgstr "Setze Cursor auf ersten ungel. Art." #: src/lang.c:1404 msgid "# If ON put cursor at first unread art in group otherwise last art\n" @@ -4464,24 +4470,24 @@ msgid "Show all articles or only unread msgstr "Zeige alle oder nur ungelesene Artikel. wechselt & setzt." #: src/lang.c:1409 -msgid "Show only unread articles :" -msgstr "Zeige nur ungelesene Artikel :" +msgid "Show only unread articles" +msgstr "Zeige nur ungelesene Artikel" #: src/lang.c:1410 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# Falls ON zeige nur neue/ungelesene Artikel, sonst alle.\n" #: src/lang.c:1415 -msgid "Show only groups with unread arts :" -msgstr "Zeige nur Gruppen mit ungel. Art. :" +msgid "Show only groups with unread arts" +msgstr "Zeige nur Gruppen mit ungel. Art." #: src/lang.c:1416 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "# Falls ON zeige nur abonnierte Gruppen mit ungelesen Artikeln.\n" #: src/lang.c:1421 -msgid "Filter which articles :" -msgstr "Filter (kill) anwenden auf :" +msgid "Filter which articles" +msgstr "Filter (kill) anwenden auf" #: src/lang.c:1422 msgid "# 0=(Only kill unread articles)\n" @@ -4492,8 +4498,8 @@ msgstr "# 0=(Filtert nur ungelesene Arti "# 2=(Filtert alle Artikel und zeigt sie niemals an).\n" #: src/lang.c:1429 -msgid "Tab goes to next unread article :" -msgstr "Tab zeigt nächsten ungelesenen Art.:" +msgid "Tab goes to next unread article" +msgstr "Tab zeigt nächsten ungelesenen Art." #: src/lang.c:1430 msgid "# If ON the TAB command will go to next unread article at article viewer " @@ -4506,8 +4512,8 @@ msgstr "Weiterscrollen mit Leertaste am "Artikel" #: src/lang.c:1435 -msgid "Space goes to next unread article :" -msgstr "Leertaste zeigt nächsten unge. Art.:" +msgid "Space goes to next unread article" +msgstr "Leertaste zeigt nächsten unge. Art." #: src/lang.c:1436 msgid "# If ON the SPACE command will go to next unread article at article viewer\n" @@ -4520,8 +4526,8 @@ msgid "Scrolling with / past msgstr "Weiterscrollen mit BildAb am Artikelende wechselt zum nächsten ungel. Artikel" #: src/lang.c:1442 -msgid "PgDn goes to next unread article :" -msgstr "PgDn zeigt nächst. ungelesenen Art.:" +msgid "PgDn goes to next unread article" +msgstr "PgDn zeigt nächst. ungelesenen Art." #: src/lang.c:1443 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" @@ -4530,8 +4536,8 @@ msgstr "# Falls ON wechselt Bildrunter o "# Artikel, wenn das Artikelende erreicht wurde\n" #: src/lang.c:1449 -msgid "List thread using right arrow key :" -msgstr "Zeige Thread mit rechter Pfeilt. an:" +msgid "List thread using right arrow key" +msgstr "Zeige Thread mit rechter Pfeilt. an" #: src/lang.c:1450 msgid "# If ON automatically list thread when entering it using right arrow key.\n" @@ -4543,8 +4549,8 @@ msgid "Enter character to indicate delet msgstr "Definiere Zeichen für gelöschte Artikel. setzt, bricht ab." #: src/lang.c:1455 -msgid "Character to show deleted articles :" -msgstr "Zeichen für gelöschte Artikel :" +msgid "Character to show deleted articles" +msgstr "Zeichen für gelöschte Artikel" #: src/lang.c:1456 msgid "# Character used to show that an art was deleted (default 'D')\n" @@ -4557,8 +4563,8 @@ msgid "Enter character to indicate artic msgstr "Definiere Zeichen, das Artikel im Bereich anzeigt. setzt, bricht ab." #: src/lang.c:1462 -msgid "Character to show inrange articles :" -msgstr "Zeichen für Artikel im Bereich :" +msgid "Character to show inrange articles" +msgstr "Zeichen für Artikel im Bereich" #: src/lang.c:1463 msgid "# Character used to show that an art is in a range (default '#')\n" @@ -4572,8 +4578,8 @@ msgid "Enter character to indicate that msgstr "Definiere Zeichen für wiederkehrende Art. setzt. bricht ab." #: src/lang.c:1469 -msgid "Character to show returning arts :" -msgstr "Zeichen für wiederkehrende Artikel :" +msgid "Character to show returning arts" +msgstr "Zeichen für wiederkehrende Artikel" #: src/lang.c:1470 msgid "# Character used to show that an art will return (default '-')\n" @@ -4586,8 +4592,8 @@ msgid "Enter character to indicate selec msgstr "Zeichen für Artikel mit Markierung wichtig/'hot' setzt, bricht ab." #: src/lang.c:1476 -msgid "Character to show selected articles:" -msgstr "Zeichen für wichtige Artikel :" +msgid "Character to show selected articles" +msgstr "Zeichen für wichtige Artikel" #: src/lang.c:1477 msgid "# Character used to show that an art was auto-selected (default '*')\n" @@ -4600,8 +4606,8 @@ msgid "Enter character to indicate recen msgstr "Definiere Zeichen für aktuelle Artikel. setzt, bricht ab." #: src/lang.c:1483 -msgid "Character to show recent articles :" -msgstr "Zeichen für aktuelle Artikel :" +msgid "Character to show recent articles" +msgstr "Zeichen für aktuelle Artikel" #: src/lang.c:1484 msgid "# Character used to show that an art is recent (default 'o')\n" @@ -4614,8 +4620,8 @@ msgid "Enter character to indicate unrea msgstr "Zeichen für ungelesene Artikel. setzt, bricht ab." #: src/lang.c:1490 -msgid "Character to show unread articles :" -msgstr "Zeichen für ungelesene Artikel :" +msgid "Character to show unread articles" +msgstr "Zeichen für ungelesene Artikel" #: src/lang.c:1491 msgid "# Character used to show that an art is unread (default '+')\n" @@ -4628,8 +4634,8 @@ msgid "Enter character to indicate read msgstr "Zeichen für gelesene Artikel. setzt, bricht ab." #: src/lang.c:1497 -msgid "Character to show read articles :" -msgstr "Zeichen für gelesene Artikel :" +msgid "Character to show read articles" +msgstr "Zeichen für gelesene Artikel" #: src/lang.c:1498 msgid "# Character used to show that an art was read (default ' ')\n" @@ -4642,8 +4648,8 @@ msgid "Enter character to indicate kille msgstr "Zeichen für gekillte Artikel. setzt, bricht ab." #: src/lang.c:1504 -msgid "Character to show killed articles :" -msgstr "Zeichen für gekillte Artikel :" +msgid "Character to show killed articles" +msgstr "Zeichen für gekillte Artikel" #: src/lang.c:1505 msgid "# Character used to show that an art was killed (default 'K')\n" @@ -4656,8 +4662,8 @@ msgid "Enter character to indicate read msgstr "Zeichen für gelesene wichtige/'hot' Artikel. setzt, bricht ab." #: src/lang.c:1511 -msgid "Character to show readselected arts:" -msgstr "Zeichen für gelesene wichtige Art. :" +msgid "Character to show readselected arts" +msgstr "Zeichen für gelesene wichtige Art." #: src/lang.c:1512 msgid "# Character used to show that an art was selected before read (default ':')\n" @@ -4671,16 +4677,16 @@ msgid "Enter maximum length of newsgroup msgstr "Maximale Länge des angezeigten Newsgruppennamens. setzt." #: src/lang.c:1518 -msgid "Max. length of group names shown :" -msgstr "Max. Länge angezeigter Gruppennamen:" +msgid "Max. length of group names shown" +msgstr "Max. Länge angezeigter Gruppennamen" #: src/lang.c:1519 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maximale Länge der angezeigten Newsgruppennamen\n" #: src/lang.c:1524 -msgid "Show lines/score in listings :" -msgstr "Zeige Zeilenz./Bewert. in Übersicht:" +msgid "Show lines/score in listings" +msgstr "Zeige Zeilenz./Bewert. in Übersicht" #: src/lang.c:1525 msgid "# What informations should be displayed in article/thread listing\n" @@ -4696,8 +4702,8 @@ msgstr "0 = seitenweise, -1 = zeige zusä "halbe Seite" #: src/lang.c:1531 -msgid "Number of lines to scroll in pager :" -msgstr "Blättere Artikel um ... Zeilen :" +msgid "Number of lines to scroll in pager" +msgstr "Blättere Artikel um ... Zeilen" #: src/lang.c:1532 msgid "# Number of lines that cursor-up/down will scroll in article pager\n" @@ -4714,8 +4720,8 @@ msgid "Display signatures. toggl msgstr "Zeige Signaturen an. wechselt & setzt." #: src/lang.c:1540 -msgid "Display signatures :" -msgstr "Zeige Signaturen an :" +msgid "Display signatures" +msgstr "Zeige Signaturen an" #: src/lang.c:1541 msgid "# If OFF don't show signatures when displaying articles\n" @@ -4726,8 +4732,8 @@ msgid "Display uuencoded data as tagged msgstr "Uu-kodierte Teile als Attachment anzeigen. wechselt & setzt." #: src/lang.c:1546 -msgid "Display uue data as an attachment :" -msgstr "Zeige uue-Teile als Attachment :" +msgid "Display uue data as an attachment" +msgstr "Zeige uue-Teile als Attachment" #: src/lang.c:1547 msgid "# Handling of uuencoded data in the pager\n" @@ -4747,8 +4753,8 @@ msgid "Decode German style TeX umlaut co msgstr "TeX german.sty Umlautkodierung auswerten. wechselt & setzt." #: src/lang.c:1557 -msgid "Display \"a as Umlaut-a :" -msgstr "Wandle TeX-Umlaute automatisch um :" +msgid "Display \"a as Umlaut-a" +msgstr "Wandle TeX-Umlaute automatisch um" #: src/lang.c:1558 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" @@ -4761,8 +4767,8 @@ msgid "Space separated list of header fi msgstr "Durch Leerzeichen getrennte Liste der Header-Felder" #: src/lang.c:1564 -msgid "Display these header fields (or *) :" -msgstr "Zeige diese Header-Felder (oder *) :" +msgid "Display these header fields (or *)" +msgstr "Zeige diese Header-Felder (oder *)" #: src/lang.c:1565 msgid "# Which news headers you wish to see. If you want to see _all_ the headers,\n" @@ -4779,8 +4785,8 @@ msgstr "# Welche Header wollen Sie sehen "# wird diese Option deaktiviert.\n" #: src/lang.c:1574 -msgid "Do not display these header fields :" -msgstr "Zeige folgende Header nicht an :" +msgid "Do not display these header fields" +msgstr "Zeige folgende Header nicht an" #: src/lang.c:1575 msgid "# Same as 'news_headers_to_display' except it denotes the opposite.\n" @@ -4804,8 +4810,8 @@ msgid "Do you want to enable automatic h msgstr "Automatische Bearbeitung von Art. mit multipart/alternative-Teilen aktivieren?" #: src/lang.c:1586 -msgid "Skip multipart/alternative parts :" -msgstr "Übersp. multipart/alternative-Teile:" +msgid "Skip multipart/alternative parts" +msgstr "Übersp. multipart/alternative-Teile" #: src/lang.c:1587 msgid "# If ON strip multipart/alternative messages automatically\n" @@ -4816,8 +4822,8 @@ msgid "A regex used to decide which line msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote dargestellt werden." #: src/lang.c:1593 -msgid "Regex used to show quoted lines :" -msgstr "Regulärer Ausd. für zit. Zeilen :" +msgid "Regex used to show quoted lines" +msgstr "Regulärer Ausd. für zit. Zeilen" #: src/lang.c:1594 msgid "# A regular expression that tin will use to decide which lines are\n" @@ -4833,8 +4839,8 @@ msgid "A regex used to decide which line msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote2 dargestellt werden" #: src/lang.c:1601 -msgid "Regex used to show twice quoted l. :" -msgstr "Reg. Ausd. für zweifach zitierte Z.:" +msgid "Regex used to show twice quoted l." +msgstr "Reg. Ausd. für zweifach zitierte Z." #: src/lang.c:1602 msgid "# A regular expression that tin will use to decide which lines are\n" @@ -4850,8 +4856,8 @@ msgid "A regex used to decide which line msgstr "Regulärer Ausdruck für Zeilen, die mit col_quote3 dargestellt werden." #: src/lang.c:1609 -msgid "Regex used to show >= 3 times q.l. :" -msgstr "Reg. Ausd. für >=3-fach zitierte Z.:" +msgid "Regex used to show >= 3 times q.l." +msgstr "Reg. Ausd. für >=3-fach zitierte Z." #: src/lang.c:1610 msgid "# A regular expression that tin will use to decide which lines are\n" @@ -4867,8 +4873,8 @@ msgid "A regex used to decide which word msgstr "Regulärer Ausdruck für Zeilen, die mit col_markslashes dargestellt werden." #: src/lang.c:1618 -msgid "Regex used to highlight /slashes/ :" -msgstr "Reg. für /Schrägst./ Hervorhebungen:" +msgid "Regex used to highlight /slashes/" +msgstr "Reg. für /Schrägst./ Hervorhebungen" #: src/lang.c:1619 msgid "# A regular expression that tin will use to decide which words\n" @@ -4883,8 +4889,8 @@ msgid "A regex used to decide which word msgstr "Regulärer Ausdruck für Zeilen, die mit col_markstars dargestellt werden." #: src/lang.c:1626 -msgid "Regex used to highlight *stars* :" -msgstr "Regu. A. für *Stern* Hervorhebungen:" +msgid "Regex used to highlight *stars*" +msgstr "Regu. A. für *Stern* Hervorhebungen" #: src/lang.c:1627 msgid "# A regular expression that tin will use to decide which words\n" @@ -4899,8 +4905,8 @@ msgid "A regex used to decide which word msgstr "Regulärer Ausdruck für Zeilen, die mit col_markstroke dargestellt werden." #: src/lang.c:1634 -msgid "Regex used to highlight -strokes- :" -msgstr "Reg. für -Durchstr.- Hervorhebungen:" +msgid "Regex used to highlight -strokes-" +msgstr "Reg. für -Durchstr.- Hervorhebungen" #: src/lang.c:1635 msgid "# A regular expression that tin will use to decide which words\n" @@ -4915,8 +4921,8 @@ msgid "A regex used to decide which word msgstr "Regulärer Ausdruck für Zeilen, die mit col_markdash dargestellt werden." #: src/lang.c:1642 -msgid "Regex used to highlight _underline_:" -msgstr "Reg. für _Unterstr._ Hervorhebungen:" +msgid "Regex used to highlight _underline_" +msgstr "Reg. für _Unterstr._ Hervorhebungen" #: src/lang.c:1643 msgid "# A regular expression that tin will use to decide which words\n" @@ -4931,8 +4937,8 @@ msgid "A regex used to find Subject pref msgstr "Reg. Ausd., um Teile im Subjectanfang zu entfernen. '|' trennt die Ausd.." #: src/lang.c:1650 -msgid "Regex with Subject prefixes :" -msgstr "Reg. Ausd. für den Subjectanfang :" +msgid "Regex with Subject prefixes" +msgstr "Reg. Ausd. für den Subjectanfang" #: src/lang.c:1651 msgid "# A regular expression that tin will use to find Subject prefixes\n" @@ -4945,8 +4951,8 @@ msgid "A regex used to find Subject suff msgstr "Reg. Ausd., um Teile am Subjectanfang zu entfernen. '|' trennt die Ausd.." #: src/lang.c:1657 -msgid "Regex with Subject suffixes :" -msgstr "Reg. Ausd. für das Subjectende :" +msgid "Regex with Subject suffixes" +msgstr "Reg. Ausd. für das Subjectende" #: src/lang.c:1658 msgid "# A regular expression that tin will use to find Subject suffixes\n" @@ -4960,8 +4966,8 @@ msgid "Enter name and options for extern msgstr "Name und Optionen für ext. MIME-Viewer, --internal für eingebaute Version" #: src/lang.c:1664 -msgid "MIME binary content viewer :" -msgstr "MIME-Viewer :" +msgid "MIME binary content viewer" +msgstr "MIME-Viewer" #: src/lang.c:1665 msgid "# If --internal automatically use the built in MIME viewer for non-text\n" @@ -4977,8 +4983,8 @@ msgid "Confirm before starting non-text msgstr "Start des MIME-Viewers bestätigen" #: src/lang.c:1673 -msgid "Ask before using MIME viewer :" -msgstr "Start des MIME-Viewers bestätigen :" +msgid "Ask before using MIME viewer" +msgstr "Start des MIME-Viewers bestätigen" #: src/lang.c:1674 msgid "# If ON tin will ask before using metamail to display MIME messages\n" @@ -4991,8 +4997,8 @@ msgid "Ask to mark groups read when quit msgstr "Beim Beenden anbieten, alle betretenen Gruppen als gelesen zu markieren?" #: src/lang.c:1680 -msgid "Catchup read groups when quitting :" -msgstr "Aufholen der Gruppen beim Beenden :" +msgid "Catchup read groups when quitting" +msgstr "Aufholen der Gruppen beim Beenden" #: src/lang.c:1681 msgid "# If ON ask user if read groups should all be marked read\n" @@ -5000,8 +5006,8 @@ msgstr "# Falls ON: Beim Beenden von tin "# als gelesen zu markieren\n" #: src/lang.c:1686 -msgid "Catchup group using left key :" -msgstr "Catchup der Gruppe mit l. Cursor :" +msgid "Catchup group using left key" +msgstr "Catchup der Gruppe mit l. Cursor" #: src/lang.c:1687 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" @@ -5009,12 +5015,12 @@ msgstr "# Falls ON: Aufholen (als gelese "# beim Verlassen mit der linken Cursortaste\n" #: src/lang.c:1692 -msgid "Catchup thread by using left key :" -msgstr "Catchup mit der linken Cursort. :" +msgid "Catchup thread by using left key" +msgstr "Catchup mit der linken Cursort." #: src/lang.c:1698 -msgid "Which actions require confirmation :" -msgstr "Bestätigung erforderlich für :" +msgid "Which actions require confirmation" +msgstr "Bestätigung erforderlich für" #: src/lang.c:1699 msgid "# What should we ask confirmation for.\n" @@ -5025,7 +5031,7 @@ msgstr "# Welche Operationen müssen expl # TRANSLATION MISSING #: src/lang.c:1704 -msgid "'Mark article read' ignores tags :" +msgid "'Mark article read' ignores tags" msgstr "" #: src/lang.c:1705 @@ -5038,24 +5044,24 @@ msgid "Program to run to open URL's, setzt, bricht ab." #: src/lang.c:1710 -msgid "Program that opens URL's :" -msgstr "Öffne URLs mit ... :" +msgid "Program that opens URL's" +msgstr "Öffne URLs mit ..." #: src/lang.c:1711 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "# Programm zum Öffnen von URLs, die jeweilige URL wird hinten angehängt.\n" #: src/lang.c:1716 -msgid "Use mouse in xterm :" -msgstr "Maus in xterm nutzen :" +msgid "Use mouse in xterm" +msgstr "Maus in xterm nutzen" #: src/lang.c:1717 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "# Falls ON wird die Maustastenunterstützung für xterm aktiviert\n" #: src/lang.c:1723 -msgid "Use scroll keys on keypad :" -msgstr "Scrollt. vom Nummernblock nutzen :" +msgid "Use scroll keys on keypad" +msgstr "Scrollt. vom Nummernblock nutzen" #: src/lang.c:1724 msgid "# If ON enable scroll keys on terminals that support it\n" @@ -5066,8 +5072,8 @@ msgid "Enter maximum number of article t msgstr "Maximale Anzahl der zu holenden Artikel eingeben. setzt." #: src/lang.c:1730 -msgid "Number of articles to get :" -msgstr "Anzahl der zu holenden Artikel :" +msgid "Number of articles to get" +msgstr "Anzahl der zu holenden Artikel" #: src/lang.c:1731 msgid "# Number of articles to get (0=no limit), if negative sets maximum number\n" @@ -5081,8 +5087,8 @@ msgid "Enter number of days article is c msgstr "Anzahl der Tage, die ein Artikel als neu eingestuft wird. setzt." #: src/lang.c:1737 -msgid "Article recentness time limit :" -msgstr "Artikel Neuheitszeit-Limit :" +msgid "Article recentness time limit" +msgstr "Artikel Neuheitszeit-Limit" #: src/lang.c:1738 msgid "# Number of days in which article is considered recent, (0=OFF)\n" @@ -5093,8 +5099,8 @@ msgid "WILDMAT for normal wildcards, REG msgstr "WILDMAT für normale Wildcards, REGEX für die Nutzung von regulären Ausdrücken." #: src/lang.c:1743 -msgid "Wildcard matching :" -msgstr "Wildcardprüfung :" +msgid "Wildcard matching" +msgstr "Wildcardprüfung" #: src/lang.c:1744 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" @@ -5106,8 +5112,8 @@ msgstr "Artikel mit weniger Bewertung (S "setzt." #: src/lang.c:1749 -msgid "Score limit (kill) :" -msgstr "Bewertungsgrenze (kill) :" +msgid "Score limit (kill)" +msgstr "Bewertungsgrenze (kill)" #: src/lang.c:1750 msgid "# Score limit before an article is marked killed\n" @@ -5119,8 +5125,8 @@ msgid "Enter default score to kill artic msgstr "Bewertung für gekillte Artikel. setzt." #: src/lang.c:1755 -msgid "Default score to kill articles :" -msgstr "Bewertung für gekillte Artikel :" +msgid "Default score to kill articles" +msgstr "Bewertung für gekillte Artikel" #: src/lang.c:1756 msgid "# Default score to kill articles\n" @@ -5131,8 +5137,8 @@ msgid "Enter minimal score before an art msgstr "Artikel mit einer höheren Bewertung (Score) werd. als wichtig/hot markiert." #: src/lang.c:1761 -msgid "Score limit (select) :" -msgstr "Bewertungsgrenze (select) :" +msgid "Score limit (select)" +msgstr "Bewertungsgrenze (select)" #: src/lang.c:1762 msgid "# Score limit before an article is marked hot\n" @@ -5144,16 +5150,16 @@ msgid "Enter default score to select art msgstr "Bewertung für wichtige Artikel (hot). setzt." #: src/lang.c:1767 -msgid "Default score to select articles :" -msgstr "Bewertung für wichtige Artikel :" +msgid "Default score to select articles" +msgstr "Bewertung für wichtige Artikel" #: src/lang.c:1768 msgid "# Default score to select articles\n" msgstr "# Bewertung für wichtige Artikel (hot)\n" #: src/lang.c:1774 -msgid "Use slrnface to show ''X-Face:''s :" -msgstr "''X-Face:''s mit slrnface Anzeigen :" +msgid "Use slrnface to show ''X-Face:''s" +msgstr "''X-Face:''s mit slrnface Anzeigen" #: src/lang.c:1775 msgid "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" @@ -5162,168 +5168,168 @@ msgstr "# Falls ON benutze slrnface(1) u "# Funktioniert nur wenn tin in einem xterm läuft.\n" #: src/lang.c:1783 -msgid "Use ANSI color :" -msgstr "Benutze ANSI-Farben :" +msgid "Use ANSI color" +msgstr "Benutze ANSI-Farben" #: src/lang.c:1784 msgid "# If ON using ANSI-color\n" msgstr "# Falls ON benutze ANSI-Farben\n" #: src/lang.c:1789 -msgid "Standard foreground color :" -msgstr "Standard Vordergrundfarbe :" +msgid "Standard foreground color" +msgstr "Standard Vordergrundfarbe" #: src/lang.c:1790 msgid "# Standard foreground color\n" msgstr "# Standard Vordergrundfarbe\n" #: src/lang.c:1795 -msgid "Standard background color :" -msgstr "Standard Hintergrundfarbe :" +msgid "Standard background color" +msgstr "Standard Hintergrundfarbe" #: src/lang.c:1796 msgid "# Standard-Background-Color\n" msgstr "# Standard Hintergrundfarbe\n" #: src/lang.c:1801 -msgid "Color for inverse text (background):" -msgstr "Farbe des inversen Text (Hinterg.) :" +msgid "Color for inverse text (background)" +msgstr "Farbe des inversen Text (Hinterg.)" #: src/lang.c:1802 msgid "# Color of background for inverse text\n" msgstr "# Farbe des Hintergrunds für inversen Text\n" #: src/lang.c:1807 -msgid "Color for inverse text (foreground):" -msgstr "Farbe des inversen Text (Vordergr.):" +msgid "Color for inverse text (foreground)" +msgstr "Farbe des inversen Text (Vordergr.)" #: src/lang.c:1808 msgid "# Color of foreground for inverse text\n" msgstr "# Farbe des Vordergrunds für inversen Text\n" #: src/lang.c:1813 -msgid "Color of text lines :" -msgstr "Farbe der Textzeilen :" +msgid "Color of text lines" +msgstr "Farbe der Textzeilen" #: src/lang.c:1814 msgid "# Color of text-lines\n" msgstr "# Farbe der Textzeilen\n" #: src/lang.c:1819 -msgid "Color of mini help menu :" -msgstr "Farbe des Minihilfemenü :" +msgid "Color of mini help menu" +msgstr "Farbe des Minihilfemenü" #: src/lang.c:1820 msgid "# Color of mini help menu\n" msgstr "# Farbe des Minihilfemenü\n" #: src/lang.c:1825 -msgid "Color of help text :" -msgstr "Farbe des Hilfstext :" +msgid "Color of help text" +msgstr "Farbe des Hilfstext" #: src/lang.c:1826 msgid "# Color of help pages\n" msgstr "# Farbe der Hilfsseiten\n" #: src/lang.c:1831 -msgid "Color of status messages :" -msgstr "Farbe der Statusmeldungen :" +msgid "Color of status messages" +msgstr "Farbe der Statusmeldungen" #: src/lang.c:1832 msgid "# Color of messages in last line\n" msgstr "# Farbe der letzten Zeile im Artikel\n" #: src/lang.c:1837 -msgid "Color of quoted lines :" -msgstr "Farbe der zitierten Zeilen :" +msgid "Color of quoted lines" +msgstr "Farbe der zitierten Zeilen" #: src/lang.c:1838 msgid "# Color of quote-lines\n" msgstr "# Farbe der zitierten Zeilen\n" #: src/lang.c:1843 -msgid "Color of twice quoted line :" -msgstr "Farbe von zweifach zitierten Zeilen:" +msgid "Color of twice quoted line" +msgstr "Farbe von zweifach zitierten Zeilen" #: src/lang.c:1844 msgid "# Color of twice quoted lines\n" msgstr "# Farbe von zweifach zitierten Zeilen\n" #: src/lang.c:1849 -msgid "Color of =>3 times quoted line :" -msgstr "Farbe von =>3-fach zitierten Zeilen:" +msgid "Color of =>3 times quoted line" +msgstr "Farbe von =>3-fach zitierten Zeilen" #: src/lang.c:1850 msgid "# Color of >=3 times quoted lines\n" msgstr "# Farbe von =>3-fach zitierten Zeilen\n" #: src/lang.c:1855 -msgid "Color of article header lines :" -msgstr "Farbe der Artikelheaderzeilen :" +msgid "Color of article header lines" +msgstr "Farbe der Artikelheaderzeilen" #: src/lang.c:1856 msgid "# Color of header-lines\n" msgstr "# Farbe der Artikelheaderzeilen\n" #: src/lang.c:1861 -msgid "Color of actual news header fields :" -msgstr "Farbe des angezeigten Headers :" +msgid "Color of actual news header fields" +msgstr "Farbe des angezeigten Headers" #: src/lang.c:1862 msgid "# Color of actual news header fields\n" msgstr "# Farbe des angezeigten Headers\n" #: src/lang.c:1867 -msgid "Color of article subject lines :" -msgstr "Farbe der Subjectzeile :" +msgid "Color of article subject lines" +msgstr "Farbe der Subjectzeile" #: src/lang.c:1868 msgid "# Color of article subject\n" msgstr "# Farbe der Subjectzeile\n" #: src/lang.c:1873 -msgid "Color of response counter :" -msgstr "Farbe des Antwortzählers :" +msgid "Color of response counter" +msgstr "Farbe des Antwortzählers" #: src/lang.c:1874 msgid "# Color of response counter\n" msgstr "# Farbe des Antwortzählers\n" #: src/lang.c:1879 -msgid "Color of sender (From:) :" -msgstr "Farbe des Autors (From:) :" +msgid "Color of sender (From:)" +msgstr "Farbe des Autors (From:)" #: src/lang.c:1880 msgid "# Color of sender (From:)\n" msgstr "# Farbe des Autors (From:)\n" #: src/lang.c:1885 -msgid "Color of help/mail sign :" -msgstr "Farbe des Hilfe/Mail-Zeichen :" +msgid "Color of help/mail sign" +msgstr "Farbe des Hilfe/Mail-Zeichen" #: src/lang.c:1886 msgid "# Color of Help/Mail-Sign\n" msgstr "# Farbe des Hilfe/Mail-Zeichen\n" #: src/lang.c:1891 -msgid "Color of signatures :" -msgstr "Farbe von Signaturen :" +msgid "Color of signatures" +msgstr "Farbe von Signaturen" #: src/lang.c:1892 msgid "# Color of signature\n" msgstr "# Farbe von Signaturen\n" #: src/lang.c:1897 -msgid "Color of highlighted URLs :" -msgstr "Farbe der hervorgehobenen URLs :" +msgid "Color of highlighted URLs" +msgstr "Farbe der hervorgehobenen URLs" #: src/lang.c:1898 msgid "# Color of highlighted URLs\n" msgstr "# Farbe der hervorgehobenen URLs\n" #: src/lang.c:1903 -msgid "Color of highlighting with *stars* :" -msgstr "Farbe der Hervorhebung *Sterne* :" +msgid "Color of highlighting with *stars*" +msgstr "Farbe der Hervorhebung *Sterne*" #: src/lang.c:1904 msgid "# Color of word highlighting. There are four possibilities\n" @@ -5332,20 +5338,20 @@ msgstr "# Farbe der Hervorhebungen. Es g "# *Sterne*, _Unterstriche_, /Schrägstriche/ und -Durchstreichen-.\n" #: src/lang.c:1910 -msgid "Color of highlighting with _dash_ :" -msgstr "Farbe der Hervorhebung _Striche_ :" +msgid "Color of highlighting with _dash_" +msgstr "Farbe der Hervorhebung _Striche_" #: src/lang.c:1916 -msgid "Color of highlighting with /slash/ :" -msgstr "Farbe der Hervorhebung /Schrägstr./:" +msgid "Color of highlighting with /slash/" +msgstr "Farbe der Hervorhebung /Schrägstr./" #: src/lang.c:1922 -msgid "Color of highlighting with -stroke-:" -msgstr "Farbe der Hervorhebung -Durchstr.- :" +msgid "Color of highlighting with -stroke-" +msgstr "Farbe der Hervorhebung -Durchstr.-" #: src/lang.c:1929 -msgid "Attr. of highlighting with *stars* :" -msgstr "Hervorhebungsattribute *Sterne* :" +msgid "Attr. of highlighting with *stars*" +msgstr "Hervorhebungsattribute *Sterne*" #: src/lang.c:1930 msgid "# Attribute of word highlighting on mono terminals.\n" @@ -5362,36 +5368,36 @@ msgstr "# Attribute der Hervorhebung von "# 3 - invers, 4 - blinkend, 5 - halbe Helligkeit, 6 - fett\n" #: src/lang.c:1940 -msgid "Attr. of highlighting with _dash_ :" -msgstr "Hervorhebungsattr. _Unterstriche_ :" +msgid "Attr. of highlighting with _dash_" +msgstr "Hervorhebungsattr. _Unterstriche_" #: src/lang.c:1946 -msgid "Attr. of highlighting with /slash/ :" -msgstr "Hervorhebungsattr. /Schrägstriche/ :" +msgid "Attr. of highlighting with /slash/" +msgstr "Hervorhebungsattr. /Schrägstriche/" #: src/lang.c:1952 -msgid "Attr. of highlighting with -stroke-:" -msgstr "Hervorhebungsattr. -Durchstreich.- :" +msgid "Attr. of highlighting with -stroke-" +msgstr "Hervorhebungsattr. -Durchstreich.-" #: src/lang.c:1958 -msgid "URL highlighting in message body :" -msgstr "URL-Hervorhebung im Artikel :" +msgid "URL highlighting in message body" +msgstr "URL-Hervorhebung im Artikel" #: src/lang.c:1959 msgid "# Enable URL highlighting?\n" msgstr "# URL-Hervorhebung aktivieren?\n" #: src/lang.c:1964 -msgid "Word highlighting in message body :" -msgstr "Wort-Hervorhebung im Artikel :" +msgid "Word highlighting in message body" +msgstr "Wort-Hervorhebung im Artikel" #: src/lang.c:1965 msgid "# Enable word highlighting?\n" msgstr "# Wort-Hervorhebung aktivieren?\n" #: src/lang.c:1970 -msgid "What to display instead of mark :" -msgstr "Anstelle der Markierung anzeigen :" +msgid "What to display instead of mark" +msgstr "Anstelle der Markierung anzeigen" #: src/lang.c:1971 msgid "# Should the leading and ending stars and dashes also be displayed,\n" @@ -5406,16 +5412,16 @@ msgid "Enter column number to wrap artic msgstr "Nach wie vielen Zeichen soll im Pager umbrochen werden? setzt." #: src/lang.c:1978 -msgid "Page line wrap column :" -msgstr "Zeilen umbrechen nach :" +msgid "Page line wrap column" +msgstr "Zeilen umbrechen nach" #: src/lang.c:1979 msgid "# Wrap article lines at column\n" msgstr "# In der Artikelanzeige Zeilen umbrechen bei Spalte\n" #: src/lang.c:1984 -msgid "Wrap around threads on next unread :" -msgstr "Nä.ungel.-kein Abbr. am Listenende?:" +msgid "Wrap around threads on next unread" +msgstr "Nä.ungel.-kein Abbr. am Listenende?" #: src/lang.c:1985 msgid "# If ON wrap around threads on searching next unread article\n" @@ -5429,8 +5435,8 @@ msgid "Enter default mail address (and f msgstr "Standard Mail-Adresse (und Name) eingeben. setzt." #: src/lang.c:1990 -msgid "Mail address (and fullname) :" -msgstr "Mailadresse (und Name) :" +msgid "Mail address (and fullname)" +msgstr "Mailadresse (und Name)" #: src/lang.c:1991 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" @@ -5438,8 +5444,8 @@ msgstr "# EMail-Adresse und vollständige "# benutzername@host (Vollständiger Name) lautet\n" #: src/lang.c:1996 -msgid "Show empty Followup-To in editor :" -msgstr "Leeres Fup'2 im Editor anzeigen :" +msgid "Show empty Followup-To in editor" +msgstr "Leeres Fup'2 im Editor anzeigen" #: src/lang.c:1997 msgid "# If ON show empty Followup-To header when editing an article\n" @@ -5450,8 +5456,8 @@ msgid "Enter path/! command/--none to cr msgstr "Setze Pfad/! Kommando/--none um ihre Signatur festzulegen. setzt." #: src/lang.c:2002 -msgid "Create signature from path/command :" -msgstr "Erzeuge Signatur aus Pfad/Kommando :" +msgid "Create signature from path/command" +msgstr "Erzeuge Signatur aus Pfad/Kommando" #: src/lang.c:2003 msgid "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -5469,8 +5475,8 @@ msgid "Prepend signature with \"-- \" on msgstr "Trenne Sig mit \"-- \" in eigener Zeile ab. wechselt & setzt." #: src/lang.c:2011 -msgid "Prepend signature with \"-- \" :" -msgstr "Trenne Sig mit \"-- \" ab :" +msgid "Prepend signature with \"-- \"" +msgstr "Trenne Sig mit \"-- \" ab" #: src/lang.c:2012 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" @@ -5481,8 +5487,8 @@ msgid "Add signature when reposting arti msgstr "Sig. beim Reposten eines Artikels hinzufügen? wechselt & setzt." #: src/lang.c:2017 -msgid "Add signature when reposting :" -msgstr "Signatur beim Reposten anhängen :" +msgid "Add signature when reposting" +msgstr "Signatur beim Reposten anhängen" #: src/lang.c:2018 msgid "# If ON add signature to reposted articles\n" @@ -5493,8 +5499,8 @@ msgid "Enter quotation marks, %s or %S f msgstr "Zitatzeichen eingeben, %s oder %S für die Initialen des Verfassers." #: src/lang.c:2023 -msgid "Characters used as quote-marks :" -msgstr "Zitatzeichen :" +msgid "Characters used as quote-marks" +msgstr "Zitatzeichen" #: src/lang.c:2024 msgid "# Characters used in quoting to followups and replies.\n" @@ -5503,8 +5509,8 @@ msgstr "# Zeichen für Zitate in Antworte "# '_' wird durch ' ' ersetzt. %%s, %%S wird ersetzt durch Autoreninitialen.\n" #: src/lang.c:2030 -msgid "Quoting behavior :" -msgstr "Zitierverhalten :" +msgid "Quoting behavior" +msgstr "Zitierverhalten" #: src/lang.c:2031 msgid "# How quoting should be handled when following up or replying.\n" @@ -5532,8 +5538,8 @@ msgid "%A Addr %D Date %F Addr+Name %G G msgstr "%A Adr %D Datum %F Adr+Name %G Gruppenname %M Message-ID %N Name %C Vorname" #: src/lang.c:2044 -msgid "Quote line when following up :" -msgstr "Einleitungszeile beim Antworten :" +msgid "Quote line when following up" +msgstr "Einleitungszeile beim Antworten" #: src/lang.c:2045 msgid "# Format of quote line when mailing/posting/following-up an article\n" @@ -5544,20 +5550,20 @@ msgstr "# Format der Einleitungszeile be "# %%N Voller Name %%C Vorname %%I Initialen\n" #: src/lang.c:2052 -msgid "Quote line when cross-posting :" -msgstr "Einleitungszeile beim Crossposten :" +msgid "Quote line when cross-posting" +msgstr "Einleitungszeile beim Crossposten" #: src/lang.c:2058 -msgid "Quote line when mailing :" -msgstr "Einleitungszeile bei Mailantwort :" +msgid "Quote line when mailing" +msgstr "Einleitungszeile bei Mailantwort" #: src/lang.c:2063 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Falls ON, füge User-Agent:-Header ein. wechselt & setzt." #: src/lang.c:2064 -msgid "Insert 'User-Agent:'-header :" -msgstr "Füge 'User-Agent:'-header ein :" +msgid "Insert 'User-Agent:'-header" +msgstr "Füge 'User-Agent:'-header ein" #: src/lang.c:2065 msgid "# If ON include advertising User-Agent: header\n" @@ -5568,8 +5574,8 @@ msgid "Enter charset name for MIME (e.g. msgstr "Zeichensatz für MIME (z.B. US-ASCII, ISO-8859-1, EUC-KR), setzt." #: src/lang.c:2070 -msgid "MM_CHARSET :" -msgstr "MM_CHARSET :" +msgid "MM_CHARSET" +msgstr "MM_CHARSET" #: src/lang.c:2071 msgid "# Charset supported locally which is also used for MIME header and\n" @@ -5589,24 +5595,24 @@ msgstr "# Der lokale Zeichensatz, der au "# und die jeweiligen Zeichen durch ein '?' ersetzt.\n" #: src/lang.c:2082 -msgid "MM_NETWORK_CHARSET :" -msgstr "MM_NETWORK_CHARSET :" +msgid "MM_NETWORK_CHARSET" +msgstr "MM_NETWORK_CHARSET" #: src/lang.c:2083 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Zeichensatz für den MIME (Content-Type) Header der Artikel.\n" #: src/lang.c:2089 -msgid "Mailbox format :" -msgstr "Mailbox-Format :" +msgid "Mailbox format" +msgstr "Mailbox-Format" #: src/lang.c:2090 msgid "# Format of the mailbox.\n" msgstr "# Format der Mailbox.\n" #: src/lang.c:2095 -msgid "MIME encoding in news messages :" -msgstr "MIME-Kodierung in Newsartikeln :" +msgid "MIME encoding in news messages" +msgstr "MIME-Kodierung in Newsartikeln" #: src/lang.c:2096 msgid "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" @@ -5627,8 +5633,8 @@ msgid "Don't change unless you know what msgstr "Nur ändern, wenn Sie genau wissen, was Sie machen. bricht ab" #: src/lang.c:2105 -msgid "Use 8bit characters in news headers:" -msgstr "Benutze 8bit-Zeichen im Newsheader :" +msgid "Use 8bit characters in news headers" +msgstr "Benutze 8bit-Zeichen im Newsheader" #: src/lang.c:2106 msgid "# If ON, 8bit characters in news headers are NOT encoded.\n" @@ -5647,20 +5653,20 @@ msgid "Auto-view post-processed files wechselt, setzt, Ende" #: src/lang.c:2114 -msgid "View post-processed files :" -msgstr "Nachbearbeitete Artikel anzeigen :" +msgid "View post-processed files" +msgstr "Nachbearbeitete Artikel anzeigen" #: src/lang.c:2115 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# Wenn ON werden nachbearbeitete Artikel automatisch angezeigt.\n" #: src/lang.c:2120 -msgid "MIME encoding in mail messages :" -msgstr "MIME-Kodierung für E-Mails :" +msgid "MIME encoding in mail messages" +msgstr "MIME-Kodierung für E-Mails" #: src/lang.c:2126 -msgid "Use 8bit characters in mail headers:" -msgstr "Benutze 8bit Zeichen im Mail Header:" +msgid "Use 8bit characters in mail headers" +msgstr "Benutze 8bit Zeichen im Mail Header" #: src/lang.c:2127 msgid "# If ON, 8bit characters in mail headers are NOT encoded.\n" @@ -5680,8 +5686,8 @@ msgstr "# Wenn ON werden 8-Bit-Zeichen ( "# geändert werden, wenn es keine zwingende Gründe dafür gibt.\n" #: src/lang.c:2137 -msgid "Strip blanks from ends of lines :" -msgstr "Leerzeichen am Zeilenende entfernen:" +msgid "Strip blanks from ends of lines" +msgstr "Leerzeichen am Zeilenende entfernen" #: src/lang.c:2138 msgid "# If ON strip blanks from ends of lines for faster display on slow " @@ -5693,8 +5699,8 @@ msgid "If ON, use transliteration. wechselt & setzt." #: src/lang.c:2144 -msgid "Transliteration :" -msgstr "Verwende Umschreibungen :" +msgid "Transliteration" +msgstr "Verwende Umschreibungen" #: src/lang.c:2145 msgid "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" @@ -5711,8 +5717,8 @@ msgid "Send you a carbon copy automatica msgstr "Sendet ihnen automatisch eine Kopie. wechselt & setzt." #: src/lang.c:2153 -msgid "Send you a cc automatically :" -msgstr "Sendet Ihnen ein Cc automatisch :" +msgid "Send you a cc automatically" +msgstr "Sendet Ihnen ein Cc automatisch" #: src/lang.c:2154 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" @@ -5723,8 +5729,8 @@ msgid "Send you a blind carbon copy auto msgstr "Sendet ihnen automatisch eine blinde Kopie. wechselt & setzt." #: src/lang.c:2159 -msgid "Send you a blind cc automatically :" -msgstr "Sendet Ihnen eine blinde cc autom. :" +msgid "Send you a blind cc automatically" +msgstr "Sendet Ihnen eine blinde cc autom." #: src/lang.c:2160 msgid "# If ON automatically put your name in the Bcc: field when mailing an " @@ -5737,8 +5743,8 @@ msgid "Enter address elements about whic msgstr "Geben Sie den Adressenteil an, vor dem Sie gewarnt werden. setzt." #: src/lang.c:2165 -msgid "Spamtrap warning address parts :" -msgstr "Spamfallenwarnung in Adresse :" +msgid "Spamtrap warning address parts" +msgstr "Spamfallenwarnung in Adresse" #: src/lang.c:2166 msgid "# A comma-delimited list of address-parts you want to be warned\n" @@ -5751,8 +5757,8 @@ msgid "Enter default number of days a fi msgstr "Gültigkeit eines Filtereintrags in Tagen. setzt." #: src/lang.c:2172 -msgid "No. of days a filter entry is valid:" -msgstr "Tage, die ein Filter gültig ist :" +msgid "No. of days a filter entry is valid" +msgstr "Tage, die ein Filter gültig ist" #: src/lang.c:2173 msgid "# Number of days a short term filter will be active\n" @@ -5763,8 +5769,8 @@ msgid "Add posted articles to filter. wechselt & setzt." #: src/lang.c:2178 -msgid "Add posted articles to filter :" -msgstr "Füge gepostete Artikel zum Filter :" +msgid "Add posted articles to filter" +msgstr "Füge gepostete Artikel zum Filter" #: src/lang.c:2179 msgid "# If ON add posted articles which start a new thread to filter for\n" @@ -5777,16 +5783,16 @@ msgid "The directory where articles/thre msgstr "Verzeichnis, in dem Artikel/Threads im mailbox-Format gespeichert werden" #: src/lang.c:2184 -msgid "Mail directory :" -msgstr "Mail Verzeichnis :" +msgid "Mail directory" +msgstr "Mail Verzeichnis" #: src/lang.c:2185 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) Verzeichnis für im mailbox-Format gespeicherte Artikel/Threads\n" #: src/lang.c:2190 -msgid "Save articles in batch mode (-S) :" -msgstr "Speicher Artikel im Batchmode (-S) :" +msgid "Save articles in batch mode (-S)" +msgstr "Speicher Artikel im Batchmode (-S)" #: src/lang.c:2191 msgid "# If ON articles/threads will be saved in batch mode when save -S\n" @@ -5799,8 +5805,8 @@ msgid "The directory where you want arti msgstr "Das Verzeichnis, in dem Artikel/Threads gespeichert werden sollen." #: src/lang.c:2197 -msgid "Directory to save arts/threads in :" -msgstr "Verz. um Art/Threads zu speichern :" +msgid "Directory to save arts/threads in" +msgstr "Verz. um Art/Threads zu speichern" #: src/lang.c:2198 msgid "# Directory where articles/threads are saved\n" @@ -5812,8 +5818,8 @@ msgstr "Autom. sp. von Art/Thread anhand " setzt." #: src/lang.c:2203 -msgid "Use Archive-name: header for save :" -msgstr "Nutze Archive-name: zum Speichern :" +msgid "Use Archive-name: header for save" +msgstr "Nutze Archive-name: zum Speichern" #: src/lang.c:2204 msgid "# If ON articles/threads with Archive-name: in mail header will\n" @@ -5827,8 +5833,8 @@ msgid "Mark saved articles/threads as re msgstr "Gesp. Art. gelesen markieren. wechselt, setzt, bricht ab." #: src/lang.c:2210 -msgid "Mark saved articles/threads as read:" -msgstr "Mark. gesp. Artikel/Threads gelesen:" +msgid "Mark saved articles/threads as read" +msgstr "Mark. gesp. Artikel/Threads gelesen" #: src/lang.c:2211 msgid "# If ON mark articles that are saved as read\n" @@ -5839,8 +5845,8 @@ msgid "Do post processing (eg. extract a msgstr "Bearbeite (z.B. unshar) gesp. Art/Threads. wechselt & setzt." #: src/lang.c:2216 -msgid "Post process saved articles :" -msgstr "Nachbearbeiten gespeichert. Artikel:" +msgid "Post process saved articles" +msgstr "Nachbearbeiten gespeichert. Artikel" #: src/lang.c:2217 msgid "# Perform post processing (saving binary attachments) from saved articles.\n" @@ -5849,8 +5855,8 @@ msgstr "# Nachbearbeiten gespeicherter A "# 0=(nein) 1=(ja) 2=(nur Shell Archive (shar) auspacken)\n" #: src/lang.c:2223 -msgid "Process only unread articles :" -msgstr "Bearbeite nur ungelesene Artikel :" +msgid "Process only unread articles" +msgstr "Bearbeite nur ungelesene Artikel" #: src/lang.c:2224 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" @@ -5862,8 +5868,8 @@ msgid "Print all or just part of header. msgstr "Drucke alles oder nur Teile des Headers wechselt & setzt." #: src/lang.c:2230 -msgid "Print all headers when printing :" -msgstr "Alle Header beim Drucken ausgeben :" +msgid "Print all headers when printing" +msgstr "Alle Header beim Drucken ausgeben" #: src/lang.c:2231 msgid "# If ON print all of article header otherwise just the important lines\n" @@ -5875,16 +5881,16 @@ msgid "The printer program with options msgstr "Das Druckprogramm, das zum drucken von Artikeln/Threads benutzt wird." #: src/lang.c:2236 -msgid "Printer program with options :" -msgstr "Druckprogramm mit Optionen :" +msgid "Printer program with options" +msgstr "Druckprogramm mit Optionen" #: src/lang.c:2237 msgid "# Print program with parameters used to print articles/threads\n" msgstr "# Druckprogramm mit Optionen zum drucken der Artikel/Threads\n" #: src/lang.c:2243 -msgid "Force redraw after certain commands:" -msgstr "Anzeigeauffrischung nach Kommandos :" +msgid "Force redraw after certain commands" +msgstr "Anzeigeauffrischung nach Kommandos" #: src/lang.c:2244 msgid "# If ON a screen redraw will always be done after certain external commands\n" @@ -5895,8 +5901,8 @@ msgid "Start editor with line offset. wechselt, setzt, bricht ab." #: src/lang.c:2249 -msgid "Start editor with line offset :" -msgstr "Starte Editor mit Einrückung :" +msgid "Start editor with line offset" +msgstr "Starte Editor mit Einrückung" #: src/lang.c:2250 msgid "# If ON editor will be started with cursor offset into the file\n" @@ -5909,8 +5915,8 @@ msgid "Enter %E for editor, %F for filen msgstr "%E für Editor, %F für Dateiname, %N für Zeilennummer, setzt." #: src/lang.c:2256 -msgid "Invocation of your editor :" -msgstr "Aufruf ihres Editors :" +msgid "Invocation of your editor" +msgstr "Aufruf ihres Editors" #: src/lang.c:2257 msgid "# Format of editor line including parameters\n" @@ -5923,8 +5929,8 @@ msgid "Enter name and options for extern msgstr "Name und Optionen für ext. inews, --internal für eingebaute Version" #: src/lang.c:2263 -msgid "External inews :" -msgstr "Externes inews-Programm :" +msgid "External inews" +msgstr "Externes inews-Programm" #: src/lang.c:2264 msgid "# If --internal use the built in mini inews for posting via NNTP\n" @@ -5938,8 +5944,8 @@ msgid "Enter %M for mailer, %S for subje msgstr "%M für den Mailer, %S für Subject, %T für to, %F für Dateinamen, setzt." #: src/lang.c:2269 -msgid "Invocation of your mail command :" -msgstr "Aufruf ihres Mailkommandos :" +msgid "Invocation of your mail command" +msgstr "Aufruf ihres Mailkommandos" #: src/lang.c:2270 msgid "# Format of mailer line including parameters\n" @@ -5952,8 +5958,8 @@ msgstr "# Format der Mailkommandozeile m "# Ein Beispiel für elm interaktiv: elm -i %%F -s \"%%S\" \"%%T\"\n" #: src/lang.c:2278 -msgid "Use interactive mail reader :" -msgstr "Benutze interaktives Mailprogramm :" +msgid "Use interactive mail reader" +msgstr "Benutze interaktives Mailprogramm" #: src/lang.c:2279 msgid "# Interactive mailreader:\n" @@ -5967,8 +5973,8 @@ msgstr "# Interaktives Mailprogramm:\n" "# 2 = interaktives Mailprogramm, Mailheader werden als Argumente übergeben\n" #: src/lang.c:2287 -msgid "Remove ~/.article after posting :" -msgstr "Entferne ~/.article nach dem posten:" +msgid "Remove ~/.article after posting" +msgstr "Entferne ~/.article nach dem posten" #: src/lang.c:2288 msgid "# If ON remove ~/.article after posting.\n" @@ -5979,8 +5985,8 @@ msgid "Filename for all posted articles, msgstr "Dateiname für Kopie geposteter Artikel. setzt, kein Name=keine Kopie." #: src/lang.c:2293 -msgid "Filename for posted articles :" -msgstr "Gepostete Artikel speichern in :" +msgid "Filename for posted articles" +msgstr "Gepostete Artikel speichern in" #: src/lang.c:2294 msgid "# Filename where to keep all postings (default posted)\n" @@ -5993,8 +5999,8 @@ msgid "Keep all failed articles in ~/dea msgstr "Behalte alle Fehlschläge in ~/dead.articles. wechselt & setzt." #: src/lang.c:2300 -msgid "Keep failed arts in ~/dead.articles:" -msgstr "Halte Fehlschl. in ~/dead.articles :" +msgid "Keep failed arts in ~/dead.articles" +msgstr "Halte Fehlschl. in ~/dead.articles" #: src/lang.c:2301 msgid "# If ON keep all failed postings in ~/dead.articles\n" @@ -6005,16 +6011,16 @@ msgid "Do you want to strip unsubscribed msgstr "Wollen Sie nicht-abonnierte Gruppen aus der .newsrc entfernen?" #: src/lang.c:2306 -msgid "No unsubscribed groups in newsrc :" -msgstr "Nur abonnierte Gruppen in newsrc :" +msgid "No unsubscribed groups in newsrc" +msgstr "Nur abonnierte Gruppen in newsrc" #: src/lang.c:2307 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Falls ON entferne nicht-abonnierte Gruppen aus der newsrc\n" #: src/lang.c:2312 -msgid "Remove bogus groups from newsrc :" -msgstr "Lösche nicht vorhande G. aus newsrc:" +msgid "Remove bogus groups from newsrc" +msgstr "Lösche nicht vorhande G. aus newsrc" #: src/lang.c:2313 msgid "# What to do with bogus groups in newsrc file\n" @@ -6027,16 +6033,16 @@ msgid "Enter number of seconds until act msgstr "Sekunden, nach denen die active-Datei wieder gelesen wird. setzt." #: src/lang.c:2318 -msgid "Interval in secs to reread active :" -msgstr "Active alle ... Sekunden neu lesen :" +msgid "Interval in secs to reread active" +msgstr "Active alle ... Sekunden neu lesen" #: src/lang.c:2319 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "# Zeitintervall in Sekunden zwischen dem Wiedereinlesen des active (0=nie)\n" #: src/lang.c:2324 -msgid "Reconnect to server automatically :" -msgstr "Autom. Wiederverbindung zum Server :" +msgid "Reconnect to server automatically" +msgstr "Autom. Wiederverbindung zum Server" #: src/lang.c:2325 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" @@ -6049,8 +6055,8 @@ msgstr "Erzeuge lokale Kopien der NNTP O "setzt." #: src/lang.c:2330 -msgid "Cache NNTP overview files locally :" -msgstr "Speichere NNTP Overview Daten lokal:" +msgid "Cache NNTP overview files locally" +msgstr "Speichere NNTP Overview Daten lokal" #: src/lang.c:2331 msgid "# If ON, create local copies of NNTP overview files.\n" @@ -6061,8 +6067,8 @@ msgid "Enter format string. sets, < msgstr "Format-Zeichenkette eingeben. setzt, bricht ab." #: src/lang.c:2336 -msgid "Format string for display of dates :" -msgstr "Datums Format-Zeichenkette :" +msgid "Format string for display of dates" +msgstr "Datums Format-Zeichenkette" #: src/lang.c:2337 msgid "# Format string for date representation\n" @@ -6070,7 +6076,7 @@ msgstr "# Zeichenkette die die Datumsanz # TRANSLATION MISSING #: src/lang.c:2343 -msgid "Unicode normalization form :" +msgid "Unicode normalization form" msgstr "" # TRANSLATION MISSING @@ -6079,6 +6085,15 @@ msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" +#: src/lang.c:2351 +msgid "Render BiDi" +msgstr "" + +# TRANSLATION MISSING +#: src/lang.c:2352 +msgid "# If ON, bi-directional text is rendered by tin\n" +msgstr "" + #: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" @@ -6089,27 +6104,27 @@ msgstr "Version: %s Ausgabe %s (\"%s\") msgid "Version: %s release %s (\"%s\")" msgstr "Version: %s Ausgabe %s (\"%s\")" -#: src/newsrc.c:433 +#: src/newsrc.c:432 msgid "Unreachable?\n" msgstr "Unerreichbar?\n" -#: src/nntplib.c:822 +#: src/nntplib.c:823 #, c-format msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "\n" "Server reagierte nicht, Wiederholung Nummer # %d\n" -#: src/nntplib.c:840 +#: src/nntplib.c:841 msgid "Rejoin current group\n" msgstr "Betrete aktuelle Gruppe neu\n" -#: src/nntplib.c:847 +#: src/nntplib.c:848 #, c-format msgid "Read (%s)\n" msgstr "Lese (%s)\n" -#: src/nntplib.c:849 +#: src/nntplib.c:850 #, c-format msgid "Resend last command (%s)\n" msgstr "Sende letztes Kommando (%s) neu\n" @@ -6143,11 +6158,23 @@ msgstr "Ablassen\n" msgid "unchanged" msgstr "unverändert" -#: src/refs.c:610 +#: src/refs.c:609 msgid "[- Unavailable -]" msgstr "[- Nicht Verfügbar -]" -#: src/save.c:976 +# TRANSLATION MISSING +#. +#. * preamble +#. * TODO: -> lang.c +#. +#: src/rfc2047.c:1203 +msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" + "are reading this prefix, your mail reader probably has not yet been modified\n" + "to understand the new format, and some of what follows may look strange.\n" + "\n" +msgstr "" + +#: src/save.c:967 msgid "bytes" msgstr "Bytes" Binary files tin-1.7.4/po/en_GB.gmo and tin-1.7.5/po/en_GB.gmo differ diff -Nurp tin-1.7.4/po/en_GB.po tin-1.7.5/po/en_GB.po --- tin-1.7.4/po/en_GB.po 2004-02-25 10:34:11.000000000 +0100 +++ tin-1.7.5/po/en_GB.po 2004-06-04 13:32:28.000000000 +0200 @@ -3,231 +3,236 @@ # msgid "" msgstr "Project-Id-Version: tin 1.7.4\n" - "POT-Creation-Date: 2004-02-25 10:33+0100\n" + "POT-Creation-Date: 2004-06-04 13:31+0200\n" "PO-Revision-Date: 2002-11-15 20:10+0000\n" "Last-Translator: Robert Brady \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" + "Report-Msgid-Bugs-To: \n" #: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "" -#: src/attrib.c:585 +#: src/attrib.c:590 msgid "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:586 +#: src/attrib.c:591 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:587 +#: src/attrib.c:592 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "" -#: src/attrib.c:588 +#: src/attrib.c:593 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "" -#: src/attrib.c:589 +#: src/attrib.c:594 msgid "# savefile=STRING (ie. =linux)\n" msgstr "" -#: src/attrib.c:590 +#: src/attrib.c:595 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "" -#: src/attrib.c:591 +#: src/attrib.c:596 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:592 +#: src/attrib.c:597 msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:593 +#: src/attrib.c:598 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:594 +#: src/attrib.c:599 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:595 +#: src/attrib.c:600 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:596 +#: src/attrib.c:601 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:597 +#: src/attrib.c:602 msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:598 +#: src/attrib.c:603 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:599 +#: src/attrib.c:604 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:601 +#: src/attrib.c:606 msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:603 +#: src/attrib.c:608 msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:604 +#: src/attrib.c:609 msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:605 +#: src/attrib.c:610 msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:606 +#: src/attrib.c:611 msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:607 +#: src/attrib.c:612 msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:608 +#: src/attrib.c:613 msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:615 +#: src/attrib.c:620 msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:621 +#: src/attrib.c:626 msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:627 +#: src/attrib.c:632 msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:645 +#: src/attrib.c:650 msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:650 +#: src/attrib.c:655 msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:655 +#: src/attrib.c:660 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:656 +#: src/attrib.c:661 msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:657 +#: src/attrib.c:662 msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:658 +#: src/attrib.c:663 msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:659 src/attrib.c:666 +#: src/attrib.c:664 src/attrib.c:671 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "" -#: src/attrib.c:660 src/attrib.c:667 +#: src/attrib.c:665 src/attrib.c:672 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "" -#: src/attrib.c:661 src/attrib.c:668 +#: src/attrib.c:666 src/attrib.c:673 msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:667 msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:663 +#: src/attrib.c:668 msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:664 +#: src/attrib.c:669 msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:665 +#: src/attrib.c:670 msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:669 +#: src/attrib.c:674 msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:670 +#: src/attrib.c:675 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:671 +#: src/attrib.c:676 msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:673 +#: src/attrib.c:677 +msgid "# mime_forward=ON/OFF\n" +msgstr "" + +#: src/attrib.c:679 msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:680 +#: src/attrib.c:686 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:682 +#: src/attrib.c:688 msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:683 +#: src/attrib.c:689 msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:684 +#: src/attrib.c:690 msgid "############################################################################\n" "\n" msgstr "" -#: src/attrib.c:690 +#: src/attrib.c:696 msgid "# include extra headers\n" msgstr "" -#: src/attrib.c:698 +#: src/attrib.c:704 msgid "# in *sources* set post process type to shar only\n" msgstr "" -#: src/attrib.c:702 +#: src/attrib.c:708 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "" -#: src/attrib.c:703 +#: src/attrib.c:709 msgid "# and set Followup-To: poster\n" msgstr "" -#: src/cook.c:809 +#: src/cook.c:814 msgid "(unknown)" msgstr "" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:612 src/filter.c:620 +#: src/filter.c:600 src/filter.c:608 msgid "Removed from the previous rule: " msgstr "" @@ -849,7 +854,7 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "" -#: src/lang.c:199 src/newsrc.c:410 +#: src/lang.c:199 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "" @@ -3670,7 +3675,7 @@ msgstr "Terminal does not support colour msgid "Trying %s" msgstr "" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:297 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:296 msgid "None" msgstr "" @@ -4039,12 +4044,12 @@ msgstr "" #: src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 src/lang.c:1995 src/lang.c:2029 #: src/lang.c:2081 src/lang.c:2088 src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 #: src/lang.c:2189 src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 -#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 src/lang.c:2350 msgid " toggles, sets, cancels." msgstr "" #: src/lang.c:1344 -msgid "Show mini menu & posting etiquette :" +msgid "Show mini menu & posting etiquette" msgstr "" #: src/lang.c:1345 @@ -4057,7 +4062,7 @@ msgid "Show short description for each n msgstr "" #: src/lang.c:1351 -msgid "Show description of each newsgroup :" +msgid "Show description of each newsgroup" msgstr "" #: src/lang.c:1352 @@ -4071,7 +4076,7 @@ msgid "Show Subject & From (author) fiel msgstr "" #: src/lang.c:1358 -msgid "In group menu, show author by :" +msgid "In group menu, show author by" msgstr "" #: src/lang.c:1359 @@ -4083,7 +4088,7 @@ msgid "Draw -> or highlighted bar for se msgstr "" #: src/lang.c:1364 -msgid "Draw -> instead of highlighted bar :" +msgid "Draw -> instead of highlighted bar" msgstr "" #: src/lang.c:1365 @@ -4091,7 +4096,7 @@ msgid "# If ON use -> otherwise highligh msgstr "" #: src/lang.c:1370 -msgid "Use inverse video for page headers :" +msgid "Use inverse video for page headers" msgstr "" #: src/lang.c:1371 @@ -4099,7 +4104,7 @@ msgid "# If ON use inverse video for pag msgstr "" #: src/lang.c:1376 -msgid "Thread articles by :" +msgid "Thread articles by" msgstr "" #: src/lang.c:1377 @@ -4108,7 +4113,7 @@ msgid "# Thread articles on 0=(nothing) msgstr "" #: src/lang.c:1383 -msgid "Score of a thread :" +msgid "Score of a thread" msgstr "" #: src/lang.c:1384 @@ -4120,7 +4125,7 @@ msgid "Sort articles by Subject, From, D msgstr "" #: src/lang.c:1389 -msgid "Sort articles by :" +msgid "Sort articles by" msgstr "" #: src/lang.c:1390 @@ -4134,7 +4139,7 @@ msgid "Sort threads by Nothing or Score. msgstr "" #: src/lang.c:1397 -msgid "Sort threads by :" +msgid "Sort threads by" msgstr "" #: src/lang.c:1398 @@ -4146,7 +4151,7 @@ msgid "Put cursor at first/last unread a msgstr "" #: src/lang.c:1403 -msgid "Goto first unread article in group :" +msgid "Goto first unread article in group" msgstr "" #: src/lang.c:1404 @@ -4158,7 +4163,7 @@ msgid "Show all articles or only unread msgstr "" #: src/lang.c:1409 -msgid "Show only unread articles :" +msgid "Show only unread articles" msgstr "" #: src/lang.c:1410 @@ -4166,7 +4171,7 @@ msgid "# If ON show only new/unread arti msgstr "" #: src/lang.c:1415 -msgid "Show only groups with unread arts :" +msgid "Show only groups with unread arts" msgstr "" #: src/lang.c:1416 @@ -4174,7 +4179,7 @@ msgid "# If ON show only subscribed to g msgstr "" #: src/lang.c:1421 -msgid "Filter which articles :" +msgid "Filter which articles" msgstr "" #: src/lang.c:1422 @@ -4184,7 +4189,7 @@ msgid "# 0=(Only kill unread articles)\n msgstr "" #: src/lang.c:1429 -msgid "Tab goes to next unread article :" +msgid "Tab goes to next unread article" msgstr "" #: src/lang.c:1430 @@ -4197,7 +4202,7 @@ msgid "Scrolling with past the e msgstr "" #: src/lang.c:1435 -msgid "Space goes to next unread article :" +msgid "Space goes to next unread article" msgstr "" #: src/lang.c:1436 @@ -4210,7 +4215,7 @@ msgid "Scrolling with / past msgstr "" #: src/lang.c:1442 -msgid "PgDn goes to next unread article :" +msgid "PgDn goes to next unread article" msgstr "" #: src/lang.c:1443 @@ -4219,7 +4224,7 @@ msgid "# If ON the PGDN or DOWN command msgstr "" #: src/lang.c:1449 -msgid "List thread using right arrow key :" +msgid "List thread using right arrow key" msgstr "" #: src/lang.c:1450 @@ -4231,7 +4236,7 @@ msgid "Enter character to indicate delet msgstr "" #: src/lang.c:1455 -msgid "Character to show deleted articles :" +msgid "Character to show deleted articles" msgstr "" #: src/lang.c:1456 @@ -4244,7 +4249,7 @@ msgid "Enter character to indicate artic msgstr "" #: src/lang.c:1462 -msgid "Character to show inrange articles :" +msgid "Character to show inrange articles" msgstr "" #: src/lang.c:1463 @@ -4258,7 +4263,7 @@ msgid "Enter character to indicate that msgstr "" #: src/lang.c:1469 -msgid "Character to show returning arts :" +msgid "Character to show returning arts" msgstr "" #: src/lang.c:1470 @@ -4271,7 +4276,7 @@ msgid "Enter character to indicate selec msgstr "" #: src/lang.c:1476 -msgid "Character to show selected articles:" +msgid "Character to show selected articles" msgstr "" #: src/lang.c:1477 @@ -4284,7 +4289,7 @@ msgid "Enter character to indicate recen msgstr "" #: src/lang.c:1483 -msgid "Character to show recent articles :" +msgid "Character to show recent articles" msgstr "" #: src/lang.c:1484 @@ -4297,7 +4302,7 @@ msgid "Enter character to indicate unrea msgstr "" #: src/lang.c:1490 -msgid "Character to show unread articles :" +msgid "Character to show unread articles" msgstr "" #: src/lang.c:1491 @@ -4310,7 +4315,7 @@ msgid "Enter character to indicate read msgstr "" #: src/lang.c:1497 -msgid "Character to show read articles :" +msgid "Character to show read articles" msgstr "" #: src/lang.c:1498 @@ -4323,7 +4328,7 @@ msgid "Enter character to indicate kille msgstr "" #: src/lang.c:1504 -msgid "Character to show killed articles :" +msgid "Character to show killed articles" msgstr "" #: src/lang.c:1505 @@ -4336,7 +4341,7 @@ msgid "Enter character to indicate read msgstr "" #: src/lang.c:1511 -msgid "Character to show readselected arts:" +msgid "Character to show readselected arts" msgstr "" #: src/lang.c:1512 @@ -4349,7 +4354,7 @@ msgid "Enter maximum length of newsgroup msgstr "" #: src/lang.c:1518 -msgid "Max. length of group names shown :" +msgid "Max. length of group names shown" msgstr "" #: src/lang.c:1519 @@ -4357,7 +4362,7 @@ msgid "# Maximum length of the names of msgstr "" #: src/lang.c:1524 -msgid "Show lines/score in listings :" +msgid "Show lines/score in listings" msgstr "" #: src/lang.c:1525 @@ -4371,7 +4376,7 @@ msgid "0 = full page scrolling, -1 = sho msgstr "" #: src/lang.c:1531 -msgid "Number of lines to scroll in pager :" +msgid "Number of lines to scroll in pager" msgstr "" #: src/lang.c:1532 @@ -4389,7 +4394,7 @@ msgid "Display signatures. toggl msgstr "" #: src/lang.c:1540 -msgid "Display signatures :" +msgid "Display signatures" msgstr "" #: src/lang.c:1541 @@ -4401,7 +4406,7 @@ msgid "Display uuencoded data as tagged msgstr "" #: src/lang.c:1546 -msgid "Display uue data as an attachment :" +msgid "Display uue data as an attachment" msgstr "" #: src/lang.c:1547 @@ -4418,7 +4423,7 @@ msgid "Decode German style TeX umlaut co msgstr "" #: src/lang.c:1557 -msgid "Display \"a as Umlaut-a :" +msgid "Display \"a as Umlaut-a" msgstr "" #: src/lang.c:1558 @@ -4431,7 +4436,7 @@ msgid "Space separated list of header fi msgstr "" #: src/lang.c:1564 -msgid "Display these header fields (or *) :" +msgid "Display these header fields (or *)" msgstr "" #: src/lang.c:1565 @@ -4444,7 +4449,7 @@ msgid "# Which news headers you wish to msgstr "" #: src/lang.c:1574 -msgid "Do not display these header fields :" +msgid "Do not display these header fields" msgstr "" #: src/lang.c:1575 @@ -4463,7 +4468,7 @@ msgid "Do you want to enable automatic h msgstr "" #: src/lang.c:1586 -msgid "Skip multipart/alternative parts :" +msgid "Skip multipart/alternative parts" msgstr "" #: src/lang.c:1587 @@ -4475,7 +4480,7 @@ msgid "A regex used to decide which line msgstr "" #: src/lang.c:1593 -msgid "Regex used to show quoted lines :" +msgid "Regex used to show quoted lines" msgstr "" #: src/lang.c:1594 @@ -4489,7 +4494,7 @@ msgid "A regex used to decide which line msgstr "" #: src/lang.c:1601 -msgid "Regex used to show twice quoted l. :" +msgid "Regex used to show twice quoted l." msgstr "" #: src/lang.c:1602 @@ -4503,7 +4508,7 @@ msgid "A regex used to decide which line msgstr "" #: src/lang.c:1609 -msgid "Regex used to show >= 3 times q.l. :" +msgid "Regex used to show >= 3 times q.l." msgstr "" #: src/lang.c:1610 @@ -4517,7 +4522,7 @@ msgid "A regex used to decide which word msgstr "" #: src/lang.c:1618 -msgid "Regex used to highlight /slashes/ :" +msgid "Regex used to highlight /slashes/" msgstr "" #: src/lang.c:1619 @@ -4531,7 +4536,7 @@ msgid "A regex used to decide which word msgstr "" #: src/lang.c:1626 -msgid "Regex used to highlight *stars* :" +msgid "Regex used to highlight *stars*" msgstr "" #: src/lang.c:1627 @@ -4545,7 +4550,7 @@ msgid "A regex used to decide which word msgstr "" #: src/lang.c:1634 -msgid "Regex used to highlight -strokes- :" +msgid "Regex used to highlight -strokes-" msgstr "" #: src/lang.c:1635 @@ -4559,7 +4564,7 @@ msgid "A regex used to decide which word msgstr "" #: src/lang.c:1642 -msgid "Regex used to highlight _underline_:" +msgid "Regex used to highlight _underline_" msgstr "" #: src/lang.c:1643 @@ -4573,7 +4578,7 @@ msgid "A regex used to find Subject pref msgstr "" #: src/lang.c:1650 -msgid "Regex with Subject prefixes :" +msgid "Regex with Subject prefixes" msgstr "" #: src/lang.c:1651 @@ -4586,7 +4591,7 @@ msgid "A regex used to find Subject suff msgstr "" #: src/lang.c:1657 -msgid "Regex with Subject suffixes :" +msgid "Regex with Subject suffixes" msgstr "" #: src/lang.c:1658 @@ -4600,7 +4605,7 @@ msgid "Enter name and options for extern msgstr "" #: src/lang.c:1664 -msgid "MIME binary content viewer :" +msgid "MIME binary content viewer" msgstr "" #: src/lang.c:1665 @@ -4615,7 +4620,7 @@ msgid "Confirm before starting non-text msgstr "" #: src/lang.c:1673 -msgid "Ask before using MIME viewer :" +msgid "Ask before using MIME viewer" msgstr "" #: src/lang.c:1674 @@ -4628,7 +4633,7 @@ msgid "Ask to mark groups read when quit msgstr "" #: src/lang.c:1680 -msgid "Catchup read groups when quitting :" +msgid "Catchup read groups when quitting" msgstr "" #: src/lang.c:1681 @@ -4636,7 +4641,7 @@ msgid "# If ON ask user if read groups s msgstr "" #: src/lang.c:1686 -msgid "Catchup group using left key :" +msgid "Catchup group using left key" msgstr "" #: src/lang.c:1687 @@ -4644,11 +4649,11 @@ msgid "# If ON catchup group/thread when msgstr "" #: src/lang.c:1692 -msgid "Catchup thread by using left key :" +msgid "Catchup thread by using left key" msgstr "" #: src/lang.c:1698 -msgid "Which actions require confirmation :" +msgid "Which actions require confirmation" msgstr "" #: src/lang.c:1699 @@ -4656,7 +4661,7 @@ msgid "# What should we ask confirmation msgstr "" #: src/lang.c:1704 -msgid "'Mark article read' ignores tags :" +msgid "'Mark article read' ignores tags" msgstr "" #: src/lang.c:1705 @@ -4668,7 +4673,7 @@ msgid "Program to run to open URL's, 3 times quoted line :" -msgstr "Colour of =>3 times quoted line :" +msgid "Color of =>3 times quoted line" +msgstr "Colour of =>3 times quoted line" #: src/lang.c:1850 msgid "# Color of >=3 times quoted lines\n" msgstr "# Colour of >=3 times quoted lines\n" #: src/lang.c:1855 -msgid "Color of article header lines :" -msgstr "Colour of article header lines :" +msgid "Color of article header lines" +msgstr "Colour of article header lines" #: src/lang.c:1856 msgid "# Color of header-lines\n" msgstr "# Colour of header-lines\n" #: src/lang.c:1861 -msgid "Color of actual news header fields :" -msgstr "Colour of actual news header fields:" +msgid "Color of actual news header fields" +msgstr "Colour of actual news header fields" #: src/lang.c:1862 msgid "# Color of actual news header fields\n" msgstr "# Colour of actual news header fields\n" #: src/lang.c:1867 -msgid "Color of article subject lines :" -msgstr "Colour of article subject lines :" +msgid "Color of article subject lines" +msgstr "Colour of article subject lines" #: src/lang.c:1868 msgid "# Color of article subject\n" msgstr "# Colour of article subject\n" #: src/lang.c:1873 -msgid "Color of response counter :" -msgstr "Colour of response counter :" +msgid "Color of response counter" +msgstr "Colour of response counter" #: src/lang.c:1874 msgid "# Color of response counter\n" msgstr "# Colour of response counter\n" #: src/lang.c:1879 -msgid "Color of sender (From:) :" -msgstr "Colour of sender (From:) :" +msgid "Color of sender (From:)" +msgstr "Colour of sender (From:)" #: src/lang.c:1880 msgid "# Color of sender (From:)\n" msgstr "# Colour of sender (From:)\n" #: src/lang.c:1885 -msgid "Color of help/mail sign :" -msgstr "Colour of help/mail sign :" +msgid "Color of help/mail sign" +msgstr "Colour of help/mail sign" #: src/lang.c:1886 msgid "# Color of Help/Mail-Sign\n" msgstr "# Colour of Help/Mail-Sign\n" #: src/lang.c:1891 -msgid "Color of signatures :" -msgstr "Colour of signatures :" +msgid "Color of signatures" +msgstr "Colour of signatures" #: src/lang.c:1892 msgid "# Color of signature\n" msgstr "# Colour of signature\n" #: src/lang.c:1897 -msgid "Color of highlighted URLs :" -msgstr "Colour of highlighted URLs :" +msgid "Color of highlighted URLs" +msgstr "Colour of highlighted URLs" #: src/lang.c:1898 msgid "# Color of highlighted URLs\n" msgstr "# Colour of highlighted URLs\n" #: src/lang.c:1903 -msgid "Color of highlighting with *stars* :" -msgstr "Colour of highlighting with *stars*:" +msgid "Color of highlighting with *stars*" +msgstr "Colour of highlighting with *stars*" #: src/lang.c:1904 msgid "# Color of word highlighting. There are four possibilities\n" @@ -4956,19 +4961,19 @@ msgstr "# Colour of word highlighting. T "# in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n" #: src/lang.c:1910 -msgid "Color of highlighting with _dash_ :" -msgstr "Colour of highlighting with _dash_ :" +msgid "Color of highlighting with _dash_" +msgstr "Colour of highlighting with _dash_" #: src/lang.c:1916 -msgid "Color of highlighting with /slash/ :" -msgstr "Colour of highlighting with /slash/:" +msgid "Color of highlighting with /slash/" +msgstr "Colour of highlighting with /slash/" #: src/lang.c:1922 -msgid "Color of highlighting with -stroke-:" -msgstr "Colour of highlighting w. -stroke- :" +msgid "Color of highlighting with -stroke-" +msgstr "Colour of highlighting w. -stroke-" #: src/lang.c:1929 -msgid "Attr. of highlighting with *stars* :" +msgid "Attr. of highlighting with *stars*" msgstr "" #: src/lang.c:1930 @@ -4981,19 +4986,19 @@ msgid "# Attribute of word highlighting msgstr "" #: src/lang.c:1940 -msgid "Attr. of highlighting with _dash_ :" +msgid "Attr. of highlighting with _dash_" msgstr "" #: src/lang.c:1946 -msgid "Attr. of highlighting with /slash/ :" +msgid "Attr. of highlighting with /slash/" msgstr "" #: src/lang.c:1952 -msgid "Attr. of highlighting with -stroke-:" +msgid "Attr. of highlighting with -stroke-" msgstr "" #: src/lang.c:1958 -msgid "URL highlighting in message body :" +msgid "URL highlighting in message body" msgstr "" #: src/lang.c:1959 @@ -5001,7 +5006,7 @@ msgid "# Enable URL highlighting?\n" msgstr "" #: src/lang.c:1964 -msgid "Word highlighting in message body :" +msgid "Word highlighting in message body" msgstr "" #: src/lang.c:1965 @@ -5009,7 +5014,7 @@ msgid "# Enable word highlighting?\n" msgstr "" #: src/lang.c:1970 -msgid "What to display instead of mark :" +msgid "What to display instead of mark" msgstr "" #: src/lang.c:1971 @@ -5023,7 +5028,7 @@ msgid "Enter column number to wrap artic msgstr "" #: src/lang.c:1978 -msgid "Page line wrap column :" +msgid "Page line wrap column" msgstr "" #: src/lang.c:1979 @@ -5031,7 +5036,7 @@ msgid "# Wrap article lines at column\n" msgstr "" #: src/lang.c:1984 -msgid "Wrap around threads on next unread :" +msgid "Wrap around threads on next unread" msgstr "" #: src/lang.c:1985 @@ -5043,7 +5048,7 @@ msgid "Enter default mail address (and f msgstr "" #: src/lang.c:1990 -msgid "Mail address (and fullname) :" +msgid "Mail address (and fullname)" msgstr "" #: src/lang.c:1991 @@ -5051,7 +5056,7 @@ msgid "# User's mail address (and fullna msgstr "" #: src/lang.c:1996 -msgid "Show empty Followup-To in editor :" +msgid "Show empty Followup-To in editor" msgstr "" #: src/lang.c:1997 @@ -5063,7 +5068,7 @@ msgid "Enter path/! command/--none to cr msgstr "" #: src/lang.c:2002 -msgid "Create signature from path/command :" +msgid "Create signature from path/command" msgstr "" #: src/lang.c:2003 @@ -5079,7 +5084,7 @@ msgid "Prepend signature with \"-- \" on msgstr "" #: src/lang.c:2011 -msgid "Prepend signature with \"-- \" :" +msgid "Prepend signature with \"-- \"" msgstr "" #: src/lang.c:2012 @@ -5091,7 +5096,7 @@ msgid "Add signature when reposting arti msgstr "" #: src/lang.c:2017 -msgid "Add signature when reposting :" +msgid "Add signature when reposting" msgstr "" #: src/lang.c:2018 @@ -5103,7 +5108,7 @@ msgid "Enter quotation marks, %s or %S f msgstr "" #: src/lang.c:2023 -msgid "Characters used as quote-marks :" +msgid "Characters used as quote-marks" msgstr "" #: src/lang.c:2024 @@ -5112,8 +5117,8 @@ msgid "# Characters used in quoting to f msgstr "" #: src/lang.c:2030 -msgid "Quoting behavior :" -msgstr "Quoting behaviour :" +msgid "Quoting behavior" +msgstr "Quoting behaviour" #: src/lang.c:2031 msgid "# How quoting should be handled when following up or replying.\n" @@ -5132,7 +5137,7 @@ msgid "%A Addr %D Date %F Addr+Name %G G msgstr "" #: src/lang.c:2044 -msgid "Quote line when following up :" +msgid "Quote line when following up" msgstr "" #: src/lang.c:2045 @@ -5142,11 +5147,11 @@ msgid "# Format of quote line when maili msgstr "" #: src/lang.c:2052 -msgid "Quote line when cross-posting :" +msgid "Quote line when cross-posting" msgstr "" #: src/lang.c:2058 -msgid "Quote line when mailing :" +msgid "Quote line when mailing" msgstr "" #: src/lang.c:2063 @@ -5154,7 +5159,7 @@ msgid "If ON, include User-Agent: header msgstr "" #: src/lang.c:2064 -msgid "Insert 'User-Agent:'-header :" +msgid "Insert 'User-Agent:'-header" msgstr "" #: src/lang.c:2065 @@ -5166,7 +5171,7 @@ msgid "Enter charset name for MIME (e.g. msgstr "" #: src/lang.c:2070 -msgid "MM_CHARSET :" +msgid "MM_CHARSET" msgstr "" #: src/lang.c:2071 @@ -5179,7 +5184,7 @@ msgid "# Charset supported locally which msgstr "" #: src/lang.c:2082 -msgid "MM_NETWORK_CHARSET :" +msgid "MM_NETWORK_CHARSET" msgstr "" #: src/lang.c:2083 @@ -5187,7 +5192,7 @@ msgid "# Charset used for MIME (Content- msgstr "" #: src/lang.c:2089 -msgid "Mailbox format :" +msgid "Mailbox format" msgstr "" #: src/lang.c:2090 @@ -5195,7 +5200,7 @@ msgid "# Format of the mailbox.\n" msgstr "" #: src/lang.c:2095 -msgid "MIME encoding in news messages :" +msgid "MIME encoding in news messages" msgstr "" #: src/lang.c:2096 @@ -5211,7 +5216,7 @@ msgid "Don't change unless you know what msgstr "" #: src/lang.c:2105 -msgid "Use 8bit characters in news headers:" +msgid "Use 8bit characters in news headers" msgstr "" #: src/lang.c:2106 @@ -5226,7 +5231,7 @@ msgid "Auto-view post-processed files sets, < msgstr "" #: src/lang.c:2336 -msgid "Format string for display of dates :" +msgid "Format string for display of dates" msgstr "" #: src/lang.c:2337 @@ -5613,8 +5618,8 @@ msgid "# Format string for date represen msgstr "" #: src/lang.c:2343 -msgid "Unicode normalization form :" -msgstr "Unicode normalisation form :" +msgid "Unicode normalization form" +msgstr "Unicode normalisation form" #: src/lang.c:2344 msgid "# Unicode normalization form\n" @@ -5622,6 +5627,14 @@ msgid "# Unicode normalization form\n" msgstr "# Unicode normalisation form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" +#: src/lang.c:2351 +msgid "Render BiDi" +msgstr "" + +#: src/lang.c:2352 +msgid "# If ON, bi-directional text is rendered by tin\n" +msgstr "" + #: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" @@ -5632,26 +5645,26 @@ msgstr "" msgid "Version: %s release %s (\"%s\")" msgstr "" -#: src/newsrc.c:433 +#: src/newsrc.c:432 msgid "Unreachable?\n" msgstr "" -#: src/nntplib.c:822 +#: src/nntplib.c:823 #, c-format msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:840 +#: src/nntplib.c:841 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:847 +#: src/nntplib.c:848 #, c-format msgid "Read (%s)\n" msgstr "" -#: src/nntplib.c:849 +#: src/nntplib.c:850 #, c-format msgid "Resend last command (%s)\n" msgstr "" @@ -5685,11 +5698,22 @@ msgstr "" msgid "unchanged" msgstr "" -#: src/refs.c:610 +#: src/refs.c:609 msgid "[- Unavailable -]" msgstr "" -#: src/save.c:976 +#. +#. * preamble +#. * TODO: -> lang.c +#. +#: src/rfc2047.c:1203 +msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" + "are reading this prefix, your mail reader probably has not yet been modified\n" + "to understand the new format, and some of what follows may look strange.\n" + "\n" +msgstr "" + +#: src/save.c:967 msgid "bytes" msgstr "" Binary files tin-1.7.4/po/et.gmo and tin-1.7.5/po/et.gmo differ diff -Nurp tin-1.7.4/po/et.po tin-1.7.5/po/et.po --- tin-1.7.4/po/et.po 2004-02-25 10:34:13.000000000 +0100 +++ tin-1.7.5/po/et.po 2004-06-04 13:32:31.000000000 +0200 @@ -4,236 +4,242 @@ # msgid "" msgstr "Project-Id-Version: tin 1.7.2\n" - "POT-Creation-Date: 2004-02-25 10:33+0100\n" + "POT-Creation-Date: 2004-06-04 13:31+0200\n" "PO-Revision-Date: 2003-01-07 18:45+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" + "Report-Msgid-Bugs-To: \n" #: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Vigane overview kirje (%d välja) '%s'" -#: src/attrib.c:585 +#: src/attrib.c:590 msgid "# Do not edit this comment block\n" "#\n" msgstr "# Ärge seda kommentaari blokki muutke\n" "#\n" -#: src/attrib.c:586 +#: src/attrib.c:591 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=SÕNE (n. alt.*,!alt.bin*) [kohustuslik]\n" -#: src/attrib.c:587 +#: src/attrib.c:592 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=SÕNE (n. ~/Mail)\n" -#: src/attrib.c:588 +#: src/attrib.c:593 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=SÕNE (n. ~user/News)\n" -#: src/attrib.c:589 +#: src/attrib.c:594 msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=SÕNE (n. =linux)\n" -#: src/attrib.c:590 +#: src/attrib.c:595 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=SÕNE (n. $var/sig)\n" -#: src/attrib.c:591 +#: src/attrib.c:596 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=SÕNE (kui algab sümboliga '/', loe failist)\n" -#: src/attrib.c:592 +#: src/attrib.c:597 msgid "# followup_to=STRING\n" msgstr "# followup_to=SÕNE\n" -#: src/attrib.c:593 +#: src/attrib.c:598 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=SÕNE (n. majordomo@example.org)\n" -#: src/attrib.c:594 +#: src/attrib.c:599 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=SÕNE (n. ~/.tin/extra-headers)\n" -#: src/attrib.c:595 +#: src/attrib.c:600 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=SÕNE (n. ~/.tin/extra-body-text)\n" -#: src/attrib.c:596 +#: src/attrib.c:601 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "# from=SÕNE (kirjutage soovitav From: rida, ärge kasutage jutumärke)\n" -#: src/attrib.c:597 +#: src/attrib.c:602 msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=SÕNE\n" -#: src/attrib.c:598 +#: src/attrib.c:603 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=SÕNE (%%s, %%S annavad initsiaalid)\n" -#: src/attrib.c:599 +#: src/attrib.c:604 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=SÕNE (n. image/*,!image/bmp)\n" -#: src/attrib.c:601 +#: src/attrib.c:606 msgid "# ispell=STRING\n" msgstr "# ispell=SÕNE\n" -#: src/attrib.c:603 +#: src/attrib.c:608 msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:604 +#: src/attrib.c:609 msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:605 +#: src/attrib.c:610 msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:606 +#: src/attrib.c:611 msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:607 +#: src/attrib.c:612 msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" -#: src/attrib.c:608 +#: src/attrib.c:613 msgid "# thread_arts=NUM" msgstr "# thread_arts=NUM" -#: src/attrib.c:615 +#: src/attrib.c:620 msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:621 +#: src/attrib.c:626 msgid "# show_info=NUM\n" msgstr "# show_info=NUM\n" -#: src/attrib.c:627 +#: src/attrib.c:632 msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=NUM\n" -#: src/attrib.c:645 +#: src/attrib.c:650 msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:650 +#: src/attrib.c:655 msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=NUM\n" -#: src/attrib.c:655 +#: src/attrib.c:660 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=SÕNE (n. talk.*)\n" -#: src/attrib.c:656 +#: src/attrib.c:661 msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:657 +#: src/attrib.c:662 msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:658 +#: src/attrib.c:663 msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:659 src/attrib.c:666 +#: src/attrib.c:664 src/attrib.c:671 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "# 0=teema (tõstutundlik) 1=teema (tõstutundetu)\n" -#: src/attrib.c:660 src/attrib.c:667 +#: src/attrib.c:665 src/attrib.c:672 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "# 2=saatja (tõstutundlik) 3=saatja (tõstutundetu)\n" -#: src/attrib.c:661 src/attrib.c:668 +#: src/attrib.c:666 src/attrib.c:673 msgid "# 4=msgid 5=lines\n" msgstr "# 4=msgid 5=read\n" -#: src/attrib.c:662 +#: src/attrib.c:667 msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=SÕNE\n" -#: src/attrib.c:663 +#: src/attrib.c:668 msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:664 +#: src/attrib.c:669 msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:665 +#: src/attrib.c:670 msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:669 +#: src/attrib.c:674 msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:670 +#: src/attrib.c:675 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "# fcc=SÕNE (n. =postkast)\n" # -#: src/attrib.c:671 +#: src/attrib.c:676 msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:673 +# TRANSLATION MISSING +#: src/attrib.c:677 +msgid "# mime_forward=ON/OFF\n" +msgstr "" + +#: src/attrib.c:679 msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=toetatud_koodileht" -#: src/attrib.c:680 +#: src/attrib.c:686 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=SÕNE (vaikimisi on US-ASCII)\n" -#: src/attrib.c:682 +#: src/attrib.c:688 msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Märkus: parem on kõigepealt kirjeldada üldisemad (globaalse skoobiga)\n" -#: src/attrib.c:683 +#: src/attrib.c:689 msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# ning seejärel konkreetsemad, grupi spetsiifilised, reeglid.\n" "#\n" -#: src/attrib.c:684 +#: src/attrib.c:690 msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:690 +#: src/attrib.c:696 msgid "# include extra headers\n" msgstr "# lisa täiendavaid päiseid\n" -#: src/attrib.c:698 +#: src/attrib.c:704 msgid "# in *sources* set post process type to shar only\n" msgstr "# *tekstidel* sea järeltöötlemise tüübiks ainult shar\n" -#: src/attrib.c:702 +#: src/attrib.c:708 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "# *binaarfailidel* sea täielik järeltöötlemine, kustuta ajutised failid\n" -#: src/attrib.c:703 +#: src/attrib.c:709 msgid "# and set Followup-To: poster\n" msgstr "# ja sea Followup-To: postitaja\n" -#: src/cook.c:809 +#: src/cook.c:814 msgid "(unknown)" msgstr "(tundmatu)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:612 src/filter.c:620 +#: src/filter.c:600 src/filter.c:608 msgid "Removed from the previous rule: " msgstr "Eelmisest reeglist eemaldatud: " @@ -891,7 +897,7 @@ msgstr "\n" msgid "Insecure permissions of %s (%o)" msgstr "Ebaturvalised õigused failil %s (%o)" -#: src/lang.c:199 src/newsrc.c:410 +#: src/lang.c:199 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "Vigane vastus GROUP käsule, %s" @@ -3901,7 +3907,7 @@ msgstr "Terminal ei toeta värve" msgid "Trying %s" msgstr "Proovin %s" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:297 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:296 msgid "None" msgstr "Pole" @@ -4274,13 +4280,13 @@ msgstr "Filtreerimise seaded" #: src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 src/lang.c:1995 src/lang.c:2029 #: src/lang.c:2081 src/lang.c:2088 src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 #: src/lang.c:2189 src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 -#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 src/lang.c:2350 msgid " toggles, sets, cancels." msgstr " lülitab, seab, katkestab." #: src/lang.c:1344 -msgid "Show mini menu & posting etiquette :" -msgstr "Näita minimenüüd & post. etiketti :" +msgid "Show mini menu & posting etiquette" +msgstr "Näita minimenüüd & post. etiketti" #: src/lang.c:1345 msgid "# If ON show a mini menu of useful commands at each level\n" @@ -4293,8 +4299,8 @@ msgid "Show short description for each n msgstr "Näita gruppide lühikirjeldusi. lülitab ja seab." #: src/lang.c:1351 -msgid "Show description of each newsgroup :" -msgstr "Näita iga grupi lühikirjeldust :" +msgid "Show description of each newsgroup" +msgstr "Näita iga grupi lühikirjeldust" #: src/lang.c:1352 msgid "# If ON show group description text after newsgroup name at\n" @@ -4308,8 +4314,8 @@ msgid "Show Subject & From (author) fiel msgstr "Näita grupimenüüs teema ja From (autor) välju. lülitab ja seab." #: src/lang.c:1358 -msgid "In group menu, show author by :" -msgstr "Näita grupimenüüs autorit :" +msgid "In group menu, show author by" +msgstr "Näita grupimenüüs autorit" #: src/lang.c:1359 msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" @@ -4321,16 +4327,16 @@ msgid "Draw -> or highlighted bar for se msgstr "Märgi valik -> või heleda ribaga. lülitab, seab." #: src/lang.c:1364 -msgid "Draw -> instead of highlighted bar :" -msgstr "Joonista -> heleda riba asemel :" +msgid "Draw -> instead of highlighted bar" +msgstr "Joonista -> heleda riba asemel" #: src/lang.c:1365 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Kui väärtus on on, kasuta valiku märkimiseks ->, muidu riba\n" #: src/lang.c:1370 -msgid "Use inverse video for page headers :" -msgstr "Kasuta päistel pööratud videot :" +msgid "Use inverse video for page headers" +msgstr "Kasuta päistel pööratud videot" #: src/lang.c:1371 msgid "# If ON use inverse video for page headers at different levels\n" @@ -4338,8 +4344,8 @@ msgstr "# Kui väärtus on ON, kasuta erin "# pööratud videot\n" #: src/lang.c:1376 -msgid "Thread articles by :" -msgstr "Artiklite teemadesse jagamine :" +msgid "Thread articles by" +msgstr "Artiklite teemadesse jagamine" #: src/lang.c:1377 msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" @@ -4348,8 +4354,8 @@ msgstr "# Jaga artiklid teemadesse 0=(ei "# 3=(mõlema järgi) 4=(Mitmeosaliste teema).\n" #: src/lang.c:1383 -msgid "Score of a thread :" -msgstr "Teema kaal :" +msgid "Score of a thread" +msgstr "Teema kaal" #: src/lang.c:1384 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" @@ -4361,8 +4367,8 @@ msgstr "Järjesta artiklid Subject, From, "seab." #: src/lang.c:1389 -msgid "Sort articles by :" -msgstr "Artiklite järjestus :" +msgid "Sort articles by" +msgstr "Artiklite järjestus" #: src/lang.c:1390 msgid "# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n" @@ -4377,8 +4383,8 @@ msgid "Sort threads by Nothing or Score. msgstr "Järjesta teemad mitte millegi või kaalu järgi. lülitab, seab." #: src/lang.c:1397 -msgid "Sort threads by :" -msgstr "Teemade järjestus :" +msgid "Sort threads by" +msgstr "Teemade järjestus" #: src/lang.c:1398 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" @@ -4390,8 +4396,8 @@ msgstr "Vii kursor grupis esimesele/viim " seab." #: src/lang.c:1403 -msgid "Goto first unread article in group :" -msgstr "Mine grupis esimesele lugemata art.:" +msgid "Goto first unread article in group" +msgstr "Mine grupis esimesele lugemata art." #: src/lang.c:1404 msgid "# If ON put cursor at first unread art in group otherwise last art\n" @@ -4403,24 +4409,24 @@ msgid "Show all articles or only unread msgstr "Näita kõiki või ainult lugemata artikleid. lülitab, seab." #: src/lang.c:1409 -msgid "Show only unread articles :" -msgstr "Näita ainult lugemata artikleid :" +msgid "Show only unread articles" +msgstr "Näita ainult lugemata artikleid" #: src/lang.c:1410 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# Kui väärtus on ON, näita ainult lugemata artikleid, muidu näita kõiki.\n" #: src/lang.c:1415 -msgid "Show only groups with unread arts :" -msgstr "Ainult lugemata artiklitega grupid :" +msgid "Show only groups with unread arts" +msgstr "Ainult lugemata artiklitega grupid" #: src/lang.c:1416 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "# Näita ainult neid tellitud gruppe, kus on lugemata artikleid.\n" #: src/lang.c:1421 -msgid "Filter which articles :" -msgstr "Filtreeri artikleid :" +msgid "Filter which articles" +msgstr "Filtreeri artikleid" #: src/lang.c:1422 msgid "# 0=(Only kill unread articles)\n" @@ -4431,8 +4437,8 @@ msgstr "# 0=(Surma ainult lugemata artik "# 2=(Surma kõik artiklid ja ära näita neid).\n" #: src/lang.c:1429 -msgid "Tab goes to next unread article :" -msgstr "Tab viib järgmisele lugemata art. :" +msgid "Tab goes to next unread article" +msgstr "Tab viib järgmisele lugemata art." #: src/lang.c:1430 msgid "# If ON the TAB command will go to next unread article at article viewer " @@ -4444,8 +4450,8 @@ msgid "Scrolling with past the e msgstr "Tühikuga artikli lõpust edasi kerimine hüppab järgmisele lugemata artiklile." #: src/lang.c:1435 -msgid "Space goes to next unread article :" -msgstr "Tühik viib järgmisele lugemata art.:" +msgid "Space goes to next unread article" +msgstr "Tühik viib järgmisele lugemata art." #: src/lang.c:1436 msgid "# If ON the SPACE command will go to next unread article at article viewer\n" @@ -4458,8 +4464,8 @@ msgid "Scrolling with / past msgstr "/noolega art. lõpust edasi kerimine hüppab järgmisele lugemata art." #: src/lang.c:1442 -msgid "PgDn goes to next unread article :" -msgstr "PgDn viib järgmisele lugemata art. :" +msgid "PgDn goes to next unread article" +msgstr "PgDn viib järgmisele lugemata art." #: src/lang.c:1443 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" @@ -4468,8 +4474,8 @@ msgstr "# Kui väärtus on ON, viib artikl "# järgmisele artiklile\n" #: src/lang.c:1449 -msgid "List thread using right arrow key :" -msgstr "Nool paremale näitab teema loendit :" +msgid "List thread using right arrow key" +msgstr "Nool paremale näitab teema loendit" #: src/lang.c:1450 msgid "# If ON automatically list thread when entering it using right arrow key.\n" @@ -4480,8 +4486,8 @@ msgid "Enter character to indicate delet msgstr "Sisestage sümbol kustutatud artiklite märkimiseks. seab, katkestab." #: src/lang.c:1455 -msgid "Character to show deleted articles :" -msgstr "Kustutatud artiklite marker :" +msgid "Character to show deleted articles" +msgstr "Kustutatud artiklite marker" #: src/lang.c:1456 msgid "# Character used to show that an art was deleted (default 'D')\n" @@ -4495,8 +4501,8 @@ msgstr "Sisestage sümbol, mis märgib vah "katkestab." #: src/lang.c:1462 -msgid "Character to show inrange articles :" -msgstr "Artiklite vahemiku marker :" +msgid "Character to show inrange articles" +msgstr "Artiklite vahemiku marker" #: src/lang.c:1463 msgid "# Character used to show that an art is in a range (default '#')\n" @@ -4510,8 +4516,8 @@ msgid "Enter character to indicate that msgstr "Sisestage tagasituleva artikli marker. seab, katkestab." #: src/lang.c:1469 -msgid "Character to show returning arts :" -msgstr "Tagasi tulnud artiklite marker :" +msgid "Character to show returning arts" +msgstr "Tagasi tulnud artiklite marker" #: src/lang.c:1470 msgid "# Character used to show that an art will return (default '-')\n" @@ -4524,8 +4530,8 @@ msgid "Enter character to indicate selec msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." #: src/lang.c:1476 -msgid "Character to show selected articles:" -msgstr "Valitud artiklite marker :" +msgid "Character to show selected articles" +msgstr "Valitud artiklite marker" #: src/lang.c:1477 msgid "# Character used to show that an art was auto-selected (default '*')\n" @@ -4538,8 +4544,8 @@ msgid "Enter character to indicate recen msgstr "Sisestage värskeid artikleid märkiv sümbol. seab, katkestab." #: src/lang.c:1483 -msgid "Character to show recent articles :" -msgstr "Värskete artiklite marker :" +msgid "Character to show recent articles" +msgstr "Värskete artiklite marker" #: src/lang.c:1484 msgid "# Character used to show that an art is recent (default 'o')\n" @@ -4552,8 +4558,8 @@ msgid "Enter character to indicate unrea msgstr "Sisestage lugemata artikleid märkiv sümbol. seab, katkestab." #: src/lang.c:1490 -msgid "Character to show unread articles :" -msgstr "Lugemata artiklite marker :" +msgid "Character to show unread articles" +msgstr "Lugemata artiklite marker" #: src/lang.c:1491 msgid "# Character used to show that an art is unread (default '+')\n" @@ -4566,8 +4572,8 @@ msgid "Enter character to indicate read msgstr "Sisestage loetud artikleid märkiv sümbol. seab, katkestab." #: src/lang.c:1497 -msgid "Character to show read articles :" -msgstr "Loetud artiklite marker :" +msgid "Character to show read articles" +msgstr "Loetud artiklite marker" #: src/lang.c:1498 msgid "# Character used to show that an art was read (default ' ')\n" @@ -4580,8 +4586,8 @@ msgid "Enter character to indicate kille msgstr "Sisestage surmatud artikleid märkiv sümbol. seab, katkestab." #: src/lang.c:1504 -msgid "Character to show killed articles :" -msgstr "Surmatud artiklite marker :" +msgid "Character to show killed articles" +msgstr "Surmatud artiklite marker" #: src/lang.c:1505 msgid "# Character used to show that an art was killed (default 'K')\n" @@ -4594,8 +4600,8 @@ msgid "Enter character to indicate read msgstr "Sisestage valitud artikleid märkiv sümbol. seab, katkestab." #: src/lang.c:1511 -msgid "Character to show readselected arts:" -msgstr "Lugemiseks valitud artiklite marker:" +msgid "Character to show readselected arts" +msgstr "Lugemiseks valitud artiklite marker" #: src/lang.c:1512 msgid "# Character used to show that an art was selected before read (default ':')\n" @@ -4608,16 +4614,16 @@ msgid "Enter maximum length of newsgroup msgstr "Sisestage maksimaalne näidatav grupi nime pikkus. seab." #: src/lang.c:1518 -msgid "Max. length of group names shown :" -msgstr "Maksimaalne grupinime pikkus :" +msgid "Max. length of group names shown" +msgstr "Maksimaalne grupinime pikkus" #: src/lang.c:1519 msgid "# Maximum length of the names of newsgroups displayed\n" msgstr "# Maksimaalne grupi nime pikkus, mida näidatakse ekraanil\n" #: src/lang.c:1524 -msgid "Show lines/score in listings :" -msgstr "Näita loendis artikli kaalu/ridu :" +msgid "Show lines/score in listings" +msgstr "Näita loendis artikli kaalu/ridu" #: src/lang.c:1525 msgid "# What informations should be displayed in article/thread listing\n" @@ -4632,8 +4638,8 @@ msgstr "0 = kerida kogu leht, -1 = näita "= pool lehte" #: src/lang.c:1531 -msgid "Number of lines to scroll in pager :" -msgstr "Lehitsejas keritavate ridade arv :" +msgid "Number of lines to scroll in pager" +msgstr "Lehitsejas keritavate ridade arv" #: src/lang.c:1532 msgid "# Number of lines that cursor-up/down will scroll in article pager\n" @@ -4650,8 +4656,8 @@ msgid "Display signatures. toggl msgstr "Näita signatuure, lülitab, seab." #: src/lang.c:1540 -msgid "Display signatures :" -msgstr "Näita signatuure :" +msgid "Display signatures" +msgstr "Näita signatuure" #: src/lang.c:1541 msgid "# If OFF don't show signatures when displaying articles\n" @@ -4662,8 +4668,8 @@ msgid "Display uuencoded data as tagged msgstr "Näita uuenkodeeritud andmeid märgitud lisadena. lülitab ja seab." #: src/lang.c:1546 -msgid "Display uue data as an attachment :" -msgstr "Näita uuenk. andmeid lisadena :" +msgid "Display uue data as an attachment" +msgstr "Näita uuenk. andmeid lisadena" #: src/lang.c:1547 msgid "# Handling of uuencoded data in the pager\n" @@ -4686,8 +4692,8 @@ msgstr "Dekodeeri saksa TeX esituses täh # #: src/lang.c:1557 -msgid "Display \"a as Umlaut-a :" -msgstr "Näita \"a kui Umlaut-a :" +msgid "Display \"a as Umlaut-a" +msgstr "Näita \"a kui Umlaut-a" #: src/lang.c:1558 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" @@ -4700,8 +4706,8 @@ msgid "Space separated list of header fi msgstr "Tühikuga eraldatud päised" #: src/lang.c:1564 -msgid "Display these header fields (or *) :" -msgstr "Näita neid päiseid (või *) :" +msgid "Display these header fields (or *)" +msgstr "Näita neid päiseid (või *)" #: src/lang.c:1565 msgid "# Which news headers you wish to see. If you want to see _all_ the headers,\n" @@ -4719,8 +4725,8 @@ msgstr "# Milliseid artikli päiseid te s "# Kui te väärtust ei määra, lülitatakse see omadus välja.\n" #: src/lang.c:1574 -msgid "Do not display these header fields :" -msgstr "Ära näita neid päiseridu :" +msgid "Do not display these header fields" +msgstr "Ära näita neid päiseridu" #: src/lang.c:1575 msgid "# Same as 'news_headers_to_display' except it denotes the opposite.\n" @@ -4745,8 +4751,8 @@ msgid "Do you want to enable automatic h msgstr "Kas te soovite multipart/alternative artiklite automaatset käsitlemist?" #: src/lang.c:1586 -msgid "Skip multipart/alternative parts :" -msgstr "Jäta multipart/alternative osad :" +msgid "Skip multipart/alternative parts" +msgstr "Jäta multipart/alternative osad" #: src/lang.c:1587 msgid "# If ON strip multipart/alternative messages automatically\n" @@ -4758,8 +4764,8 @@ msgid "A regex used to decide which line msgstr "Regulaaravaldis otsustamaks, milliseid ridu tsitaatides näidata." #: src/lang.c:1593 -msgid "Regex used to show quoted lines :" -msgstr "Tsiteeritud ridade näitamise regex :" +msgid "Regex used to show quoted lines" +msgstr "Tsiteeritud ridade näitamise regex" #: src/lang.c:1594 msgid "# A regular expression that tin will use to decide which lines are\n" @@ -4774,8 +4780,8 @@ msgid "A regex used to decide which line msgstr "Regulaaravaldis otsustamaks, milliseid ridu näidata col_quote2." #: src/lang.c:1601 -msgid "Regex used to show twice quoted l. :" -msgstr "Topelt tsiteeritud ridu näitav reg :" +msgid "Regex used to show twice quoted l." +msgstr "Topelt tsiteeritud ridu näitav reg" #: src/lang.c:1602 msgid "# A regular expression that tin will use to decide which lines are\n" @@ -4791,8 +4797,8 @@ msgid "A regex used to decide which line msgstr "Regulaaravaldis otsustamaks, milliseid ridu näidata col_quote3." #: src/lang.c:1609 -msgid "Regex used to show >= 3 times q.l. :" -msgstr ">= 3 tsiteeritud ridu näitav reg :" +msgid "Regex used to show >= 3 times q.l." +msgstr ">= 3 tsiteeritud ridu näitav reg" #: src/lang.c:1610 msgid "# A regular expression that tin will use to decide which lines are\n" @@ -4808,8 +4814,8 @@ msgid "A regex used to decide which word msgstr "Regex et otsustada, milliseid sõnu näidata col_markslashes abil." #: src/lang.c:1618 -msgid "Regex used to highlight /slashes/ :" -msgstr "Regex et esile tõsta /kaldkriipse/ :" +msgid "Regex used to highlight /slashes/" +msgstr "Regex et esile tõsta /kaldkriipse/" #: src/lang.c:1619 msgid "# A regular expression that tin will use to decide which words\n" @@ -4824,8 +4830,8 @@ msgid "A regex used to decide which word msgstr "Regex et otsustada, milliseid sõnu näidata col_markstars abil." #: src/lang.c:1626 -msgid "Regex used to highlight *stars* :" -msgstr "Regex et esile tõsta *tärne* :" +msgid "Regex used to highlight *stars*" +msgstr "Regex et esile tõsta *tärne*" #: src/lang.c:1627 msgid "# A regular expression that tin will use to decide which words\n" @@ -4840,8 +4846,8 @@ msgid "A regex used to decide which word msgstr "Regex et otsustada, milliseid sõnu näidata col_markstroke abil." #: src/lang.c:1634 -msgid "Regex used to highlight -strokes- :" -msgstr "Regex et esile tõsta -kriipse- :" +msgid "Regex used to highlight -strokes-" +msgstr "Regex et esile tõsta -kriipse-" #: src/lang.c:1635 msgid "# A regular expression that tin will use to decide which words\n" @@ -4856,8 +4862,8 @@ msgid "A regex used to decide which word msgstr "Regex et otsustada, milliseid sõnu näidata col_markdash abil." #: src/lang.c:1642 -msgid "Regex used to highlight _underline_:" -msgstr "Regex et esile tõsta _alakriipse_ :" +msgid "Regex used to highlight _underline_" +msgstr "Regex et esile tõsta _alakriipse_" #: src/lang.c:1643 msgid "# A regular expression that tin will use to decide which words\n" @@ -4872,8 +4878,8 @@ msgid "A regex used to find Subject pref msgstr "Regulaaravaldis eemaldatava teema prefiksi leidmiseks. Eraldajaks on '|'." #: src/lang.c:1650 -msgid "Regex with Subject prefixes :" -msgstr "Regex teema prefiksi leidmiseks :" +msgid "Regex with Subject prefixes" +msgstr "Regex teema prefiksi leidmiseks" #: src/lang.c:1651 msgid "# A regular expression that tin will use to find Subject prefixes\n" @@ -4886,8 +4892,8 @@ msgid "A regex used to find Subject suff msgstr "Regulaaravaldis eemaldatava teema sufiksi leidmiseks. Eraldajaks on '|'." #: src/lang.c:1657 -msgid "Regex with Subject suffixes :" -msgstr "Regex teema sufiksi leidmiseks :" +msgid "Regex with Subject suffixes" +msgstr "Regex teema sufiksi leidmiseks" #: src/lang.c:1658 msgid "# A regular expression that tin will use to find Subject suffixes\n" @@ -4901,8 +4907,8 @@ msgid "Enter name and options for extern msgstr "Sisestage välise MIME lehitseja nimi ja võtmed, sisemise valib --internal" #: src/lang.c:1664 -msgid "MIME binary content viewer :" -msgstr "MIME kahendsisu lehitseja :" +msgid "MIME binary content viewer" +msgstr "MIME kahendsisu lehitseja" #: src/lang.c:1665 msgid "# If --internal automatically use the built in MIME viewer for non-text\n" @@ -4919,8 +4925,8 @@ msgid "Confirm before starting non-text msgstr "Küsi enne mitte-tekstiliste osade vaatamist kinnitust" #: src/lang.c:1673 -msgid "Ask before using MIME viewer :" -msgstr "Küsi MIME lehitseja kasutamise luba:" +msgid "Ask before using MIME viewer" +msgstr "Küsi MIME lehitseja kasutamise luba" #: src/lang.c:1674 msgid "# If ON tin will ask before using metamail to display MIME messages\n" @@ -4933,8 +4939,8 @@ msgid "Ask to mark groups read when quit msgstr "Küsi, kas märkida väljumisel grupid loetuks. lülitab ja seab." #: src/lang.c:1680 -msgid "Catchup read groups when quitting :" -msgstr "Väljumisel märkida grupid loetuks :" +msgid "Catchup read groups when quitting" +msgstr "Väljumisel märkida grupid loetuks" #: src/lang.c:1681 msgid "# If ON ask user if read groups should all be marked read\n" @@ -4942,8 +4948,8 @@ msgstr "# Kui väärtus on ON, küsi kasuta "# artiklid loetuks\n" #: src/lang.c:1686 -msgid "Catchup group using left key :" -msgstr "Nool vasakule märgib grupi loetuks :" +msgid "Catchup group using left key" +msgstr "Nool vasakule märgib grupi loetuks" #: src/lang.c:1687 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" @@ -4951,20 +4957,20 @@ msgstr "# Kui väärtus on ON, märgi grupp "# nool vasakule klahviga.\n" #: src/lang.c:1692 -msgid "Catchup thread by using left key :" -msgstr "Nool vasakule märgib teema loetuks :" +msgid "Catchup thread by using left key" +msgstr "Nool vasakule märgib teema loetuks" #: src/lang.c:1698 -msgid "Which actions require confirmation :" -msgstr "Tegevused mis nõuavad kinnitust :" +msgid "Which actions require confirmation" +msgstr "Tegevused mis nõuavad kinnitust" #: src/lang.c:1699 msgid "# What should we ask confirmation for.\n" msgstr "# Millele me peaksime küsima kinnitust.\n" #: src/lang.c:1704 -msgid "'Mark article read' ignores tags :" -msgstr "'Märgi art. loetuks' eirab märke :" +msgid "'Mark article read' ignores tags" +msgstr "'Märgi art. loetuks' eirab märke" #: src/lang.c:1705 msgid "# If ON the 'Mark article read' function marks only the current article.\n" @@ -4976,24 +4982,24 @@ msgid "Program to run to open URL's, seab, katkestab." #: src/lang.c:1710 -msgid "Program that opens URL's :" -msgstr "Programm URLide avamiseks :" +msgid "Program that opens URL's" +msgstr "Programm URLide avamiseks" #: src/lang.c:1711 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "# Programm URLide avamiseks. URL lisatakse argumendiks\n" #: src/lang.c:1716 -msgid "Use mouse in xterm :" -msgstr "Kasuta xterm aknas hiirt :" +msgid "Use mouse in xterm" +msgstr "Kasuta xterm aknas hiirt" #: src/lang.c:1717 msgid "# If ON enable mouse key support on xterm terminals\n" msgstr "# Kui väärtus on ON, luba xterm aknas hiire tugi\n" #: src/lang.c:1723 -msgid "Use scroll keys on keypad :" -msgstr "Kasuta kerimisnuppe :" +msgid "Use scroll keys on keypad" +msgstr "Kasuta kerimisnuppe" #: src/lang.c:1724 msgid "# If ON enable scroll keys on terminals that support it\n" @@ -5005,8 +5011,8 @@ msgid "Enter maximum number of article t msgstr "Sisestage suurim laetavate artiklite arv. seab." #: src/lang.c:1730 -msgid "Number of articles to get :" -msgstr "Laetavate artiklite arv :" +msgid "Number of articles to get" +msgstr "Laetavate artiklite arv" #: src/lang.c:1731 msgid "# Number of articles to get (0=no limit), if negative sets maximum number\n" @@ -5019,8 +5025,8 @@ msgid "Enter number of days article is c msgstr "Sisestage artikli värskuse kestus. seab." #: src/lang.c:1737 -msgid "Article recentness time limit :" -msgstr "Artikli värskuse ajapiir :" +msgid "Article recentness time limit" +msgstr "Artikli värskuse ajapiir" #: src/lang.c:1738 msgid "# Number of days in which article is considered recent, (0=OFF)\n" @@ -5031,8 +5037,8 @@ msgid "WILDMAT for normal wildcards, REG msgstr "WILDMAT tavalistele jokkeritele, REGEX täisregulaaravaldistega otsimisele." #: src/lang.c:1743 -msgid "Wildcard matching :" -msgstr "Jokkeritega otsimine :" +msgid "Wildcard matching" +msgstr "Jokkeritega otsimine" #: src/lang.c:1744 msgid "# Wildcard matching 0=(wildmat) 1=(regex)\n" @@ -5043,8 +5049,8 @@ msgid "Enter minimal score before an art msgstr "Sisestage minimaalne kaal artikli surmamiseks. seab." #: src/lang.c:1749 -msgid "Score limit (kill) :" -msgstr "Kaalu alampiir (surmamine) :" +msgid "Score limit (kill)" +msgstr "Kaalu alampiir (surmamine)" #: src/lang.c:1750 msgid "# Score limit before an article is marked killed\n" @@ -5055,8 +5061,8 @@ msgid "Enter default score to kill artic msgstr "Sisestage vaikimisi kaal artiklite surmamiseks. seab." #: src/lang.c:1755 -msgid "Default score to kill articles :" -msgstr "Artiklite surmamise vaikimisi kaal :" +msgid "Default score to kill articles" +msgstr "Artiklite surmamise vaikimisi kaal" #: src/lang.c:1756 msgid "# Default score to kill articles\n" @@ -5067,8 +5073,8 @@ msgid "Enter minimal score before an art msgstr "Sisestage minimaalne kaal, enne kui artikkel märgitakse kuumaks. seab." #: src/lang.c:1761 -msgid "Score limit (select) :" -msgstr "Kaalu alampiir (valik) :" +msgid "Score limit (select)" +msgstr "Kaalu alampiir (valik)" #: src/lang.c:1762 msgid "# Score limit before an article is marked hot\n" @@ -5079,16 +5085,16 @@ msgid "Enter default score to select art msgstr "Sisestage vaikimisi kaal artiklite valimiseks. seab." #: src/lang.c:1767 -msgid "Default score to select articles :" -msgstr "Vaikimisi kaal artiklite valimiseks:" +msgid "Default score to select articles" +msgstr "Vaikimisi kaal artiklite valimiseks" #: src/lang.c:1768 msgid "# Default score to select articles\n" msgstr "# Vaikimisi kaal artiklite valimiseks\n" #: src/lang.c:1774 -msgid "Use slrnface to show ''X-Face:''s :" -msgstr "''X-Face:'' näitamiseks slrnface :" +msgid "Use slrnface to show ''X-Face:''s" +msgstr "''X-Face:'' näitamiseks slrnface" #: src/lang.c:1775 msgid "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" @@ -5097,152 +5103,152 @@ msgstr "# Kui väärtus on ON, kasutan ''X "# Kasulik ainult xterm aknas.\n" #: src/lang.c:1783 -msgid "Use ANSI color :" -msgstr "Kasuta ANSI värve :" +msgid "Use ANSI color" +msgstr "Kasuta ANSI värve" #: src/lang.c:1784 msgid "# If ON using ANSI-color\n" msgstr "# Kui väärtus on ON, kasuta ANSI värve\n" #: src/lang.c:1789 -msgid "Standard foreground color :" -msgstr "Standardne esiplaani värv :" +msgid "Standard foreground color" +msgstr "Standardne esiplaani värv" #: src/lang.c:1790 msgid "# Standard foreground color\n" msgstr "# Standardne esiplaani värv\n" #: src/lang.c:1795 -msgid "Standard background color :" -msgstr "Standardne tagaplaani värv :" +msgid "Standard background color" +msgstr "Standardne tagaplaani värv" #: src/lang.c:1796 msgid "# Standard-Background-Color\n" msgstr "# Standardne tagaplaani värv\n" #: src/lang.c:1801 -msgid "Color for inverse text (background):" -msgstr "Pööratud teksti värv (tagaplaan) :" +msgid "Color for inverse text (background)" +msgstr "Pööratud teksti värv (tagaplaan)" #: src/lang.c:1802 msgid "# Color of background for inverse text\n" msgstr "# Pööratud teksti tagaplaani värv\n" #: src/lang.c:1807 -msgid "Color for inverse text (foreground):" -msgstr "Pööratud teksti värv (esiplaan) :" +msgid "Color for inverse text (foreground)" +msgstr "Pööratud teksti värv (esiplaan)" #: src/lang.c:1808 msgid "# Color of foreground for inverse text\n" msgstr "# Pööratud teksti esiplaani värv\n" #: src/lang.c:1813 -msgid "Color of text lines :" -msgstr "Tekstiridade värv :" +msgid "Color of text lines" +msgstr "Tekstiridade värv" #: src/lang.c:1814 msgid "# Color of text-lines\n" msgstr "# Tekstiridade värv\n" #: src/lang.c:1819 -msgid "Color of mini help menu :" -msgstr "Miniabiinfo värv :" +msgid "Color of mini help menu" +msgstr "Miniabiinfo värv" #: src/lang.c:1820 msgid "# Color of mini help menu\n" msgstr "# Miniabiinfo värv\n" #: src/lang.c:1825 -msgid "Color of help text :" -msgstr "Abiinfo värv :" +msgid "Color of help text" +msgstr "Abiinfo värv" #: src/lang.c:1826 msgid "# Color of help pages\n" msgstr "# Abiinfo värv\n" #: src/lang.c:1831 -msgid "Color of status messages :" -msgstr "Olekuteadete värv :" +msgid "Color of status messages" +msgstr "Olekuteadete värv" #: src/lang.c:1832 msgid "# Color of messages in last line\n" msgstr "# Viimasel real olevate teadete värv\n" #: src/lang.c:1837 -msgid "Color of quoted lines :" -msgstr "Tsitaadi värv :" +msgid "Color of quoted lines" +msgstr "Tsitaadi värv" #: src/lang.c:1838 msgid "# Color of quote-lines\n" msgstr "# Tsitaadi värv\n" #: src/lang.c:1843 -msgid "Color of twice quoted line :" -msgstr "Topelt tsiteeritud rea värv :" +msgid "Color of twice quoted line" +msgstr "Topelt tsiteeritud rea värv" #: src/lang.c:1844 msgid "# Color of twice quoted lines\n" msgstr "# Topelt tsiteeritud rea värv\n" #: src/lang.c:1849 -msgid "Color of =>3 times quoted line :" -msgstr "=>3 korda tsiteeritud rea värv :" +msgid "Color of =>3 times quoted line" +msgstr "=>3 korda tsiteeritud rea värv" #: src/lang.c:1850 msgid "# Color of >=3 times quoted lines\n" msgstr "# =>3 korda tsiteeritud rea värv\n" #: src/lang.c:1855 -msgid "Color of article header lines :" -msgstr "Artikli päiseridade värv :" +msgid "Color of article header lines" +msgstr "Artikli päiseridade värv" #: src/lang.c:1856 msgid "# Color of header-lines\n" msgstr "# Päiseridade värv\n" #: src/lang.c:1861 -msgid "Color of actual news header fields :" -msgstr "Artikli tegelike päiseridade värv :" +msgid "Color of actual news header fields" +msgstr "Artikli tegelike päiseridade värv" #: src/lang.c:1862 msgid "# Color of actual news header fields\n" msgstr "# Artikli tegelike päiseridade värv\n" #: src/lang.c:1867 -msgid "Color of article subject lines :" -msgstr "Artikli teemarea värv :" +msgid "Color of article subject lines" +msgstr "Artikli teemarea värv" #: src/lang.c:1868 msgid "# Color of article subject\n" msgstr "# Artikli teema värv\n" #: src/lang.c:1873 -msgid "Color of response counter :" -msgstr "Vastuste arvu loenduri värv :" +msgid "Color of response counter" +msgstr "Vastuste arvu loenduri värv" #: src/lang.c:1874 msgid "# Color of response counter\n" msgstr "# Vastuste arvu loenduri värv\n" #: src/lang.c:1879 -msgid "Color of sender (From:) :" -msgstr "Saatja värv (From:) :" +msgid "Color of sender (From:)" +msgstr "Saatja värv (From:)" #: src/lang.c:1880 msgid "# Color of sender (From:)\n" msgstr "# Saatja värv (From:)\n" #: src/lang.c:1885 -msgid "Color of help/mail sign :" -msgstr "Abiinfo/kirja teate värv :" +msgid "Color of help/mail sign" +msgstr "Abiinfo/kirja teate värv" #: src/lang.c:1886 msgid "# Color of Help/Mail-Sign\n" msgstr "# Abiinfo/kirja teate värv\n" #: src/lang.c:1891 -msgid "Color of signatures :" -msgstr "Signatuuri värv :" +msgid "Color of signatures" +msgstr "Signatuuri värv" #: src/lang.c:1892 msgid "# Color of signature\n" @@ -5250,7 +5256,7 @@ msgstr "# Signatuuri värv\n" # TRANSLATION MISSING #: src/lang.c:1897 -msgid "Color of highlighted URLs :" +msgid "Color of highlighted URLs" msgstr "" # TRANSLATION MISSING @@ -5259,8 +5265,8 @@ msgid "# Color of highlighted URLs\n" msgstr "" #: src/lang.c:1903 -msgid "Color of highlighting with *stars* :" -msgstr "*tärnidega* esiletõstmise värv :" +msgid "Color of highlighting with *stars*" +msgstr "*tärnidega* esiletõstmise värv" #: src/lang.c:1904 msgid "# Color of word highlighting. There are four possibilities\n" @@ -5269,20 +5275,20 @@ msgstr "# Sõnade esiletõstmise värv. Art "# *tärnid*, /kaldkriipsud/, _alakriipsud_ ja -kriipsud-.\n" #: src/lang.c:1910 -msgid "Color of highlighting with _dash_ :" -msgstr "_alakriipsudega_ esiletõstmise värv:" +msgid "Color of highlighting with _dash_" +msgstr "_alakriipsudega_ esiletõstmise värv" #: src/lang.c:1916 -msgid "Color of highlighting with /slash/ :" -msgstr "/Kaldkriipsude/ esiletõstmise värv :" +msgid "Color of highlighting with /slash/" +msgstr "/Kaldkriipsude/ esiletõstmise värv" #: src/lang.c:1922 -msgid "Color of highlighting with -stroke-:" -msgstr "-Kriipsudega- esiletõstmise värv :" +msgid "Color of highlighting with -stroke-" +msgstr "-Kriipsudega- esiletõstmise värv" #: src/lang.c:1929 -msgid "Attr. of highlighting with *stars* :" -msgstr "*tärnidega* esiletõstmise atribuut :" +msgid "Attr. of highlighting with *stars*" +msgstr "*tärnidega* esiletõstmise atribuut" #: src/lang.c:1930 msgid "# Attribute of word highlighting on mono terminals.\n" @@ -5299,36 +5305,36 @@ msgstr "# Sõnade esiletõstmise atribuut "# 3 - Pööratud video, 4 - Plinkiv, 5 - Poolhele, 6 - Paks\n" #: src/lang.c:1940 -msgid "Attr. of highlighting with _dash_ :" -msgstr "_alakriipsudega_ esiletõstmise atr.:" +msgid "Attr. of highlighting with _dash_" +msgstr "_alakriipsudega_ esiletõstmise atr." #: src/lang.c:1946 -msgid "Attr. of highlighting with /slash/ :" -msgstr "/Kaldkriipsude/ esiletõstmise atr. :" +msgid "Attr. of highlighting with /slash/" +msgstr "/Kaldkriipsude/ esiletõstmise atr." #: src/lang.c:1952 -msgid "Attr. of highlighting with -stroke-:" -msgstr "-Kriipsudega- esiletõstmise atr. :" +msgid "Attr. of highlighting with -stroke-" +msgstr "-Kriipsudega- esiletõstmise atr." #: src/lang.c:1958 -msgid "URL highlighting in message body :" -msgstr "Teate kehas URL esiletõstmine :" +msgid "URL highlighting in message body" +msgstr "Teate kehas URL esiletõstmine" #: src/lang.c:1959 msgid "# Enable URL highlighting?\n" msgstr "# Luba URLide esiletõstmine?\n" #: src/lang.c:1964 -msgid "Word highlighting in message body :" -msgstr "Sõnade esiletõstmine teate kehas :" +msgid "Word highlighting in message body" +msgstr "Sõnade esiletõstmine teate kehas" #: src/lang.c:1965 msgid "# Enable word highlighting?\n" msgstr "# Lubada sõnade esiletõstmine?\n" #: src/lang.c:1970 -msgid "What to display instead of mark :" -msgstr "Mida näidata märgi asemel :" +msgid "What to display instead of mark" +msgstr "Mida näidata märgi asemel" #: src/lang.c:1971 msgid "# Should the leading and ending stars and dashes also be displayed,\n" @@ -5343,16 +5349,16 @@ msgid "Enter column number to wrap artic msgstr "Sisestage veerg, millelt lehitseja hakkab ridu murdma. seab." #: src/lang.c:1978 -msgid "Page line wrap column :" -msgstr "Rea murdmise veerg lehitsejas :" +msgid "Page line wrap column" +msgstr "Rea murdmise veerg lehitsejas" #: src/lang.c:1979 msgid "# Wrap article lines at column\n" msgstr "# Murra artikli read antud veerus\n" #: src/lang.c:1984 -msgid "Wrap around threads on next unread :" -msgstr "Liigu lugemata art-le ümber teemade:" +msgid "Wrap around threads on next unread" +msgstr "Liigu lugemata art-le ümber teemade" #: src/lang.c:1985 msgid "# If ON wrap around threads on searching next unread article\n" @@ -5363,16 +5369,16 @@ msgid "Enter default mail address (and f msgstr "Sisestage oma e-posti aadress (ja oma nimi). seab." #: src/lang.c:1990 -msgid "Mail address (and fullname) :" -msgstr "E-posti aadress (ja teie nimi) :" +msgid "Mail address (and fullname)" +msgstr "E-posti aadress (ja teie nimi)" #: src/lang.c:1991 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "# Kasutaja e-posti aadress (ja nimi), kui ei ole kasutaja@host (nimi)\n" #: src/lang.c:1996 -msgid "Show empty Followup-To in editor :" -msgstr "Näita toimetis tühja Followup-To :" +msgid "Show empty Followup-To in editor" +msgstr "Näita toimetis tühja Followup-To" #: src/lang.c:1997 msgid "# If ON show empty Followup-To header when editing an article\n" @@ -5383,8 +5389,8 @@ msgid "Enter path/! command/--none to cr msgstr "Sisestage tee/! käsk/--none, et luua oma vaikimisi signatuur. seab." #: src/lang.c:2002 -msgid "Create signature from path/command :" -msgstr "Signatuuri loomiseks tee/käsk :" +msgid "Create signature from path/command" +msgstr "Signatuuri loomiseks tee/käsk" #: src/lang.c:2003 msgid "# Signature path (random sigs)/file to be used when posting/replying\n" @@ -5402,8 +5408,8 @@ msgid "Prepend signature with \"-- \" on msgstr "Signatuurile eelnevale reale \"-- \". lülitab, seab." #: src/lang.c:2011 -msgid "Prepend signature with \"-- \" :" -msgstr "Lisa signatuuri ette \"-- \" :" +msgid "Prepend signature with \"-- \"" +msgstr "Lisa signatuuri ette \"-- \"" #: src/lang.c:2012 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" @@ -5414,8 +5420,8 @@ msgid "Add signature when reposting arti msgstr "Lisa artikli uuestipostitamisel signatuur. lülitab, seab." #: src/lang.c:2017 -msgid "Add signature when reposting :" -msgstr "Lisa uuestipostitusel signatuur :" +msgid "Add signature when reposting" +msgstr "Lisa uuestipostitusel signatuur" #: src/lang.c:2018 msgid "# If ON add signature to reposted articles\n" @@ -5426,8 +5432,8 @@ msgid "Enter quotation marks, %s or %S f msgstr "Sisestage tsitaadimärgid, %s või %S annab autori initsiaalid." #: src/lang.c:2023 -msgid "Characters used as quote-marks :" -msgstr "Tsiteerimise märgid :" +msgid "Characters used as quote-marks" +msgstr "Tsiteerimise märgid" #: src/lang.c:2024 msgid "# Characters used in quoting to followups and replies.\n" @@ -5436,8 +5442,8 @@ msgstr "# Sümbolid, mida kasutada tsitee "# '_' asendatakse tühikuga ' ', %%s, %%S asendatakse autori initsiaalidega.\n" #: src/lang.c:2030 -msgid "Quoting behavior :" -msgstr "Käitumine tsiteerimisel :" +msgid "Quoting behavior" +msgstr "Käitumine tsiteerimisel" #: src/lang.c:2031 msgid "# How quoting should be handled when following up or replying.\n" @@ -5464,8 +5470,8 @@ msgid "%A Addr %D Date %F Addr+Name %G G msgstr "%A Aadr. %D Kuup. %F Aadr.+Nimi %G Grupp %M Message-ID %N Nimi %C Eesnimi" #: src/lang.c:2044 -msgid "Quote line when following up :" -msgstr "Tsiteerimise rida vastamisel :" +msgid "Quote line when following up" +msgstr "Tsiteerimise rida vastamisel" #: src/lang.c:2045 msgid "# Format of quote line when mailing/posting/following-up an article\n" @@ -5476,20 +5482,20 @@ msgstr "# Tsiteeriva rea vorming artikli "# %%N Täielik nimi %%C Eesnimi %%I Initsiaalid\n" #: src/lang.c:2052 -msgid "Quote line when cross-posting :" -msgstr "Tsiteerimise rida ristpostitusel :" +msgid "Quote line when cross-posting" +msgstr "Tsiteerimise rida ristpostitusel" #: src/lang.c:2058 -msgid "Quote line when mailing :" -msgstr "Tsiteerimise rida kirjutamisel :" +msgid "Quote line when mailing" +msgstr "Tsiteerimise rida kirjutamisel" #: src/lang.c:2063 msgid "If ON, include User-Agent: header. toggles & sets." msgstr "Kasuta User-Agent: päiserida. lülitab, seab." #: src/lang.c:2064 -msgid "Insert 'User-Agent:'-header :" -msgstr "Sisestage 'User-Agent:'-päis :" +msgid "Insert 'User-Agent:'-header" +msgstr "Sisestage 'User-Agent:'-päis" #: src/lang.c:2065 msgid "# If ON include advertising User-Agent: header\n" @@ -5500,8 +5506,8 @@ msgid "Enter charset name for MIME (e.g. msgstr "Sisestage MIME kooditabeli nimi (n. US-ASCII, ISO-8859-15, EUC-KR), seab." #: src/lang.c:2070 -msgid "MM_CHARSET :" -msgstr "MM_CHARSET :" +msgid "MM_CHARSET" +msgstr "MM_CHARSET" #: src/lang.c:2071 msgid "# Charset supported locally which is also used for MIME header and\n" @@ -5520,24 +5526,24 @@ msgstr "# Lokaalselt toetatud kooditabel "# ja näitamisel kasutatakse '?'.\n" #: src/lang.c:2082 -msgid "MM_NETWORK_CHARSET :" -msgstr "MM_NETWORK_CHARSET :" +msgid "MM_NETWORK_CHARSET" +msgstr "MM_NETWORK_CHARSET" #: src/lang.c:2083 msgid "# Charset used for MIME (Content-Type) header in postings.\n" msgstr "# Postituste MIME (Content-Type) päises kasutatav kooditabel.\n" #: src/lang.c:2089 -msgid "Mailbox format :" -msgstr "Kirjade kataloog :" +msgid "Mailbox format" +msgstr "Kirjade kataloog" #: src/lang.c:2090 msgid "# Format of the mailbox.\n" msgstr "# Kirjade kataloog.\n" #: src/lang.c:2095 -msgid "MIME encoding in news messages :" -msgstr "Kasuta artiklites MIME kodeerimist :" +msgid "MIME encoding in news messages" +msgstr "Kasuta artiklites MIME kodeerimist" #: src/lang.c:2096 msgid "# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" @@ -5556,8 +5562,8 @@ msgid "Don't change unless you know what msgstr "Ärge muutke, kui te ei tea, mida teete. katkestab." #: src/lang.c:2105 -msgid "Use 8bit characters in news headers:" -msgstr "Kasuta artikli päises 8bit tähti :" +msgid "Use 8bit characters in news headers" +msgstr "Kasuta artikli päises 8bit tähti" #: src/lang.c:2106 msgid "# If ON, 8bit characters in news headers are NOT encoded.\n" @@ -5575,20 +5581,20 @@ msgstr "Vaata töödeldud faile automaatse "katkestab." #: src/lang.c:2114 -msgid "View post-processed files :" -msgstr "Vaata töödeldud faile :" +msgid "View post-processed files" +msgstr "Vaata töödeldud faile" #: src/lang.c:2115 msgid "# If set, post processed files will be opened in a viewer\n" msgstr "# Kui on seatud, avatakse töödeldud fail vaatamiseks\n" #: src/lang.c:2120 -msgid "MIME encoding in mail messages :" -msgstr "Kasuta kirjades MIME kodeerimist :" +msgid "MIME encoding in mail messages" +msgstr "Kasuta kirjades MIME kodeerimist" #: src/lang.c:2126 -msgid "Use 8bit characters in mail headers:" -msgstr "Kasuta kirja päises 8bit tähti :" +msgid "Use 8bit characters in mail headers" +msgstr "Kasuta kirja päises 8bit tähti" #: src/lang.c:2127 msgid "# If ON, 8bit characters in mail headers are NOT encoded.\n" @@ -5606,8 +5612,8 @@ msgstr "# Kui väärtus on ON, 8bit sümbol "# parameetri väärtus ON ei ole soovitatav kasutada.\n" #: src/lang.c:2137 -msgid "Strip blanks from ends of lines :" -msgstr "Eemalda tühikud realõppudest :" +msgid "Strip blanks from ends of lines" +msgstr "Eemalda tühikud realõppudest" #: src/lang.c:2138 msgid "# If ON strip blanks from ends of lines for faster display on slow " @@ -5620,8 +5626,8 @@ msgid "If ON, use transliteration. lülitab, seab." #: src/lang.c:2144 -msgid "Transliteration :" -msgstr "Transliteratsioon :" +msgid "Transliteration" +msgstr "Transliteratsioon" #: src/lang.c:2145 msgid "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" @@ -5637,8 +5643,8 @@ msgid "Send you a carbon copy automatica msgstr "Saada kasutajale automaatselt koopia. lülitab, seab." #: src/lang.c:2153 -msgid "Send you a cc automatically :" -msgstr "Saada automaatselt koopia :" +msgid "Send you a cc automatically" +msgstr "Saada automaatselt koopia" #: src/lang.c:2154 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" @@ -5650,8 +5656,8 @@ msgid "Send you a blind carbon copy auto msgstr "Saada automaatselt pimekoopia. lülitab, seab." #: src/lang.c:2159 -msgid "Send you a blind cc automatically :" -msgstr "Saada automaatselt pimekoopia :" +msgid "Send you a blind cc automatically" +msgstr "Saada automaatselt pimekoopia" #: src/lang.c:2160 msgid "# If ON automatically put your name in the Bcc: field when mailing an " @@ -5664,8 +5670,8 @@ msgid "Enter address elements about whic msgstr "Sisestage aadressi komponendid, mille eest peaks hoiatama. seab." #: src/lang.c:2165 -msgid "Spamtrap warning address parts :" -msgstr "Rämpsposti hoiatus aadressi osadele:" +msgid "Spamtrap warning address parts" +msgstr "Rämpsposti hoiatus aadressi osadele" #: src/lang.c:2166 msgid "# A comma-delimited list of address-parts you want to be warned\n" @@ -5678,8 +5684,8 @@ msgid "Enter default number of days a fi msgstr "Sisestage kirje kehtivuse aeg päevades. seab." #: src/lang.c:2172 -msgid "No. of days a filter entry is valid:" -msgstr "Filtri kehtivus päevades :" +msgid "No. of days a filter entry is valid" +msgstr "Filtri kehtivus päevades" #: src/lang.c:2173 msgid "# Number of days a short term filter will be active\n" @@ -5690,8 +5696,8 @@ msgid "Add posted articles to filter. lülitab, seab." #: src/lang.c:2178 -msgid "Add posted articles to filter :" -msgstr "Lisage postitatud artikkel filtrile:" +msgid "Add posted articles to filter" +msgstr "Lisage postitatud artikkel filtrile" #: src/lang.c:2179 msgid "# If ON add posted articles which start a new thread to filter for\n" @@ -5704,16 +5710,16 @@ msgid "The directory where articles/thre msgstr "Kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis." #: src/lang.c:2184 -msgid "Mail directory :" -msgstr "Kirjade kataloog :" +msgid "Mail directory" +msgstr "Kirjade kataloog" #: src/lang.c:2185 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" msgstr "# (-m) kataloog, kuhu artikleid/teemasid salvestatakse kirjaformaadis\n" #: src/lang.c:2190 -msgid "Save articles in batch mode (-S) :" -msgstr "Salvesta artiklid pakettmoodis (-S):" +msgid "Save articles in batch mode (-S)" +msgstr "Salvesta artiklid pakettmoodis (-S)" #: src/lang.c:2191 msgid "# If ON articles/threads will be saved in batch mode when save -S\n" @@ -5726,8 +5732,8 @@ msgid "The directory where you want arti msgstr "Kataloog, kuhu te soovite artikleid salvestada." #: src/lang.c:2197 -msgid "Directory to save arts/threads in :" -msgstr "Kataloog artiklite salvestamiseks :" +msgid "Directory to save arts/threads in" +msgstr "Kataloog artiklite salvestamiseks" #: src/lang.c:2198 msgid "# Directory where articles/threads are saved\n" @@ -5738,8 +5744,8 @@ msgid "Auto save article/thread by Archi msgstr "Salvesta artiklid Archive-name: päiserea järgi. lülitab, seab." #: src/lang.c:2203 -msgid "Use Archive-name: header for save :" -msgstr "Kasuta salvestamisel Archive-name: :" +msgid "Use Archive-name: header for save" +msgstr "Kasuta salvestamisel Archive-name:" #: src/lang.c:2204 msgid "# If ON articles/threads with Archive-name: in mail header will\n" @@ -5754,8 +5760,8 @@ msgstr "Märgi salvestatud artiklid loetu "katkestab." #: src/lang.c:2210 -msgid "Mark saved articles/threads as read:" -msgstr "Märgi salvestatud artiklid loetuks :" +msgid "Mark saved articles/threads as read" +msgstr "Märgi salvestatud artiklid loetuks" #: src/lang.c:2211 msgid "# If ON mark articles that are saved as read\n" @@ -5766,8 +5772,8 @@ msgid "Do post processing (eg. extract a msgstr "Teosta salvestatud artiklitel järeltöötlemist (nt. lisade eraldamist)." #: src/lang.c:2216 -msgid "Post process saved articles :" -msgstr "Salvestatud artikl. järeltöötlemine:" +msgid "Post process saved articles" +msgstr "Salvestatud artikl. järeltöötlemine" #: src/lang.c:2217 msgid "# Perform post processing (saving binary attachments) from saved articles.\n" @@ -5776,8 +5782,8 @@ msgstr "# Teosta salvestatud artiklite j "# 0=(ei) 1=(jah) 2=(eralda ainult shelli arhiivid (shar))\n" #: src/lang.c:2223 -msgid "Process only unread articles :" -msgstr "Töötle ainult lugemata artikleid :" +msgid "Process only unread articles" +msgstr "Töötle ainult lugemata artikleid" #: src/lang.c:2224 msgid "# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n" @@ -5789,8 +5795,8 @@ msgid "Print all or just part of header. msgstr "Trüki kõik või ainult osa päisest. lülitab, seab." #: src/lang.c:2230 -msgid "Print all headers when printing :" -msgstr "Trükkimisel trüki kõik päised :" +msgid "Print all headers when printing" +msgstr "Trükkimisel trüki kõik päised" #: src/lang.c:2231 msgid "# If ON print all of article header otherwise just the important lines\n" @@ -5801,8 +5807,8 @@ msgid "The printer program with options msgstr "Programm koos argumentidega, mida kasutatakse artiklite/teemade trükkimiseks." #: src/lang.c:2236 -msgid "Printer program with options :" -msgstr "Trükikäsk koos võtmetega :" +msgid "Printer program with options" +msgstr "Trükikäsk koos võtmetega" #: src/lang.c:2237 msgid "# Print program with parameters used to print articles/threads\n" @@ -5810,8 +5816,8 @@ msgstr "# Programm koos argumentidega, m "trükkimiseks\n" #: src/lang.c:2243 -msgid "Force redraw after certain commands:" -msgstr "Värskenda ekraani peale käske :" +msgid "Force redraw after certain commands" +msgstr "Värskenda ekraani peale käske" #: src/lang.c:2244 msgid "# If ON a screen redraw will always be done after certain external commands\n" @@ -5824,8 +5830,8 @@ msgstr "Käivita tekstitoimeti etteantud "katkestab." #: src/lang.c:2249 -msgid "Start editor with line offset :" -msgstr "Käivita tekstitoimeti reanumbril :" +msgid "Start editor with line offset" +msgstr "Käivita tekstitoimeti reanumbril" #: src/lang.c:2250 msgid "# If ON editor will be started with cursor offset into the file\n" @@ -5838,8 +5844,8 @@ msgid "Enter %E for editor, %F for filen msgstr "Kasutage %E toimeti kohal, %F failinime kohal, %N reanumbrina, seab." #: src/lang.c:2256 -msgid "Invocation of your editor :" -msgstr "Teie tekstitoimeti :" +msgid "Invocation of your editor" +msgstr "Teie tekstitoimeti" #: src/lang.c:2257 msgid "# Format of editor line including parameters\n" @@ -5852,8 +5858,8 @@ msgid "Enter name and options for extern msgstr "Sisestage välise inews käsu nimi ja võtmed, sisemise valib --internal" #: src/lang.c:2263 -msgid "External inews :" -msgstr "Väline inews :" +msgid "External inews" +msgstr "Väline inews" #: src/lang.c:2264 msgid "# If --internal use the built in mini inews for posting via NNTP\n" @@ -5867,8 +5873,8 @@ msgstr "Kasutage %M programmi kohal, %S "kohal, seab." #: src/lang.c:2269 -msgid "Invocation of your mail command :" -msgstr "Teie e-posti käsk :" +msgid "Invocation of your mail command" +msgstr "Teie e-posti käsk" #: src/lang.c:2270 msgid "# Format of mailer line including parameters\n" @@ -5881,8 +5887,8 @@ msgstr "# e-posti saatja käsurea formaat "# näiteks. elm interaktiivses moodis : elm -i %%F -s \"%%S\" \"%%T\"\n" #: src/lang.c:2278 -msgid "Use interactive mail reader :" -msgstr "Kasuta interaktiivset e-posti :" +msgid "Use interactive mail reader" +msgstr "Kasuta interaktiivset e-posti" #: src/lang.c:2279 msgid "# Interactive mailreader:\n" @@ -5895,8 +5901,8 @@ msgstr "# Interaktiivne e-posti programm "# 2 = kasuta interaktiivset e-posti programmi koos päisteta failiga\n" #: src/lang.c:2287 -msgid "Remove ~/.article after posting :" -msgstr "Eemalda ~/.article peale postitust :" +msgid "Remove ~/.article after posting" +msgstr "Eemalda ~/.article peale postitust" #: src/lang.c:2288 msgid "# If ON remove ~/.article after posting.\n" @@ -5907,8 +5913,8 @@ msgid "Filename for all posted articles, msgstr "Failinimi postitatud artiklitele. seab. Nime puudumisel ei salvestata." #: src/lang.c:2293 -msgid "Filename for posted articles :" -msgstr "Failinimi postitatud artiklitele :" +msgid "Filename for posted articles" +msgstr "Failinimi postitatud artiklitele" #: src/lang.c:2294 msgid "# Filename where to keep all postings (default posted)\n" @@ -5922,8 +5928,8 @@ msgstr "Hoia ebaõnnestunud postitused fa "seab." #: src/lang.c:2300 -msgid "Keep failed arts in ~/dead.articles:" -msgstr "Vigased artiklid ~/dead.articles :" +msgid "Keep failed arts in ~/dead.articles" +msgstr "Vigased artiklid ~/dead.articles" #: src/lang.c:2301 msgid "# If ON keep all failed postings in ~/dead.articles\n" @@ -5934,16 +5940,16 @@ msgid "Do you want to strip unsubscribed msgstr "Kas te soovite eemaldada tellimata grupid .newsrc failist" #: src/lang.c:2306 -msgid "No unsubscribed groups in newsrc :" -msgstr "newsrcs ainult tellitud grupid :" +msgid "No unsubscribed groups in newsrc" +msgstr "newsrcs ainult tellitud grupid" #: src/lang.c:2307 msgid "# If ON strip unsubscribed groups from newsrc\n" msgstr "# Kui väärtus on ON, eemalda tellimata grupid newsrc failist\n" #: src/lang.c:2312 -msgid "Remove bogus groups from newsrc :" -msgstr "Eemalda olematud grupid newsrcst :" +msgid "Remove bogus groups from newsrc" +msgstr "Eemalda olematud grupid newsrcst" #: src/lang.c:2313 msgid "# What to do with bogus groups in newsrc file\n" @@ -5956,16 +5962,16 @@ msgid "Enter number of seconds until act msgstr "Sisestage aktiivsete faili lugemise intervall sekundites. seab." #: src/lang.c:2318 -msgid "Interval in secs to reread active :" -msgstr "Aktiivsete faili lugemise intervall:" +msgid "Interval in secs to reread active" +msgstr "Aktiivsete faili lugemise intervall" #: src/lang.c:2319 msgid "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "# Aktiivsete faili lugemise intervall (0 = ei loe)\n" #: src/lang.c:2324 -msgid "Reconnect to server automatically :" -msgstr "Taasta automaatselt NNTP ühendus :" +msgid "Reconnect to server automatically" +msgstr "Taasta automaatselt NNTP ühendus" #: src/lang.c:2325 msgid "# If ON automatically reconnect to NNTP server if the connection is broken\n" @@ -5977,8 +5983,8 @@ msgid "Create local copies of NNTP overv msgstr "Loo NNTP overview failidest lokaalne koopia. lülitab ja seab." #: src/lang.c:2330 -msgid "Cache NNTP overview files locally :" -msgstr "Puhverda NNTP overview lokaalselt :" +msgid "Cache NNTP overview files locally" +msgstr "Puhverda NNTP overview lokaalselt" #: src/lang.c:2331 msgid "# If ON, create local copies of NNTP overview files.\n" @@ -5989,8 +5995,8 @@ msgid "Enter format string. sets, < msgstr "Sisestage vormingusõne. seab, katkestab." #: src/lang.c:2336 -msgid "Format string for display of dates :" -msgstr "Kuupäevade esitamise vormingusõne :" +msgid "Format string for display of dates" +msgstr "Kuupäevade esitamise vormingusõne" #: src/lang.c:2337 msgid "# Format string for date representation\n" @@ -5998,7 +6004,7 @@ msgstr "# Vormingusõne kuupäevade esitam # TRANSLATION MISSING #: src/lang.c:2343 -msgid "Unicode normalization form :" +msgid "Unicode normalization form" msgstr "" # TRANSLATION MISSING @@ -6007,6 +6013,16 @@ msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" +# TRANSLATION MISSING +#: src/lang.c:2351 +msgid "Render BiDi" +msgstr "" + +# TRANSLATION MISSING +#: src/lang.c:2352 +msgid "# If ON, bi-directional text is rendered by tin\n" +msgstr "" + #: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" @@ -6017,27 +6033,27 @@ msgstr "Versioon: %s väljalase %s (\"%s\ msgid "Version: %s release %s (\"%s\")" msgstr "Versioon: %s väljalase %s (\"%s\")" -#: src/newsrc.c:433 +#: src/newsrc.c:432 msgid "Unreachable?\n" msgstr "Kättesaamatu?\n" -#: src/nntplib.c:822 +#: src/nntplib.c:823 #, c-format msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "\n" "Ühendus serveriga aegus, proovin taastada, katse %d\n" -#: src/nntplib.c:840 +#: src/nntplib.c:841 msgid "Rejoin current group\n" msgstr "Taasühinen jooksva grupiga\n" -#: src/nntplib.c:847 +#: src/nntplib.c:848 #, c-format msgid "Read (%s)\n" msgstr "Lugesin (%s)\n" -#: src/nntplib.c:849 +#: src/nntplib.c:850 #, c-format msgid "Resend last command (%s)\n" msgstr "Saada viimane käsk uuesti (%s)\n" @@ -6071,11 +6087,23 @@ msgstr "Tühjendan\n" msgid "unchanged" msgstr "muutmata" -#: src/refs.c:610 +#: src/refs.c:609 msgid "[- Unavailable -]" msgstr "[- Pole kasutatav -]" -#: src/save.c:976 +# TRANSLATION MISSING +#. +#. * preamble +#. * TODO: -> lang.c +#. +#: src/rfc2047.c:1203 +msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" + "are reading this prefix, your mail reader probably has not yet been modified\n" + "to understand the new format, and some of what follows may look strange.\n" + "\n" +msgstr "" + +#: src/save.c:967 msgid "bytes" msgstr "baiti" Binary files tin-1.7.4/po/fr.gmo and tin-1.7.5/po/fr.gmo differ diff -Nurp tin-1.7.4/po/fr.po tin-1.7.5/po/fr.po --- tin-1.7.4/po/fr.po 2004-02-25 10:34:14.000000000 +0100 +++ tin-1.7.5/po/fr.po 2004-06-04 13:49:41.000000000 +0200 @@ -3,236 +3,241 @@ # msgid "" msgstr "Project-Id-Version: 1.7.4\n" - "POT-Creation-Date: 2004-02-25 10:33+0100\n" - "PO-Revision-Date: 2004-01-28 09:50+0100\n" + "POT-Creation-Date: 2004-06-04 13:31+0200\n" + "PO-Revision-Date: 2004-03-01 16:07+0100\n" "Last-Translator: Matt Anton \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" + "Report-Msgid-Bugs-To: \n" #: src/art.c:1430 #, c-format msgid "%d Bad overview record (%d fields) '%s'" msgstr "%d Mauvais overview (%d champs) '%s'" -#: src/attrib.c:585 +#: src/attrib.c:590 msgid "# Do not edit this comment block\n" "#\n" msgstr "# Ne pas éditer ce commentaire\n" "#\n" -#: src/attrib.c:586 +#: src/attrib.c:591 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "# scope=TERME (pe. alt.*,!alt.bin*) [obligatoire]\n" -#: src/attrib.c:587 +#: src/attrib.c:592 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "# maildir=TERME (pe. ~/Mail)\n" -#: src/attrib.c:588 +#: src/attrib.c:593 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "# savedir=TERME (pe. ~user/News)\n" -#: src/attrib.c:589 +#: src/attrib.c:594 msgid "# savefile=STRING (ie. =linux)\n" msgstr "# savefile=TERME (pe. =linux)\n" -#: src/attrib.c:590 +#: src/attrib.c:595 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "# sigfile=TERME (pe. $var/sig)\n" -#: src/attrib.c:591 +#: src/attrib.c:596 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "# organization=TERME (si commence par '/' lire dans fichier)\n" -#: src/attrib.c:592 +#: src/attrib.c:597 msgid "# followup_to=STRING\n" msgstr "# followup_to=TERME\n" -#: src/attrib.c:593 +#: src/attrib.c:598 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "# mailing_list=TERME (pe. majordomo@example.org)\n" -#: src/attrib.c:594 +#: src/attrib.c:599 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "# x_headers=TERME (pe. ~/.tin/extra-headers)\n" -#: src/attrib.c:595 +#: src/attrib.c:600 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "# x_body=TERME (pe. ~/.tin/extra-body-text)\n" -#: src/attrib.c:596 +#: src/attrib.c:601 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" -msgstr "# from=TERME (choix du From:-ligne:, ne pas utiliser celui cité)\n" +msgstr "# from=TERME (choix du 'From:', ne pas utiliser celui cité)\n" -#: src/attrib.c:597 +#: src/attrib.c:602 msgid "# news_quote_format=STRING\n" msgstr "# news_quote_format=TERME\n" -#: src/attrib.c:598 +#: src/attrib.c:603 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "# quote_chars=TERME (%%s, %%S pour les initiales)\n" -#: src/attrib.c:599 +#: src/attrib.c:604 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "# mime_types_to_save=TERME (pe. image/*,!image/bmp)\n" -#: src/attrib.c:601 +#: src/attrib.c:606 msgid "# ispell=STRING\n" msgstr "# ispell=TERME\n" -#: src/attrib.c:603 +#: src/attrib.c:608 msgid "# auto_select=ON/OFF\n" msgstr "# auto_select=ON/OFF\n" -#: src/attrib.c:604 +#: src/attrib.c:609 msgid "# auto_save=ON/OFF\n" msgstr "# auto_save=ON/OFF\n" -#: src/attrib.c:605 +#: src/attrib.c:610 msgid "# batch_save=ON/OFF\n" msgstr "# batch_save=ON/OFF\n" -#: src/attrib.c:606 +#: src/attrib.c:611 msgid "# delete_tmp_files=ON/OFF\n" msgstr "# delete_tmp_files=ON/OFF\n" -#: src/attrib.c:607 +#: src/attrib.c:612 msgid "# show_only_unread=ON/OFF\n" msgstr "# show_only_unread=ON/OFF\n" -#: src/attrib.c:608 +#: src/attrib.c:613 msgid "# thread_arts=NUM" msgstr "# thread_arts=NUM" -#: src/attrib.c:615 +#: src/attrib.c:620 msgid "# show_author=NUM\n" msgstr "# show_author=NUM\n" -#: src/attrib.c:621 +#: src/attrib.c:626 msgid "# show_info=NUM\n" msgstr "# show_info=NUM\n" -#: src/attrib.c:627 +#: src/attrib.c:632 msgid "# sort_art_type=NUM\n" msgstr "# sort_art_type=NUM\n" -#: src/attrib.c:645 +#: src/attrib.c:650 msgid "# sort_threads_type=NUM\n" msgstr "# sort_threads_type=NUM\n" -#: src/attrib.c:650 +#: src/attrib.c:655 msgid "# post_proc_type=NUM\n" msgstr "# post_proc_type=NUM\n" -#: src/attrib.c:655 +#: src/attrib.c:660 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "# quick_kill_scope=TERME (pe. talk.*)\n" -#: src/attrib.c:656 +#: src/attrib.c:661 msgid "# quick_kill_expire=ON/OFF\n" msgstr "# quick_kill_expire=ON/OFF\n" -#: src/attrib.c:657 +#: src/attrib.c:662 msgid "# quick_kill_case=ON/OFF\n" msgstr "# quick_kill_case=ON/OFF\n" -#: src/attrib.c:658 +#: src/attrib.c:663 msgid "# quick_kill_header=NUM\n" msgstr "# quick_kill_header=NUM\n" -#: src/attrib.c:659 src/attrib.c:666 +#: src/attrib.c:664 src/attrib.c:671 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" -msgstr "# 0=sujet (casse sensible) 1=sujet (ignore la casse)\n" +msgstr "# 0=subject (casse sensible) 1=subject (ignore la casse)\n" -#: src/attrib.c:660 src/attrib.c:667 +#: src/attrib.c:665 src/attrib.c:672 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" -msgstr "# 2=de (casse sensible) 3=de (ignore la casse)\n" +msgstr "# 2=from (casse sensible) 3=from (ignore la casse)\n" -#: src/attrib.c:661 src/attrib.c:668 +#: src/attrib.c:666 src/attrib.c:673 msgid "# 4=msgid 5=lines\n" -msgstr "# 4=msgid 5=lignes\n" +msgstr "# 4=msgid 5=lines\n" -#: src/attrib.c:662 +#: src/attrib.c:667 msgid "# quick_select_scope=STRING\n" msgstr "# quick_select_scope=TERME\n" -#: src/attrib.c:663 +#: src/attrib.c:668 msgid "# quick_select_expire=ON/OFF\n" msgstr "# quick_select_expire=ON/OFF\n" -#: src/attrib.c:664 +#: src/attrib.c:669 msgid "# quick_select_case=ON/OFF\n" msgstr "# quick_select_case=ON/OFF\n" -#: src/attrib.c:665 +#: src/attrib.c:670 msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" -#: src/attrib.c:669 +#: src/attrib.c:674 msgid "# x_comment_to=ON/OFF\n" msgstr "# x_comment_to=ON/OFF\n" -#: src/attrib.c:670 +#: src/attrib.c:675 msgid "# fcc=STRING (eg. =mailbox)\n" -msgstr "" +msgstr "# fcc=TERME (pe. =mailbox)\n" -#: src/attrib.c:671 +#: src/attrib.c:676 msgid "# tex2iso_conv=ON/OFF\n" msgstr "# tex2iso_conv=ON/OFF\n" -#: src/attrib.c:673 +#: src/attrib.c:677 +msgid "# mime_forward=ON/OFF\n" +msgstr "" + +#: src/attrib.c:679 msgid "# mm_network_charset=supported_charset" msgstr "# mm_network_charset=encodage_supporté" -#: src/attrib.c:680 +#: src/attrib.c:686 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "# undeclared_charset=TERME (défaut est US-ASCII)\n" -#: src/attrib.c:682 +#: src/attrib.c:688 msgid "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "#\n" "# Notez que placer les entrées générales (portée globale) en premier\n" -#: src/attrib.c:683 +#: src/attrib.c:689 msgid "# entries first followed by group specific entries.\n" "#\n" msgstr "# est préférable, suivies des entrées spécifiques aux groupes.\n" "#\n" -#: src/attrib.c:684 +#: src/attrib.c:690 msgid "############################################################################\n" "\n" msgstr "############################################################################\n" "\n" -#: src/attrib.c:690 +#: src/attrib.c:696 msgid "# include extra headers\n" msgstr "# inclure des en-têtes supplémentaires\n" -#: src/attrib.c:698 +#: src/attrib.c:704 msgid "# in *sources* set post process type to shar only\n" msgstr "# dans *sources* choisir le type shar en post-traitement\n" -#: src/attrib.c:702 +#: src/attrib.c:708 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "# dans *binaries* faire traitement complet, effaçant les fichiers " "temporaires\n" -#: src/attrib.c:703 +#: src/attrib.c:709 msgid "# and set Followup-To: poster\n" msgstr "# et utiliser Followup-To: poster\n" -#: src/cook.c:809 +#: src/cook.c:814 msgid "(unknown)" msgstr "(inconnu)" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:612 src/filter.c:620 +#: src/filter.c:600 src/filter.c:608 msgid "Removed from the previous rule: " msgstr "Effacé de la règle précédente : " @@ -320,7 +325,7 @@ msgstr "Article rejeté (enregistré dans #: src/lang.c:62 #, c-format msgid "%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: " -msgstr "%s=article, %s=fil, %s=sélection, %s=modèle, %s=art. marq., %s=quitter : " +msgstr "%s=article, %s=fil, %s=sélection, %s=chaîne, %s=art. marq., %s=quitter : " #: src/lang.c:63 msgid "Article unavailable" @@ -359,7 +364,7 @@ msgstr " à %s" #: src/lang.c:72 #, c-format msgid "%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n" -msgstr "%*s[-- %s/%s, encodage de %s%s%s, %d lignes%s%s --]\n" +msgstr "%*s[-- %s/%s, encodage en %s%s%s, %d lignes%s%s --]\n" #: src/lang.c:73 msgid ", charset: " @@ -390,12 +395,12 @@ msgstr " Entrez votre identifiant svp #: src/lang.c:79 #, c-format msgid "Author search backwards [%s]> " -msgstr "Recherche arrière sur l'auteur [%s]> " +msgstr "Recherche arrière sur l'auteur [%s] > " #: src/lang.c:80 #, c-format msgid "Author search forwards [%s]> " -msgstr "Recherche avant sur l'auteur [%s]> " +msgstr "Recherche avant sur l'auteur [%s] > " #: src/lang.c:81 #, c-format @@ -426,7 +431,7 @@ msgstr "Sélection auto. des articles (vo #: src/lang.c:87 #, c-format msgid "Active file corrupt - %s" -msgstr "Fichier actif corrompu - %s" +msgstr "Fichier active corrompu - %s" #: src/lang.c:88 #, c-format @@ -518,7 +523,7 @@ msgstr "Effacement sur %s..." #: src/lang.c:110 msgid "Catchup all groups entered during this session?" -msgstr "Marquer comme lu tous les groupes entrés lors de la session ?" +msgstr "Marquer lus tous les groupes visités lors de la session ?" #: src/lang.c:111 msgid "You have tagged articles in this group - catchup anyway?" @@ -561,7 +566,7 @@ msgstr "Couleurs ANSI activées" #: src/lang.c:120 #, c-format msgid "Command failed: %s" -msgstr "Commande échouée : %s" +msgstr "Échec commande : %s" #: src/lang.c:121 msgid "Mark not selected articles read?" @@ -574,7 +579,7 @@ msgstr "Connexion à %s..." #: src/lang.c:123 msgid "" -msgstr "" +msgstr "" #: src/lang.c:124 msgid "Creating active file for saved groups...\n" @@ -614,11 +619,11 @@ msgstr "*** Fin du fil ***" #: src/lang.c:135 msgid "Enter limit of articles to get> " -msgstr "Entrez le nombre max d'articles à récupérer> " +msgstr "Entrez le nombre max d'articles à récupérer > " #: src/lang.c:136 msgid "Enter Message-ID to go to> " -msgstr "Entrez le Message-ID à aller voir> " +msgstr "Entrez le Message-ID à voir > " #: src/lang.c:137 msgid " and enter next unread thread" @@ -630,12 +635,12 @@ msgstr " et entrer dans le groupe suivan #: src/lang.c:139 msgid "Enter option number> " -msgstr "Entrez le numéro de l'option> " +msgstr "Entrez le numéro de l'option > " #: src/lang.c:140 #, c-format msgid "Enter range [%s]> " -msgstr "Entrez un champ [%s]> " +msgstr "Entrez un champ [%s] > " #: src/lang.c:141 msgid "\n" @@ -680,7 +685,7 @@ msgstr "Fichier %s corrompu" #: src/lang.c:150 #, c-format msgid "Couldn't dotlock %s - article not appended!" -msgstr "N'a pu 'dotlock' %s - article non ajouté !" +msgstr "N'a pu déverrouiler %s - article non ajouté !" #: src/lang.c:151 #, c-format @@ -882,7 +887,7 @@ msgid "\n" "Error: Header on line %d does not have a space after the colon:\n" "%s\n" msgstr "\n" - "Erreur : L'en-tête à la ligne %d n'a pas d'espace après le séparateur:\n" + "Erreur : L'en-tête à la ligne %d n'a pas d'espace après le séparateur :\n" "%s\n" #: src/lang.c:197 @@ -897,7 +902,7 @@ msgstr "\n" msgid "Insecure permissions of %s (%o)" msgstr "Permissions de %s non sûres (%o)" -#: src/lang.c:199 src/newsrc.c:410 +#: src/lang.c:199 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "Réponse de la commande GROUP invalide, %s" @@ -924,7 +929,7 @@ msgstr "Pas la permission d'aller dans % msgid "\n" "Error: From: line missing.\n" msgstr "\n" - "Erreur : Ligne From: manquante.\n" + "Erreur : En-tête 'From:' manquant.\n" #: src/lang.c:206 #, c-format @@ -980,7 +985,7 @@ msgstr "Fermeture..." #: src/lang.c:217 msgid "leaving external mail-reader" -msgstr "fermeture du lecteur de messagerie externe" +msgstr "fermeture du client mail externe" #: src/lang.c:218 #, c-format @@ -1009,7 +1014,7 @@ msgstr "Règle créée par : " #: src/lang.c:224 #, c-format msgid "Enter pattern [%s]> " -msgstr "Entrez le réglage [%s]> " +msgstr "Entrez le réglage [%s] > " #: src/lang.c:225 #, c-format @@ -1021,15 +1026,15 @@ msgstr "\n" #: src/lang.c:226 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" -msgstr " %s\t Réponses vous seront envoyées par email.\n" +msgstr " %s\t Les réponses vous seront envoyées par email.\n" #: src/lang.c:227 msgid "-- forwarded message --\n" -msgstr "" +msgstr "-- message redirigé --\n" #: src/lang.c:228 msgid "-- end of forwarded message --\n" -msgstr "" +msgstr "-- fin du message redirigé --\n" #: src/lang.c:229 msgid "# Format:\n" @@ -1064,34 +1069,37 @@ msgstr "# Format :\n" "#\t\t\tdébut de la règle, sinon ils seront déplacés\n" "#\t\t\tà la règle suivante. '#' n'est pas un mot-clé\n" "#\t\t\tvalide pour un commentaire !\n" - "# group=TERME\tOgligatoire. Liste de groupe (pe. fr.comp.*,!*sources*).\n" + "# group=TERME\t\tOgligatoire. Liste de groupe (pe. fr.comp.*,!*sources*).\n" "# case=NUM\t\tOgligatoire. Casse sensible=0 / casse insensible=1.\n" "# score=NUM|TERME\tObligatoire. Score à attribuer. Soit :\n" - "# score=NUM\t- Un numéro (pe. 70). Ou :\n" + "# score=NUM\t\t- Un numéro (pe. 70). Ou :\n" "# score=TERME\t- Un des deux mots-clé suivants : 'hot' ou 'kill'.\n" - "# subj=TERME\t\tFacultatif. Ligne Subject: (pe. Comment devenir un " + "# subj=TERME\t\tFacultatif. En-tête 'Subject:' (pe. Comment devenir un " "gourou).\n" - "# from=TERME\t\tFacultatif. Ligne From: (pe. *Craig Shergold*).\n" - "# msgid=TERME\tFacultatif. Ligne Message-ID: (pe. <123@ether.net>) avec\n" + "# from=TERME\t\tFacultatif. En-tête 'From:' (pe. *Craig Shergold*).\n" + "# msgid=TERME\t\tFacultatif. En-tête 'Message-ID:' (pe. <123@ether.net>) " + "avec\n" "#\t\t\tréférence complète.\n" "# msgid_last=TERME\tFacultatif. Comme ci-dessus mais avec juste le dernier " "MID.\n" "# msgid_only=TERME\tFacultatif. Comme ci-dessus mais sans les références.\n" - "# refs_only=TERME\tFacultatif. Ligne References: (pe. <123@ether.net>) " + "# refs_only=TERME\tFacultatif. En-tête 'References:' (pe. <123@ether.net>) " "sans\n" "#\t\t\tla ligne Message-ID:\n" - "# lines=[<>]?NUM\tFacultatif. Ligne Lines:. '<' ou '>' sont optionnels.\n" + "# lines=[<>]?NUM\tFacultatif. En-tête 'Lines:'. '<' ou '>' sont " + "optionnels.\n" "# gnksa=[<>]?NUM\tFacultatif. Résultat du 'parse_from' du GNKSA. '<' ou " "'>'\n" "#\t\t\tsont optionnels.\n" - "# xref=CHAÎNE\tFacultatif. Chaîne à filtrer (pe. alt.flame*)\n" - "# time=NUM\t\tFacultatif. Valeur de time_t indique la durée de la règle.\n" + "# xref=CHAÎNE\t\tFacultatif. Chaîne à filtrer (pe. alt.flame*)\n" + "# time=NUM\t\tFacultatif. La valeur de time_t indique la durée de la " + "règle.\n" "#\n" #: src/lang.c:250 #, c-format msgid "Enter score for rule (default=%d): " -msgstr "Entrez le score de cette règle (défaut=%d) : " +msgstr "Entrez le score (défaut=%d) : " #: src/lang.c:251 #, c-format @@ -1101,23 +1109,23 @@ msgstr "Entrez la valeur du score (0 < s #. SCORE_MAX #: src/lang.c:252 msgid "Full" -msgstr "Complet" +msgstr "Tous" #: src/lang.c:253 msgid "Comment (optional) : " -msgstr "Commentaire (optionnel) : " +msgstr "Commentaire (facultatif) : " #: src/lang.c:254 msgid "Apply pattern to : " -msgstr "Appliquer le réglage à : " +msgstr "Appliquer à : " #: src/lang.c:255 msgid "From: line (ignore case) " -msgstr "Ligne From: (ignorer la casse) " +msgstr "l'en-tête 'From:' (ignorer la casse)" #: src/lang.c:256 msgid "From: line (case sensitive) " -msgstr "Ligne From: (casse sensible) " +msgstr "l'en-tête 'From:' (casse sensible)" #: src/lang.c:258 #, c-format @@ -1166,44 +1174,49 @@ msgstr "groupe" #: src/lang.c:269 msgid "One or more lines of comment. to add a line or proceed if line is empty." -msgstr "Un ou plusieurs lignes de commentaire. pour ajouter une ligne ou " - "procéder si vide." +msgstr "Inclure un commentaire. pour ajouter une ligne ou continuer si vide." #: src/lang.c:270 msgid "From: line to add to filter file. toggles & sets." -msgstr "" +msgstr "Filtrer l'en-tête 'From:'. change & valide." #: src/lang.c:271 msgid "Linecount of articles to be filtered. < for less, > for more, = for equal." -msgstr "" +msgstr "Filtrer selon le nombre de lignes. < pour moins, > pour plus, = pareil." #: src/lang.c:272 msgid "Message-ID: line to add to filter file. toggles & sets." -msgstr "" +msgstr "Filtrer l'en-tête 'Message-ID'. change & valide." #: src/lang.c:273 msgid "Subject: line to add to filter file. toggles & sets." -msgstr "" +msgstr "Filtrer l'en-tête 'Subject'. change & valide." +# TRANSLATION TOO LONG #: src/lang.c:274 msgid "Enter text pattern to filter if Subject: & From: lines are not what you want." -msgstr "" +msgstr "Terme à filtrer si vous ne voulez pas filtrer d'après les en-têtes 'Subject:' " + "& 'From:'" #: src/lang.c:275 msgid "Select where text pattern should be applied. toggles & sets." -msgstr "" +msgstr "Sur quel en-tête appliquer ce terme. change & valide." #: src/lang.c:276 msgid "Expiration time in days for the entered filter. toggles & sets." -msgstr "" +msgstr "Durée (en nombre de jours) du filtre. change & valide." +# TRANSLATION TOO LONG #: src/lang.c:277 msgid "Apply kill only to current group or all groups. toggles & sets." -msgstr "" +msgstr "Appliquer le filtre au groupe actuel ou à tous. change & " + "valide." +# TRANSLATION TOO LONG #: src/lang.c:278 msgid "Apply select to current group or all groups. toggles & sets." -msgstr "" +msgstr "Appliquer la règle au groupe actuel ou à tous. change & " + "valide." #: src/lang.c:279 msgid "kill an article via a menu" @@ -1291,7 +1304,7 @@ msgstr "filtrer rapidement un article en #: src/lang.c:300 msgid "quickly auto-select (hot) an article using defaults" -msgstr "sélection auto. (hot) un article en utilisant les défauts" +msgstr "sélection auto. (hot) d'un article en utilisant les défauts" #: src/lang.c:301 msgid "return to group selection level" @@ -1343,11 +1356,11 @@ msgstr "(dés)activer ROT-13 (décodage ba #: src/lang.c:313 msgid "toggle tabwidth 4 <-> 8" -msgstr "(dés)activer taille de tabulation 4 <-> 8" +msgstr "basculer la taille de tabulation 4 <-> 8" #: src/lang.c:314 msgid "toggle german TeX style decoding for current article" -msgstr "(dés)activer le décodage de type TeX allemand pour l'article actuel" +msgstr "(dés)activer le décodage Allemand de type TeX pour l'article actuel" #: src/lang.c:315 msgid "toggle display of uuencoded sections" @@ -1360,7 +1373,7 @@ msgstr "Voir/enregistrer les pj multiméd #: src/lang.c:317 #, c-format msgid "report bug or comment via mail to %s" -msgstr "envoi d'un report de bug ou de commentaires à %s" +msgstr "signaler un bug ou envoi d'un commentaires à %s" #: src/lang.c:318 msgid "choose range of articles to be affected by next command" @@ -1408,7 +1421,7 @@ msgstr "monter d'une page" #: src/lang.c:329 msgid "post (write) article to current group" -msgstr "poster (écrire) l'article dans le groupe actuel" +msgstr "poster (écrire) un article dans le groupe actuel" #: src/lang.c:330 msgid "post postponed articles" @@ -1464,7 +1477,7 @@ msgstr "recherche avant d'articles par S #: src/lang.c:343 msgid "repeat last search" -msgstr "répéter la dernière recherche" +msgstr "relancer la dernière recherche" #: src/lang.c:344 msgid "tag current article for reposting/mailing/piping/printing/saving" @@ -1472,15 +1485,15 @@ msgstr "marquer article pour repostage/e #: src/lang.c:345 msgid "toggle info message in last line (subject/description)" -msgstr "(dés)activer les infos dans la dernière ligne (sujet/description)" +msgstr "afficher ou non les infos dans la dernière ligne (sujet/description)" #: src/lang.c:346 msgid "toggle inverse video" -msgstr "(dés)activer vidéo inversée" +msgstr "afficher ou non la vidéo inversée" #: src/lang.c:347 msgid "toggle mini help menu display" -msgstr "(dés)activer vue du mini menu aide" +msgstr "afficher ou non le petit menu d'aide" #: src/lang.c:348 msgid "cycle the display of authors email address, real name, both or neither" @@ -1516,7 +1529,7 @@ msgstr "marquer l'article comme non lu" #: src/lang.c:356 msgid "mark current thread or tagged threads as read" -msgstr "" +msgstr "marquer le fil actuel ou les fils marqués comme lus" #: src/lang.c:357 msgid "mark thread as unread" @@ -1597,7 +1610,7 @@ msgstr "marquer tout article dans groupe #: src/lang.c:376 msgid "choose first group in list" -msgstr "choisir 1er groupe de la liste" +msgstr "choisir le 1er groupe de la liste" #: src/lang.c:377 msgid "choose group by name" @@ -1605,7 +1618,7 @@ msgstr "choisir le groupe par nom" #: src/lang.c:378 msgid "0 - 9\t choose group by number" -msgstr "0 - 9\t choisir groupe par numéro" +msgstr "0 - 9\t choisir un groupe par son numéro" #: src/lang.c:379 msgid "choose range of groups to be affected by next command" @@ -1613,7 +1626,7 @@ msgstr "choisir les groupes affectés par #: src/lang.c:380 msgid "choose last group in list" -msgstr "choisir dernier groupe de la liste" +msgstr "choisir le dernier groupe de la liste" #: src/lang.c:381 msgid "mark all articles in chosen group unread" @@ -1621,11 +1634,11 @@ msgstr "marquer non lu tout article dans #: src/lang.c:382 msgid "move chosen group within list" -msgstr "déplacer dans la liste le groupe choisi" +msgstr "déplacer le groupe sélectionné" #: src/lang.c:383 msgid "choose next group with unread news" -msgstr "choisir groupe suivant ayant articles non lus" +msgstr "choisir le groupe suivant ayant articles non lus" #: src/lang.c:384 src/lang.c:1165 msgid "quit" @@ -1657,7 +1670,7 @@ msgstr "recherche avant d'un groupe" #: src/lang.c:391 msgid "subscribe to chosen group" -msgstr "abonnement au groupe choisi" +msgstr "s'abonner au groupe sélectionné" #: src/lang.c:392 msgid "subscribe to groups that match pattern" @@ -1665,11 +1678,11 @@ msgstr "abonnement aux groupes correspon #: src/lang.c:393 msgid "reread active file to check for any new news" -msgstr "relire le fichier active pour vérifier nouveaux articles" +msgstr "vérifier l'existence de nouveaux articles" #: src/lang.c:394 msgid "toggle display of group name only or group name plus description" -msgstr "" +msgstr "afficher ou non le nom du groupe ou le nom + sa description" #: src/lang.c:395 msgid "toggle display to show all/unread subscribed groups" @@ -1677,7 +1690,7 @@ msgstr "afficher ou non tous les groupes #: src/lang.c:396 msgid "unsubscribe from chosen group" -msgstr "désabonnement du groupe choisi" +msgstr "se désabonner du groupe sélectionné" #: src/lang.c:397 msgid "unsubscribe from groups that match pattern" @@ -1740,8 +1753,8 @@ msgstr "Navigation\n" #: src/lang.c:410 msgid "Group/thread/article operations\n" "-------------------------------" -msgstr "Opérations sur les Groupes/fils/articles\n" - "----------------------------------------" +msgstr "Opérations sur les Groupes / fils / articles\n" + "--------------------------------------------" #: src/lang.c:412 msgid "Group Level Commands" @@ -1774,7 +1787,7 @@ msgstr "Partie manquante #%d" #: src/lang.c:419 msgid "*** No postponed articles ***" -msgstr "*** Pas de brouillons ***" +msgstr "*** Aucun brouillon ***" #: src/lang.c:420 msgid "Not a multi-part message" @@ -1886,7 +1899,7 @@ msgstr "\n" #: src/lang.c:448 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." -msgstr "Ligne From: %s invalide. Lisez le fichier INSTALL une 2e fois." +msgstr "En-tête From: %s invalide. Lisez le fichier INSTALL une 2e fois." #: src/lang.c:449 #, c-format @@ -1924,37 +1937,37 @@ msgstr "Clé '%s' est définie pour %s%s e #: src/lang.c:457 #, c-format msgid "Kill From: [%s] (y/n): " -msgstr "" +msgstr " De : [%s] (o/n) : " #: src/lang.c:458 msgid "Kill Lines: (num): " -msgstr "" +msgstr "Nombre de lignes (num) : " #: src/lang.c:459 msgid "Kill Article Menu" -msgstr "" +msgstr "Créer un filtre" #: src/lang.c:460 #, c-format msgid "Kill Msg-Id: [%s] (f/l/o/n): " -msgstr "" +msgstr " MID : [%s] (t/d/a/n) : " #: src/lang.c:461 msgid "Kill pattern scope : " -msgstr "" +msgstr "Filtre s'appliquant à : " #: src/lang.c:462 #, c-format msgid "Kill Subject: [%s] (y/n): " -msgstr "" +msgstr "Sujet : [%s] (o/n) : " #: src/lang.c:463 msgid "Kill text pattern : " -msgstr "" +msgstr "Texte à filtrer : " #: src/lang.c:464 msgid "Kill time in days : " -msgstr "" +msgstr "Durée du filtre : " #: src/lang.c:466 msgid "Last" @@ -1967,11 +1980,11 @@ msgstr "-- Dernière réponse --" #: src/lang.c:468 #, c-format msgid "Lines %s " -msgstr "Ligne %s " +msgstr "%s lignes " #: src/lang.c:470 msgid "Message-ID: line " -msgstr "" +msgstr "l'en-tête 'Message-ID:'" #: src/lang.c:472 msgid "mailbox " @@ -1980,7 +1993,7 @@ msgstr "bàl" #: src/lang.c:473 #, c-format msgid "Mail article(s) to [%.*s]> " -msgstr "Envoyer article(s) à [%.*s]> " +msgstr "Envoyer article(s) à [%.*s] > " #: src/lang.c:474 #, c-format @@ -1994,7 +2007,7 @@ msgstr "Envoi d'un rapport de bug..." #: src/lang.c:476 #, c-format msgid "Mail BUG REPORT to %s?" -msgstr "Envoyer RAPPORT DE BUG à %s ?" +msgstr "Signaler LE BUG à %s ?" #: src/lang.c:477 msgid "Mailed" @@ -2059,7 +2072,7 @@ msgstr "%s groupes correspondants..." #: src/lang.c:490 src/lang.c:494 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" -msgstr "=régler l'actuel à n; %s=non lu suivant; %s=rech. terme; %s=filtrer/sél." +msgstr "=voir 'n'; %s=non lu suivant; %s=rechercher; %s=filtrer/sél." #: src/lang.c:491 #, c-format @@ -2085,7 +2098,7 @@ msgstr "%s=rech. auteur; %s=rech. corps; #: src/lang.c:496 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" -msgstr "=passer actuel à n; %s=non lu suivant; %s,%s=rech. terme; %s=tout lu" +msgstr "=voir 'n'; %s=non lu suivant; %s,%s=rechercher; %s=tout lu" #: src/lang.c:497 #, c-format @@ -2095,13 +2108,12 @@ msgstr "%s=bas; %s=haut; %s=aide; %s=dép #: src/lang.c:498 #, c-format msgid "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/out" -msgstr "%s=abonner; %s=sous-critère; %s=désabonner; %s=critère; %s=yank in/out" +msgstr "%s=abonner; %s=sous-critère; %s=désabonner; %s=critère; %s=liste des groupes" #: src/lang.c:499 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" -msgstr "=passer l'actuel à n; %s=non lu suivant; %s=tout lu; %s=basculer " - "l'affichage" +msgstr "=voir 'n'; %s=non lu suivant; %s=tout lu; %s=basculer l'affichage" #: src/lang.c:500 #, c-format @@ -2110,7 +2122,7 @@ msgstr "%s=aide; %s=bas; %s=haut; %s=qui #: src/lang.c:501 msgid "--More--" -msgstr "-- Plus --" +msgstr "-- Suite --" #: src/lang.c:502 #, c-format @@ -2167,7 +2179,7 @@ msgstr "Non " #: src/lang.c:515 msgid "*** No articles ***" -msgstr "*** Pas d'articles ***" +msgstr "*** Aucun article ***" #: src/lang.c:516 msgid "No articles have been posted" @@ -2175,7 +2187,7 @@ msgstr "Aucun article n'a été posté" #: src/lang.c:517 msgid "*** No description ***" -msgstr "*** Pas de description ***" +msgstr "*** Aucune description ***" #: src/lang.c:518 msgid "No filename" @@ -2187,7 +2199,7 @@ msgstr "Pas de groupe" #: src/lang.c:520 msgid "*** No groups ***" -msgstr "*** Pas de groupes ***" +msgstr "*** Aucun groupe ***" #: src/lang.c:521 msgid "No more groups to read" @@ -2195,19 +2207,19 @@ msgstr "Plus de groupes à lire" #: src/lang.c:522 msgid "No last message" -msgstr "Pas de dernier message" +msgstr "Aucun dernier message" #: src/lang.c:523 msgid "No mail address" -msgstr "Pas d'adresse email" +msgstr "Aucune adresse email" #: src/lang.c:524 msgid "No articles marked for saving" -msgstr "Pas d'articles marqués à enregistrer" +msgstr "Aucun article marqué à enregistrer" #: src/lang.c:525 msgid "No match" -msgstr "Pas de résultat" +msgstr "Aucun résultat" #: src/lang.c:526 msgid "No more groups" @@ -2215,35 +2227,35 @@ msgstr "Plus de groupes" #: src/lang.c:527 msgid "No newsgroups" -msgstr "Pas de groupes" +msgstr "Aucun groupe" #: src/lang.c:528 msgid "No next unread article" -msgstr "Pas d'article non lu suivant" +msgstr "Aucun article non lu suivant" #: src/lang.c:529 msgid "No previous group" -msgstr "Pas de groupe précédent" +msgstr "Aucun groupe précédent" #: src/lang.c:530 msgid "No previous unread article" -msgstr "Pas d'article non lu précédent" +msgstr "Aucun article non lu précédent" #: src/lang.c:531 msgid "No responses" -msgstr "Pas de réponses" +msgstr "Aucune réponse" #: src/lang.c:532 msgid "No responses to list in current thread" -msgstr "Pas de réponses à afficher dans le fil actuel" +msgstr "Aucune réponse à afficher dans le fil actuel" #: src/lang.c:533 msgid "No search string" -msgstr "Pas de termes à rechercher" +msgstr "Aucun terme à rechercher" #: src/lang.c:534 msgid "No subject" -msgstr "Pas de sujet" +msgstr "Aucun sujet" #: src/lang.c:535 #, c-format @@ -2306,14 +2318,14 @@ msgid "# NNTP-server -> newsrc translati "# news.tin.org .newsrc-tin.org tinorg\n" "# news.ka.nu /tmp/nrc-nu kanu nu\n" "#\n" -msgstr "# Serveur-NNTP -> tableau de correspondance du newsrc et Serveur-NNTP\n" +msgstr "# Serveur NNTP -> tableau de correspondance du newsrc et serveur NNTP\n" "# liste des alias pour %s %s\n" "#\n" - "# le format de ce fichier est\n" - "# ...\n" + "# le format de ce fichier est le suivant :\n" + "# ...\n" "#\n" - "# si n'inclut pas le chemin, $HOME est alors considéré comme " - "celui par défaut\n" + "# si n'inclus pas le chemin,\n" + "# $HOME est alors considéré comme celui par défaut\n" "#\n" "# exemples :\n" "# news.tin.org .newsrc-tin.org tinorg\n" @@ -2322,7 +2334,7 @@ msgstr "# Serveur-NNTP -> tableau de cor #: src/lang.c:552 msgid "Only" -msgstr "Uniquement" +msgstr "Actuel" #: src/lang.c:553 #, c-format @@ -2381,7 +2393,7 @@ msgstr "-- post-traitement terminé --" #: src/lang.c:569 #, c-format msgid "Post subject [%s]> " -msgstr "Poster le sujet [%s]> " +msgstr "Poster le sujet [%s] > " #: src/lang.c:570 msgid "# Summary of mailed/posted messages viewable by 'W' command from within tin.\n" @@ -2435,11 +2447,11 @@ msgstr "Voulez-vous voir les brouillons #: src/lang.c:582 msgid "Add quick kill filter?" -msgstr "Ajout rapide d'un filtre d'élimination ?" +msgstr "Ajouter rapidement un filtre ?" #: src/lang.c:583 msgid "Add quick selection filter?" -msgstr "Ajout rapide d'un filtre de sélection ?" +msgstr "Ajouter rapidement une règle ?" #: src/lang.c:584 msgid "Do you really want to quit?" @@ -2451,7 +2463,7 @@ msgstr "%s=éditer message d'annulation, #: src/lang.c:586 msgid "You have tagged articles in this group - quit anyway?" -msgstr "Vous avez des articles marqués dans ce groupe - tout de même quitter?" +msgstr "Vous avez des articles marqués dans ce groupe - quitter quand même ?" #: src/lang.c:587 #, c-format @@ -2461,12 +2473,12 @@ msgstr "%s=quitter, %s=éditer, %s=brouil #: src/lang.c:588 #, c-format msgid "%s=quit %s=edit %s=save kill description: " -msgstr "%s=quitter, %s=éditer, %s=enregistrer description du filtre : " +msgstr "%s=quitter, %s=éditer, %s=enregistrer le filtre : " #: src/lang.c:589 #, c-format msgid "%s=quit %s=edit %s=save select description: " -msgstr "%s=quitter %s=éditer %s=enregistrer la description sél. : " +msgstr "%s=quitter %s=éditer %s=enregistrer la règle : " #: src/lang.c:590 msgid "Do you really want to quit without saving your configuration?" @@ -2583,46 +2595,46 @@ msgstr "Les réponses ont été redirigées #: src/lang.c:618 #, c-format msgid "RespNo %4d of %4d" -msgstr "Nbre rép. %4d/%4d" +msgstr "Réponse %4d sur %4d" #: src/lang.c:619 msgid "Press to continue..." -msgstr "Appuyez sur pour continuer..." +msgstr "Appuyez sur pour continuer..." #: src/lang.c:621 #, c-format msgid "Select From [%s] (y/n): " -msgstr "" +msgstr " De : [%s] (o/n) : " #: src/lang.c:622 msgid "Select Lines: (num): " -msgstr "" +msgstr "Nombre de lignes (num) : " #: src/lang.c:623 msgid "Auto-select Article Menu" -msgstr "" +msgstr "Créer une règle" #: src/lang.c:624 #, c-format msgid "Select Msg-Id [%s] (f/l/o/n): " -msgstr "" +msgstr " MID : [%s] (t/d/a/n) : " #: src/lang.c:625 msgid "Select pattern scope: " -msgstr "" +msgstr "Règle s'appliquant à : " #: src/lang.c:626 #, c-format msgid "Select Subject [%s] (y/n): " -msgstr "Sél. Sujet [%s] (o/n) : " +msgstr "Sujet : [%s] (o/n) : " #: src/lang.c:627 msgid "Select text pattern : " -msgstr "" +msgstr "Texte ou terme : " #: src/lang.c:628 msgid "Select time in days : " -msgstr "Durée en jours : " +msgstr "Durée de la règle : " #: src/lang.c:629 #, c-format @@ -2648,11 +2660,11 @@ msgstr "Afficher uniquement les groupes #: src/lang.c:636 msgid "Subject: line (ignore case) " -msgstr "Ligne Subject: (casse insensible)" +msgstr "l'en-tête 'Subject:' (ignorer la casse)" #: src/lang.c:637 msgid "Subject: line (case sensitive)" -msgstr "Ligne Subject: (casse sensible) " +msgstr "l'en-tête 'Subject:' (casse sensible)" #: src/lang.c:638 msgid "Save" @@ -2669,7 +2681,7 @@ msgstr "Enregistrer la configuration ava #: src/lang.c:641 msgid "Save filename> " -msgstr "Enregistrer sous le nom de fichier> " +msgstr "Enregistrer sous le nom de fichier > " #: src/lang.c:642 msgid "Saved" @@ -2751,16 +2763,17 @@ msgstr "Recherche article %d sur %d ('q' #: src/lang.c:658 msgid "Select article> " -msgstr "Sélectionner l'article> " +msgstr "Sélectionner l'article > " # TRANSLATION TOO LONG (75 chars max) #: src/lang.c:659 msgid "Select option number before text or use arrow keys and . 'q' to quit." -msgstr "Sélection n° avant le texte ou utiliser les flèches et . 'q' pour quitter." +msgstr "Choisir un numéro d'option ou utiliser les flèches puis . 'q' pour " + "quitter." #: src/lang.c:660 msgid "Select group> " -msgstr "Sélectionner le groupe> " +msgstr "Sélectionner le groupe > " #: src/lang.c:661 #, c-format @@ -2796,7 +2809,7 @@ msgstr "Démarrage : (%s)" #: src/lang.c:668 #, c-format msgid "List Thread (%d of %d)" -msgstr "Afficher le fil (%d sur %d)" +msgstr "Visualisation du fil (%d sur %d)" #: src/lang.c:669 #, c-format @@ -2805,7 +2818,7 @@ msgstr "Fil (%.*s)" #: src/lang.c:670 msgid "Enter wildcard subscribe pattern> " -msgstr "Entrer un caractère joker comme critère> " +msgstr "Entrer un caractère joker comme critère > " #: src/lang.c:671 #, c-format @@ -2828,7 +2841,7 @@ msgstr "Reposter ou remplacer le(s) arti #: src/lang.c:675 #, c-format msgid "Supersede article(s) to group(s) [%s]> " -msgstr "Remplacer le(s) article(s) du(es) groupe(s) [%s]> " +msgstr "Remplacer le(s) article(s) du(es) groupe(s) [%s] > " #: src/lang.c:676 msgid "Superseding article ..." @@ -2917,7 +2930,7 @@ msgstr "fil" #: src/lang.c:705 #, c-format msgid "Thread %4s of %4s" -msgstr "Fil %4s de %4s" +msgstr " Fil %4s sur %4s" #: src/lang.c:706 msgid "Threading articles..." @@ -2958,11 +2971,11 @@ msgstr " h=aide\n" #: src/lang.c:715 msgid "Unlimited" -msgstr "Illimité" +msgstr "Illimitée" #: src/lang.c:716 msgid "Enter wildcard unsubscribe pattern> " -msgstr "Terme joker pour se désabonner> " +msgstr "Terme joker pour se désabonner > " #: src/lang.c:717 #, c-format @@ -3018,7 +3031,7 @@ msgstr "Rafraîchissement" #: src/lang.c:728 #, c-format msgid "Opening %s\n" -msgstr "Ouverture %s\n" +msgstr "Ouverture de %s\n" #: src/lang.c:729 msgid "No more URL's in this article" @@ -3334,7 +3347,7 @@ msgstr "%d %s ajouté(s)" #: src/lang.c:802 msgid "No unsubscribed groups to show" -msgstr "Pas de groupes désabonnés à afficher" +msgstr "Aucuns groupes non abonnés à afficher" #: src/lang.c:803 msgid "Showing subscribed to groups only" @@ -3393,7 +3406,7 @@ msgid "Read carefully!\n" msgstr "Lisez ceci attentivement !\n" "\n" " Vous vous apprêtez à effacer un article qui fut apparemment écrit par " - "vous.Cela\n" + "vous. Cela\n" " effacera l'article sur de nombreux serveurs UseNet répartis sur el globe;\n" " La mojorité d'UseNet considère cela comme inapproprié, pour ne pas dire " "complètement.\n" @@ -3470,7 +3483,7 @@ msgid "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "\n" "Attention : \"%s\" n'est pas dans votre newsrc, votre article peut ne\n" - " apparaître dans ce groupe !\n" + " pas apparaître dans ce groupe !\n" "\n" #: src/lang.c:855 @@ -3525,7 +3538,7 @@ msgstr "Ajouter les clé(s) au cercle pub #: src/lang.c:876 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " -msgstr "%s=encodé, %s=signer, %s=les deux, %s=quitter : " +msgstr "%s=encoder, %s=signer, %s=les deux, %s=quitter : " #: src/lang.c:877 #, c-format @@ -3566,7 +3579,7 @@ msgstr "%s=quitter, %s=éditer, %s=pgp, % #: src/lang.c:887 msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " -msgstr "%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon [%%s]: " +msgstr "%s=quitter, %s=éditer, %s=pgp, %s=menu, %s=poster, %s=brouillon [%%s] : " #: src/lang.c:891 #, c-format @@ -3579,7 +3592,7 @@ msgstr "%s=quitter, %s=éditer, %s=ispell #: src/lang.c:893 msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " -msgstr "%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon [%%s]: " +msgstr "%s=quitter, %s=éditer, %s=ispell, %s=menu, %s=poster, %s=brouillon [%%s] : " #: src/lang.c:895 #, c-format @@ -3596,11 +3609,11 @@ msgstr "%s=quitter, %s=éditer, %s=menu, #: src/lang.c:906 msgid "Try cache_overview_files to speed up things.\n" -msgstr "" +msgstr "Activez 'cache_overview_files' pour accélérer les choses.\n" #: src/lang.c:907 msgid "Tin will use local index files instead.\n" -msgstr "" +msgstr "Tin utilisera à la place un index local.\n" #: src/lang.c:908 msgid "Cannot find NNTP server name" @@ -3664,7 +3677,7 @@ msgstr " -Q démarrage rapide. Ide #: src/lang.c:921 msgid " -l use only LIST instead of GROUP (-n) command" -msgstr " -l utilise seulement LIST plutôt que GROUP (n-)" +msgstr " -l utilise seulement LIST plutôt que GROUP (-n)" #: src/lang.c:922 msgid " -n only read subscribed .newsrc groups from NNTP server" @@ -3721,7 +3734,7 @@ msgstr " -n lire seulement groupe #: src/lang.c:945 msgid "Your server does not have Xref: in its NOV-files.\n" -msgstr "Votre serveur n'a pas d'Xref: dans son fichier NOV.\n" +msgstr "Votre serveur n'a pas d'Xref: dans ses fichiers NOV.\n" #: src/lang.c:949 msgid "Posting using external inews failed. Use built in inews instead?" @@ -3754,7 +3767,7 @@ msgstr "passer article/fil/sél./articles #: src/lang.c:966 msgid "No command" -msgstr "Pas de commande" +msgstr "Aucune commande" #: src/lang.c:967 msgid "Pipe" @@ -3763,7 +3776,7 @@ msgstr "Passer (pipe)" #: src/lang.c:968 #, c-format msgid "Pipe to command [%.*s]> " -msgstr "Passer à la commande [%.*s]> " +msgstr "Passer à la commande [%.*s] > " #: src/lang.c:969 msgid "Piping..." @@ -3864,7 +3877,7 @@ msgstr "Commande shell (%s)" #: src/lang.c:1009 #, c-format msgid "Enter shell command [%s]> " -msgstr "Commande shell [%s]> " +msgstr "Commande shell [%s] > " #: src/lang.c:1013 #, c-format @@ -3936,14 +3949,14 @@ msgstr "%s=mail; %s=quitter; %s=répondre #: src/lang.c:1047 msgid "Terminal does not support color" -msgstr "Terminal ne supporte pas les couleurs" +msgstr "Le terminal ne supporte pas les couleurs" #: src/lang.c:1052 #, c-format msgid "Trying %s" msgstr "Essai %s" -#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:297 +#: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 src/refs.c:296 msgid "None" msgstr "Aucun" @@ -3993,7 +4006,7 @@ msgstr "Max" #: src/lang.c:1102 msgid "Sum" -msgstr "Sum" +msgstr "Addition" #: src/lang.c:1103 msgid "Average" @@ -4149,27 +4162,27 @@ msgstr "Archive shell" #: src/lang.c:1200 msgid "Subject: (descending)" -msgstr "Sujet : (descendant)" +msgstr "Subject : (descendant)" #: src/lang.c:1201 msgid "Subject: (ascending)" -msgstr "Sujet : (ascendant)" +msgstr "Subject : (ascendant)" #: src/lang.c:1202 msgid "From: (descending)" -msgstr "De : (descendant)" +msgstr "From: (descendant)" #: src/lang.c:1203 msgid "From: (ascending)" -msgstr "De : (ascendant)" +msgstr "From: (ascendant)" #: src/lang.c:1204 msgid "Date: (descending)" -msgstr "Date : (descendant)" +msgstr "Date: (descendant)" #: src/lang.c:1205 msgid "Date: (ascending)" -msgstr "Date : (ascendant)" +msgstr "Date: (ascendant)" #: src/lang.c:1206 src/lang.c:1214 msgid "Score (descending)" @@ -4181,11 +4194,11 @@ msgstr "Score (ascendant)" #: src/lang.c:1208 msgid "Lines: (descending)" -msgstr "Lignes : (descendant)" +msgstr "Lines: (descendant)" #: src/lang.c:1209 msgid "Lines: (ascending)" -msgstr "Lignes : (ascendant)" +msgstr "Lines: (ascendant)" #: src/lang.c:1220 msgid "Always Keep" @@ -4246,31 +4259,31 @@ msgstr "Compr. les citations, citer les #: src/lang.c:1279 msgid "no" -msgstr "" +msgstr "non" #: src/lang.c:1280 msgid "with headers" -msgstr "" +msgstr "avec les en-têtes" #: src/lang.c:1281 msgid "without headers" -msgstr "" +msgstr "sans les en-têtes" #: src/lang.c:1288 src/lang.c:1294 msgid "NFKC" -msgstr "" +msgstr "NFKC" #: src/lang.c:1289 msgid "NFKD" -msgstr "" +msgstr "NFKD" #: src/lang.c:1290 msgid "NFC" -msgstr "" +msgstr "NFC" #: src/lang.c:1291 msgid "NFD" -msgstr "" +msgstr "NFD" #: src/lang.c:1302 msgid "Display Options" @@ -4312,13 +4325,13 @@ msgstr "Options de filtrage" #: src/lang.c:1963 src/lang.c:1969 src/lang.c:1983 src/lang.c:1995 src/lang.c:2029 #: src/lang.c:2081 src/lang.c:2088 src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 #: src/lang.c:2189 src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 -#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 src/lang.c:2350 msgid " toggles, sets, cancels." -msgstr " changer, régler, annuler." +msgstr " change, valide, annule." #: src/lang.c:1344 -msgid "Show mini menu & posting etiquette :" -msgstr "Afficher menu & intitulé du postage:" +msgid "Show mini menu & posting etiquette" +msgstr "Afficher menu & intitulé du postage" #: src/lang.c:1345 msgid "# If ON show a mini menu of useful commands at each level\n" @@ -4328,12 +4341,12 @@ msgstr "# Si ON affiche un mini menu des #: src/lang.c:1350 msgid "Show short description for each newsgroup. toggles & sets." -msgstr "Afficher une brève description pour chaque groupe. changer & " - "régler." +msgstr "Afficher une brève description pour chaque groupe. change & " + "valide." #: src/lang.c:1351 -msgid "Show description of each newsgroup :" -msgstr "Voir description de chaque groupe :" +msgid "Show description of each newsgroup" +msgstr "Voir description de chaque groupe" #: src/lang.c:1352 msgid "# If ON show group description text after newsgroup name at\n" @@ -4344,12 +4357,12 @@ msgstr "# Si ON affiche une description #: src/lang.c:1357 msgid "Show Subject & From (author) fields in group menu. toggles & " "sets." -msgstr "Afficher les champs Sujet & De (auteur) dans le menu groupe. change " - "& règle." +msgstr "Affiche le sujet & l'auteur dans le menu groupe. change & " + "valide." #: src/lang.c:1358 -msgid "In group menu, show author by :" -msgstr "Dans vue groupe, voir auteur par :" +msgid "In group menu, show author by" +msgstr "Dans vue groupe, voir auteur par" #: src/lang.c:1359 msgid "# Part of from field to display 0) none 1) address 2) full name 3) both\n" @@ -4358,19 +4371,19 @@ msgstr "# Partie du champ from à affiche #: src/lang.c:1363 msgid "Draw -> or highlighted bar for selection. toggles & sets." -msgstr "Afficher -> ou une ligne pour la sélection. change & règle." +msgstr "Affiche -> ou une barre de sélection. change & valide." #: src/lang.c:1364 -msgid "Draw -> instead of highlighted bar :" -msgstr "Afficher -> plutôt qu'une ligne :" +msgid "Draw -> instead of highlighted bar" +msgstr "Afficher -> plutôt qu'une barre" #: src/lang.c:1365 msgid "# If ON use -> otherwise highlighted bar for selection\n" msgstr "# Si ON utilise -> sinon barre en surbrillance pour la sélection\n" #: src/lang.c:1370 -msgid "Use inverse video for page headers :" -msgstr "Vidéo inversée pour les en-têtes :" +msgid "Use inverse video for page headers" +msgstr "Vidéo inversée pour les en-têtes" #: src/lang.c:1371 msgid "# If ON use inverse video for page headers at different levels\n" @@ -4378,30 +4391,30 @@ msgstr "# Si ON utilise la vidéo inversé "vues\n" #: src/lang.c:1376 -msgid "Thread articles by :" -msgstr "Regrouper les articles par :" +msgid "Thread articles by" +msgstr "Regrouper les articles par" #: src/lang.c:1377 msgid "# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n" "# 4=(Multipart Subject).\n" -msgstr "# Regrouper les articles sur 0=(rien) 1=(Sujet) 2=(Références) 3=(Les deux)\n" +msgstr "# Regrouper les articles par 0=(rien) 1=(Sujet) 2=(Références) 3=(Les deux)\n" "# 4=(Sujet multi-parties).\n" #: src/lang.c:1383 -msgid "Score of a thread :" -msgstr "Score d'un fil :" +msgid "Score of a thread" +msgstr "Score d'un fil" #: src/lang.c:1384 msgid "# Thread score 0=(Max) 1=(Sum) 2=(Average)\n" -msgstr "# Score d'un fil 0=(Max) 1=(Sum) 2=(Moyen)\n" +msgstr "# Score d'un fil 0=(Max) 1=(Addition) 2=(Moyenne)\n" #: src/lang.c:1388 msgid "Sort articles by Subject, From, Date or Score. toggles & sets." -msgstr "Trier les articles par Sujet, De, Date ou Score. change & règle." +msgstr "Trie les articles d'après un en-tête. change & valide." #: src/lang.c:1389 -msgid "Sort articles by :" -msgstr "Trier les articles par :" +msgid "Sort articles by" +msgstr "Trier les articles par" #: src/lang.c:1390 msgid "# Sort articles by 0=(nothing) 1=(Subject descend) 2=(Subject ascend)\n" @@ -4414,11 +4427,11 @@ msgstr "# Trie les article par 0=(rien) #: src/lang.c:1396 msgid "Sort threads by Nothing or Score. toggles & sets." -msgstr "Trier les fils par Rien ou Score. change & règle." +msgstr "Trier les fils par Rien ou Score. change & valide." #: src/lang.c:1397 -msgid "Sort threads by :" -msgstr "Trier les fils par :" +msgid "Sort threads by" +msgstr "Trier les fils par" #: src/lang.c:1398 msgid "# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n" @@ -4426,11 +4439,11 @@ msgstr "# Trie le fil par 0=(rien) 1=(Sc #: src/lang.c:1402 msgid "Put cursor at first/last unread art in groups. toggles & sets." -msgstr "Place le curseur sur le 1er article non lu. change & règle." +msgstr "Place le curseur sur le 1er article non lu. change & valide." #: src/lang.c:1403 -msgid "Goto first unread article in group :" -msgstr "Aller au 1er art. non lu du groupe :" +msgid "Goto first unread article in group" +msgstr "Aller au 1er art. non lu du groupe" #: src/lang.c:1404 msgid "# If ON put cursor at first unread art in group otherwise last art\n" @@ -4438,79 +4451,78 @@ msgstr "# Si ON place le curseur sur le #: src/lang.c:1408 msgid "Show all articles or only unread articles. toggles & sets." -msgstr "Affiche tous les articles ou seulement ceux non lus. change & " - "règle." +msgstr "Affiche tous les articles ou seulement ceux non lus. change & " + " valide." #: src/lang.c:1409 -msgid "Show only unread articles :" -msgstr "Afficher articles non lus seulement:" +msgid "Show only unread articles" +msgstr "Afficher articles non lus seulement" #: src/lang.c:1410 msgid "# If ON show only new/unread articles otherwise show all.\n" msgstr "# Si ON affiche seulement les articles non lus sinon les affiche tous.\n" #: src/lang.c:1415 -msgid "Show only groups with unread arts :" -msgstr "Voir groupes avec articles non lus :" +msgid "Show only groups with unread arts" +msgstr "Voir groupes avec articles non lus" #: src/lang.c:1416 msgid "# If ON show only subscribed to groups that contain unread articles.\n" msgstr "# Si ON affiche seulement les groupes ayant des articles non lus.\n" #: src/lang.c:1421 -msgid "Filter which articles :" -msgstr "Filtrer quel article :" +msgid "Filter which articles" +msgstr "Filtrer quel article" #: src/lang.c:1422 msgid "# 0=(Only kill unread articles)\n" "# 1=(Kill all articles and show in threads marked with K)\n" "# 2=(Kill all articles and never show them).\n" -msgstr "# 0=(Filtrer seulement les articles non lus)\n" +msgstr "# 0=(Filtrer uniquement les articles non lus)\n" "# 1=(Tout filtrer et les afficher dans les fils précédés d'un K)\n" "# 2=(Tout filtrer et ne pas les afficher)\n" #: src/lang.c:1429 -msgid "Tab goes to next unread article :" -msgstr "Tab va au prochain article non lu :" +msgid "Tab goes to next unread article" +msgstr "Tab va au prochain article non lu" #: src/lang.c:1430 msgid "# If ON the TAB command will go to next unread article at article viewer " "level\n" -msgstr "# Si ON TAB ira au prochain article non lu directement depuis le visualiseur " - "d'article\n" +msgstr "# Si ON la touche TAB ira au prochain article non lu directement depuis le " + "visualiseur d'article\n" #: src/lang.c:1434 msgid "Scrolling with past the end of an art. jumps to the next unread one." -msgstr "Défiler avec passera le fin d'un article et ira au prochain non lu." +msgstr "Naviguer avec ira au prochain non lu." #: src/lang.c:1435 -msgid "Space goes to next unread article :" -msgstr "Espace va au prochain art. non lu :" +msgid "Space goes to next unread article" +msgstr "Espace va au prochain art. non lu" #: src/lang.c:1436 msgid "# If ON the SPACE command will go to next unread article at article viewer\n" "# level when the end of the article is reached (rn-style pager)\n" msgstr "# Si ON ESPACE ira au prochain article non lu dans le visualiseur d'article\n" - "# lorsque la fin d'un article sera atteinte (page style rn)\n" + "# lorsque la fin d'un article sera atteinte (pager style rn)\n" #: src/lang.c:1441 msgid "Scrolling with / past the end of an art. jumps to the unread one." -msgstr "Défiler avec / passera la fin d'un article et ira au prochain non " - "lu." +msgstr "Naviguer avec / ira au prochain non lu." #: src/lang.c:1442 -msgid "PgDn goes to next unread article :" -msgstr "PgDn ira au prochain article non lu:" +msgid "PgDn goes to next unread article" +msgstr "PgDn va au prochain article non lu" #: src/lang.c:1443 msgid "# If ON the PGDN or DOWN command will go to next unread article when\n" "# pressed at end of message\n" -msgstr "# Si ON PGDN ou BAS ira au prochain article non lu lorsqu'elle sera\n" - "# utilisée à la fin d'un article.\n" +msgstr "# Si ON les touches PGDN ou BAS iront au prochain article non lu\n" + "# lorsque la fin d'un article sera atteinte\n" #: src/lang.c:1449 -msgid "List thread using right arrow key :" -msgstr "Lister le fil via la flèche droite :" +msgid "List thread using right arrow key" +msgstr "Lister le fil via la flèche droite" #: src/lang.c:1450 msgid "# If ON automatically list thread when entering it using right arrow key.\n" @@ -4519,11 +4531,11 @@ msgstr "# Si ON listera automatiquement #: src/lang.c:1454 msgid "Enter character to indicate deleted articles. sets, cancels." -msgstr "Caractère indiquant les articles effacés. règle, annule." +msgstr "Caractère indiquant les articles effacés. valide, annule." #: src/lang.c:1455 -msgid "Character to show deleted articles :" -msgstr "Caractère pour les articles effacés:" +msgid "Character to show deleted articles" +msgstr "Caractère pour articles effacés" #: src/lang.c:1456 msgid "# Character used to show that an art was deleted (default 'D')\n" @@ -4533,11 +4545,11 @@ msgstr "# Caractère utilisé pour indique #: src/lang.c:1461 msgid "Enter character to indicate articles in a range. sets, cancels." -msgstr "Caractère indiquant les articles inclus. règle, annule." +msgstr "Caractère indiquant les articles inclus. valide, annule." #: src/lang.c:1462 -msgid "Character to show inrange articles :" -msgstr "Caractère pour art. non inclus :" +msgid "Character to show inrange articles" +msgstr "Caractère pour art. non inclus" #: src/lang.c:1463 msgid "# Character used to show that an art is in a range (default '#')\n" @@ -4548,151 +4560,168 @@ msgstr "# Caractère utilisé pour indique #: src/lang.c:1468 msgid "Enter character to indicate that article will return. sets, " "cancels." -msgstr "" +msgstr "Caractère indiquant que l'article sera retourné. valide, " + "annule." #: src/lang.c:1469 -msgid "Character to show returning arts :" -msgstr "" +msgid "Character to show returning arts" +msgstr "Caractère pour articles retournés" #: src/lang.c:1470 msgid "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" -msgstr "" +msgstr "# Caractère utilisé pour indiquer qu'un article sera retourné (défaut '#')\n" + "# _ est transformé en ' '\n" #: src/lang.c:1475 msgid "Enter character to indicate selected articles. sets, cancels." -msgstr "" +msgstr "Caractère indiquant les articles sélectionnés. valide, annule." #: src/lang.c:1476 -msgid "Character to show selected articles:" -msgstr "" +msgid "Character to show selected articles" +msgstr "Caractère pour articles sélect." #: src/lang.c:1477 msgid "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" -msgstr "" +msgstr "# Caractère utilisé pour indiquer qu'un article fut sélectionné (defaut '*')\n" + "# _est transformé en ' '\n" #: src/lang.c:1482 msgid "Enter character to indicate recent articles. sets, cancels." -msgstr "" +msgstr "Caractère indiquant les articles récents. valide, annule." #: src/lang.c:1483 -msgid "Character to show recent articles :" -msgstr "" +msgid "Character to show recent articles" +msgstr "Caractère pour articles récents" #: src/lang.c:1484 msgid "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" -msgstr "" +msgstr "# Caractère utilisé pour indiquer qu'un article est récent (defaut 'o')\n" + "# _est transformé en ' '\n" #: src/lang.c:1489 msgid "Enter character to indicate unread articles. sets, cancels." -msgstr "" +msgstr "Caractère indiquant les articles non lus. valide, annule." #: src/lang.c:1490 -msgid "Character to show unread articles :" -msgstr "" +msgid "Character to show unread articles" +msgstr "Caractère pour articles non lus" #: src/lang.c:1491 msgid "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" -msgstr "" +msgstr "# Caractère utilisé pour indiquer qu'un article est non lu (defaut '+')\n" + "# _est transformé en ' '\n" #: src/lang.c:1496 msgid "Enter character to indicate read articles. sets, cancels." -msgstr "" +msgstr "Caractère indiquant les articles lus. valide, annule." #: src/lang.c:1497 -msgid "Character to show read articles :" -msgstr "" +msgid "Character to show read articles" +msgstr "Caractère pour articles lus" #: src/lang.c:1498 msgid "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" -msgstr "" +msgstr "# Caractère utilisé pour indiquer qu'un article a été lu (defaut ' ')\n" + "# _est transformé en ' '\n" #: src/lang.c:1503 msgid "Enter character to indicate killed articles. sets, cancels." -msgstr "" +msgstr "Caractère indiquant les articles filtrés. valide, annule." #: src/lang.c:1504 -msgid "Character to show killed articles :" -msgstr "" +msgid "Character to show killed articles" +msgstr "Caractère pour articles filtrés" #: src/lang.c:1505 msgid "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" -msgstr "" +msgstr "# Caractère utilisé pour indiquer qu'un article a été filtré (defaut 'K')\n" + "# kill_level doit être choisi en conséquence, _ est transformé en ' '\n" #: src/lang.c:1510 msgid "Enter character to indicate read selected articles. sets, cancels." -msgstr "" +msgstr "Caractère indiquant les articles lus et sélectionnés. valide, " + "annule." #: src/lang.c:1511 -msgid "Character to show readselected arts:" -msgstr "" +msgid "Character to show readselected arts" +msgstr "Caractère pour articles lus & sél." #: src/lang.c:1512 msgid "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" -msgstr "" +msgstr "# Caractère utilisé pour indiquer qu'un article était sélectionné avec d'être " + "lu (defaut ':')\n" + "# kill_level doit être choisi en conséquence, _ est transformé en ' '\n" #: src/lang.c:1517 msgid "Enter maximum length of newsgroup names displayed. sets." -msgstr "" +msgstr "Largeur max. à afficher des noms des groupes. valide." #: src/lang.c:1518 -msgid "Max. length of group names shown :" -msgstr "" +msgid "Max. length of group names shown" +msgstr "Largeur max. des noms des groupes" #: src/lang.c:1519 msgid "# Maximum length of the names of newsgroups displayed\n" -msgstr "" +msgstr "# Largeur maximum à afficher des noms des groupes.\n" #: src/lang.c:1524 -msgid "Show lines/score in listings :" -msgstr "" +msgid "Show lines/score in listings" +msgstr "Afficher dans les différentes vues" #: src/lang.c:1525 msgid "# What informations should be displayed in article/thread listing\n" "# 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n" -msgstr "" +msgstr "# Quelles informations doivent être affichées dans les vues article/fil\n" + "# 0 = rien, 1 = lignes, 2 = score, 3 = lignes & score\n" #: src/lang.c:1530 msgid "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" -msgstr "" +msgstr "0 = défilement page par page, -1 = afficher dernière ligne dans page " + "suivante, -2 = demi-page" #: src/lang.c:1531 -msgid "Number of lines to scroll in pager :" -msgstr "" +msgid "Number of lines to scroll in pager" +msgstr "Vitesse de défilement dans le pager" #: src/lang.c:1532 msgid "# Number of lines that cursor-up/down will scroll in article pager\n" "# eg, 1+ = line-by-line, 0 = page-by-page (traditional behavior),\n" "# -1 = the top/bottom line is carried over onto the next page,\n" "# -2 = half-page scrolling\n" -msgstr "" +msgstr "# Nombre de lignes passées lors du défilement d'un article dans le pager\n" + "# pe. 1+ = ligne par ligne, 0 = page par page (comportement par défaut),\n" + "# -1 = la dernière ligne sera affichée en haut de la page suivante,\n" + "# -2 = défilement par demi-page\n" #: src/lang.c:1539 msgid "Display signatures. toggles & sets." -msgstr "" +msgstr "Affiche les signatures. change & valide." #: src/lang.c:1540 -msgid "Display signatures :" -msgstr "Afficher les signatures :" +msgid "Display signatures" +msgstr "Afficher les signatures" #: src/lang.c:1541 msgid "# If OFF don't show signatures when displaying articles\n" -msgstr "" +msgstr "# Si OFF ne pas afficher les signatures lors de la visualisation\n" + "# des articles.\n" #: src/lang.c:1545 msgid "Display uuencoded data as tagged attachments. toggles & sets." -msgstr "" +msgstr "Afficher les archives uue comme PJ marquées. change & " + "valide." #: src/lang.c:1546 -msgid "Display uue data as an attachment :" -msgstr "Afficher donnée uue comme PJ :" +msgid "Display uue data as an attachment" +msgstr "Afficher donnée uue comme PJ" #: src/lang.c:1547 msgid "# Handling of uuencoded data in the pager\n" @@ -4701,28 +4730,38 @@ msgid "# Handling of uuencoded data in t "# size and filename, similar to how MIME attachments are displayed\n" "# 2 = as for 1, but any line that looks like uuencoded data will be folded\n" "# into a tag line.\n" -msgstr "" +msgstr "# Prise en charge des données uuencodées dans le pager\n" + "# 0 = affichage brut des données uuencodées\n" + "# 1 = les données uuencodées seront condensées en une seule ligne affichant\n" + "# la taille et le nom de fichier, similaire à l'affichage des " + "pièces-jointes\n" + "# MIME\n" + "# 2 = comme pour l'option 1, mais toute ligne qui ressemblera à une donnée " + "uuencodée\n" + "# sera placée dans une ligne marquée.\n" #: src/lang.c:1556 msgid "Decode German style TeX umlaut codes to ISO. toggles & sets." -msgstr "" +msgstr "Décode les umlauts Allemands de type TeX en ISO. change & " + "valide." #: src/lang.c:1557 -msgid "Display \"a as Umlaut-a :" -msgstr "" +msgid "Display \"a as Umlaut-a" +msgstr "Afficher \"a comme Umlaut-a" #: src/lang.c:1558 msgid "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" -msgstr "" +msgstr "# Si ON, convertit les umlauts Allemands de type TeX en codes ISO\n" + "# et affiche \"a comme Umlaut-a, etc.\n" #: src/lang.c:1563 src/lang.c:1573 msgid "Space separated list of header fields" -msgstr "" +msgstr "Liste des en-têtes, séparés par des espaces" #: src/lang.c:1564 -msgid "Display these header fields (or *) :" -msgstr "" +msgid "Display these header fields (or *)" +msgstr "Afficher ces en-têtes (ou *)" #: src/lang.c:1565 msgid "# Which news headers you wish to see. If you want to see _all_ the headers,\n" @@ -4731,11 +4770,18 @@ msgid "# Which news headers you wish to "# 'X-' (like X-Alan or X-Pape). You can list more than one by delimiting " "with\n" "# spaces. Not defining anything turns off this option.\n" -msgstr "" +msgstr "# Quels en-têtes voulez-vous voir. Si vous souhaitez voir _tout_ les " + "en-têtes,\n" + "# utilisez '*' comme valeur. C'est le seul moyen d'utiliser un caractère " + "joker ici.\n" + "# Si vous entrez 'X-' comme valeur, vous verrez tous les en-têtes commençant\n" + "# par 'X-' (comme X-Alan ou X-Pape). Vous pouvez afficher plusieurs en-têtes\n" + "# en les délimitant avec des espaces. Ne rien définir, désactive cette " + "option.\n" #: src/lang.c:1574 -msgid "Do not display these header fields :" -msgstr "" +msgid "Do not display these header fields" +msgstr "Ne pas afficher ces en-têtes" #: src/lang.c:1575 msgid "# Same as 'news_headers_to_display' except it denotes the opposite.\n" @@ -4746,167 +4792,212 @@ msgid "# Same as 'news_headers_to_displa "# news_headers_to_display=X-\n" "# news_headers_to_not_display=X-Alan X-Pape\n" "# Not defining anything turns off this option.\n" -msgstr "" +msgstr "# Comme l'option 'news_headers_to_display' excepté que là c'est le " + "contraire.\n" + "# Un exemple d'utilisation de ces deux options pourrait que vous trouviez " + "les\n" + "# en-têtes 'X-' intéressantes mais celles contenant 'Alan' et 'Pape' " + "inutiles...\n" + "# donc voici ce que vous pourriez alors faire :\n" + "# news_headers_to_display=X-\n" + "# news_headers_to_not_display=X-Alan X-Pape\n" + "# Ne rien définir, désactive cette option.\n" #: src/lang.c:1585 msgid "Do you want to enable automatic handling of multipart/alternative articles?" -msgstr "" +msgstr "Voulez-vous activer la prise en charge automatique des articles " + "multipart/alternative ?" #: src/lang.c:1586 -msgid "Skip multipart/alternative parts :" -msgstr "" +msgid "Skip multipart/alternative parts" +msgstr "Ignorer parties multipart/alter." #: src/lang.c:1587 msgid "# If ON strip multipart/alternative messages automatically\n" -msgstr "" +msgstr "# Si ON, enlève automatiquement les messages multipart/alternative\n" #: src/lang.c:1592 msgid "A regex used to decide which lines to show in col_quote." -msgstr "" +msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " + "col_quote." #: src/lang.c:1593 -msgid "Regex used to show quoted lines :" -msgstr "" +msgid "Regex used to show quoted lines" +msgstr "Regex pour afficher les citations" #: src/lang.c:1594 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin d'afficher les citations.\n" + "# Les citations sont affichées dans col_quote. Si vous laissez ce champ\n" + "# vide, tin utilisera une valeur incluse par défaut.\n" #: src/lang.c:1600 msgid "A regex used to decide which lines to show in col_quote2." -msgstr "" +msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " + "col_quote2." #: src/lang.c:1601 -msgid "Regex used to show twice quoted l. :" -msgstr "" +msgid "Regex used to show twice quoted l." +msgstr "Regex pour afficher le 2nd niveau" #: src/lang.c:1602 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin d'afficher les citations de\n" + "# second niveau. Ces citations sont affichées dans col_quote2. Si vous\n" + "# laissez ce champ vide, tin utilisera une valeur incluse par défaut.\n" #: src/lang.c:1608 msgid "A regex used to decide which lines to show in col_quote3." -msgstr "" +msgstr "Une expression régulière pour déterminer quelles lignes afficher dans " + "col_quote3." #: src/lang.c:1609 -msgid "Regex used to show >= 3 times q.l. :" -msgstr "" +msgid "Regex used to show >= 3 times q.l." +msgstr "Regex pour afficher niveau >= 3" #: src/lang.c:1610 msgid "# A regular expression that tin will use to decide which lines are\n" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin d'afficher les citations de\n" + "# troisième niveau et supérieur. Ces citations sont affichées dans " + "col_quote3.\n" + "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " + "défaut.\n" #: src/lang.c:1617 msgid "A regex used to decide which words to show in col_markslashes." -msgstr "" +msgstr "Une expression régulière pour déterminer quels mots afficher dans " + "col_markslashes." #: src/lang.c:1618 -msgid "Regex used to highlight /slashes/ :" -msgstr "" +msgid "Regex used to highlight /slashes/" +msgstr "Regex pour mots entre /slash/" #: src/lang.c:1619 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin d'afficher les mots\n" + "# placés entre des '/' dans col_markslashes.\n" + "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " + "défaut.\n" #: src/lang.c:1625 msgid "A regex used to decide which words to show in col_markstars." -msgstr "" +msgstr "Une expression régulière pour déterminer quels mots afficher dans " + "col_markstars." #: src/lang.c:1626 -msgid "Regex used to highlight *stars* :" -msgstr "" +msgid "Regex used to highlight *stars*" +msgstr "Regex pour mots entre *astérisques*" #: src/lang.c:1627 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin d'afficher les mots\n" + "# placés entre des '*' dans col_markstars.\n" + "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " + "défaut.\n" #: src/lang.c:1633 msgid "A regex used to decide which words to show in col_markstroke." -msgstr "" +msgstr "Une expression régulière pour déterminer quels mots afficher dans " + "col_markstroke." #: src/lang.c:1634 -msgid "Regex used to highlight -strokes- :" -msgstr "" +msgid "Regex used to highlight -strokes-" +msgstr "Regex pour mots entre -tirets-" #: src/lang.c:1635 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin d'afficher les mots\n" + "# placés entre des '-' dans col_markstroke.\n" + "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " + "défaut.\n" #: src/lang.c:1641 msgid "A regex used to decide which words to show in col_markdash." -msgstr "" +msgstr "Une expression régulière pour déterminer quels mots afficher dans " + "col_markdash." #: src/lang.c:1642 -msgid "Regex used to highlight _underline_:" -msgstr "" +msgid "Regex used to highlight _underline_" +msgstr "Regex pour mots entre _underscore_" #: src/lang.c:1643 msgid "# A regular expression that tin will use to decide which words\n" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin d'afficher les mots\n" + "# placés entre des '_' dans col_markdash.\n" + "# Si vous laissez ce champ vide, tin utilisera une valeur incluse par " + "défaut.\n" #: src/lang.c:1649 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." -msgstr "" +msgstr "Une expression régulière pour trouver les préfixes dans le sujet. '|' est un " + "séparateur." #: src/lang.c:1650 -msgid "Regex with Subject prefixes :" -msgstr "" +msgid "Regex with Subject prefixes" +msgstr "Regex pour les préfixes dans sujet" #: src/lang.c:1651 msgid "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin de trouver les préfixes\n" + "# dans le sujet et qui seront effacés avant d'afficher l'en-tête.\n" #: src/lang.c:1656 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." -msgstr "" +msgstr "Une expression régulière pour trouver les suffixes dans le sujet. '|' est un " + "séparateur." #: src/lang.c:1657 -msgid "Regex with Subject suffixes :" -msgstr "" +msgid "Regex with Subject suffixes" +msgstr "Regex pour les suffixes dans sujet" #: src/lang.c:1658 msgid "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" -msgstr "" +msgstr "# Une expression régulière qui permettra à tin de trouver les suffixes\n" + "# dans le sujet et qui seront effacés avant d'afficher l'en-tête.\n" #: src/lang.c:1663 msgid "Enter name and options for external MIME viewer, --internal for built-in " "viewer" -msgstr "" +msgstr "Nom et options pour le visualisateur MIME externe, --internal pour celui " + "inclus" #: src/lang.c:1664 -msgid "MIME binary content viewer :" -msgstr "" +msgid "MIME binary content viewer" +msgstr "Visualisateur de contenu MIME" #: src/lang.c:1665 msgid "# If --internal automatically use the built in MIME viewer for non-text\n" "# parts of articles.\n" "# Otherwise specify an external viewer program (eg, metamail) or leave blank\n" "# for no automatic viewing\n" -msgstr "" +msgstr "# Utilisation du visualisateur MIME inclus pour les parties non textuelles\n" + "# si l'option '--internal' est utilisée.\n" + "# Sinon, spécifiez un logiciel externe (pe. metamail) ou laissez ce champ\n" + "# vide pour ne pas activer la prévisualisation automatique.\n" #: src/lang.c:1672 msgid "Confirm before starting non-text viewing program" -msgstr "" +msgstr "Confirmation avant le lancement d'un visualisateur externe" #: src/lang.c:1673 -msgid "Ask before using MIME viewer :" -msgstr "" +msgid "Ask before using MIME viewer" +msgstr "Demander avant d'utiliser le visua." #: src/lang.c:1674 msgid "# If ON tin will ask before using metamail to display MIME messages\n" @@ -4918,7 +5009,7 @@ msgid "Ask to mark groups read when quit msgstr "" #: src/lang.c:1680 -msgid "Catchup read groups when quitting :" +msgid "Catchup read groups when quitting" msgstr "" #: src/lang.c:1681 @@ -4926,7 +5017,7 @@ msgid "# If ON ask user if read groups s msgstr "" #: src/lang.c:1686 -msgid "Catchup group using left key :" +msgid "Catchup group using left key" msgstr "" #: src/lang.c:1687 @@ -4934,11 +5025,11 @@ msgid "# If ON catchup group/thread when msgstr "" #: src/lang.c:1692 -msgid "Catchup thread by using left key :" +msgid "Catchup thread by using left key" msgstr "" #: src/lang.c:1698 -msgid "Which actions require confirmation :" +msgid "Which actions require confirmation" msgstr "" #: src/lang.c:1699 @@ -4946,7 +5037,7 @@ msgid "# What should we ask confirmation msgstr "" #: src/lang.c:1704 -msgid "'Mark article read' ignores tags :" +msgid "'Mark article read' ignores tags" msgstr "" #: src/lang.c:1705 @@ -4955,18 +5046,18 @@ msgstr "" #: src/lang.c:1709 msgid "Program to run to open URL's, sets, cancels." -msgstr "" +msgstr "Logiciel utilisé pour lancer les URLs, valide, annule." #: src/lang.c:1710 -msgid "Program that opens URL's :" -msgstr "" +msgid "Program that opens URL's" +msgstr "Logiciel lançant les URLs" #: src/lang.c:1711 msgid "# The program used to open URL's. The actual URL will be appended\n" msgstr "" #: src/lang.c:1716 -msgid "Use mouse in xterm :" +msgid "Use mouse in xterm" msgstr "" #: src/lang.c:1717 @@ -4974,7 +5065,7 @@ msgid "# If ON enable mouse key support msgstr "" #: src/lang.c:1723 -msgid "Use scroll keys on keypad :" +msgid "Use scroll keys on keypad" msgstr "" #: src/lang.c:1724 @@ -4986,7 +5077,7 @@ msgid "Enter maximum number of article t msgstr "" #: src/lang.c:1730 -msgid "Number of articles to get :" +msgid "Number of articles to get" msgstr "" #: src/lang.c:1731 @@ -4999,7 +5090,7 @@ msgid "Enter number of days article is c msgstr "" #: src/lang.c:1737 -msgid "Article recentness time limit :" +msgid "Article recentness time limit" msgstr "" #: src/lang.c:1738 @@ -5011,7 +5102,7 @@ msgid "WILDMAT for normal wildcards, REG msgstr "" #: src/lang.c:1743 -msgid "Wildcard matching :" +msgid "Wildcard matching" msgstr "" #: src/lang.c:1744 @@ -5023,7 +5114,7 @@ msgid "Enter minimal score before an art msgstr "" #: src/lang.c:1749 -msgid "Score limit (kill) :" +msgid "Score limit (kill)" msgstr "" #: src/lang.c:1750 @@ -5035,7 +5126,7 @@ msgid "Enter default score to kill artic msgstr "" #: src/lang.c:1755 -msgid "Default score to kill articles :" +msgid "Default score to kill articles" msgstr "" #: src/lang.c:1756 @@ -5047,7 +5138,7 @@ msgid "Enter minimal score before an art msgstr "" #: src/lang.c:1761 -msgid "Score limit (select) :" +msgid "Score limit (select)" msgstr "" #: src/lang.c:1762 @@ -5059,7 +5150,7 @@ msgid "Enter default score to select art msgstr "" #: src/lang.c:1767 -msgid "Default score to select articles :" +msgid "Default score to select articles" msgstr "" #: src/lang.c:1768 @@ -5067,7 +5158,7 @@ msgid "# Default score to select article msgstr "" #: src/lang.c:1774 -msgid "Use slrnface to show ''X-Face:''s :" +msgid "Use slrnface to show ''X-Face:''s" msgstr "" #: src/lang.c:1775 @@ -5076,7 +5167,7 @@ msgid "# If ON using slrnface(1) to inte msgstr "" #: src/lang.c:1783 -msgid "Use ANSI color :" +msgid "Use ANSI color" msgstr "" #: src/lang.c:1784 @@ -5084,7 +5175,7 @@ msgid "# If ON using ANSI-color\n" msgstr "" #: src/lang.c:1789 -msgid "Standard foreground color :" +msgid "Standard foreground color" msgstr "" #: src/lang.c:1790 @@ -5092,7 +5183,7 @@ msgid "# Standard foreground color\n" msgstr "" #: src/lang.c:1795 -msgid "Standard background color :" +msgid "Standard background color" msgstr "" #: src/lang.c:1796 @@ -5100,7 +5191,7 @@ msgid "# Standard-Background-Color\n" msgstr "" #: src/lang.c:1801 -msgid "Color for inverse text (background):" +msgid "Color for inverse text (background)" msgstr "" #: src/lang.c:1802 @@ -5108,7 +5199,7 @@ msgid "# Color of background for inverse msgstr "" #: src/lang.c:1807 -msgid "Color for inverse text (foreground):" +msgid "Color for inverse text (foreground)" msgstr "" #: src/lang.c:1808 @@ -5116,7 +5207,7 @@ msgid "# Color of foreground for inverse msgstr "" #: src/lang.c:1813 -msgid "Color of text lines :" +msgid "Color of text lines" msgstr "" #: src/lang.c:1814 @@ -5124,7 +5215,7 @@ msgid "# Color of text-lines\n" msgstr "" #: src/lang.c:1819 -msgid "Color of mini help menu :" +msgid "Color of mini help menu" msgstr "" #: src/lang.c:1820 @@ -5132,7 +5223,7 @@ msgid "# Color of mini help menu\n" msgstr "" #: src/lang.c:1825 -msgid "Color of help text :" +msgid "Color of help text" msgstr "" #: src/lang.c:1826 @@ -5140,7 +5231,7 @@ msgid "# Color of help pages\n" msgstr "" #: src/lang.c:1831 -msgid "Color of status messages :" +msgid "Color of status messages" msgstr "" #: src/lang.c:1832 @@ -5148,7 +5239,7 @@ msgid "# Color of messages in last line\ msgstr "" #: src/lang.c:1837 -msgid "Color of quoted lines :" +msgid "Color of quoted lines" msgstr "" #: src/lang.c:1838 @@ -5156,7 +5247,7 @@ msgid "# Color of quote-lines\n" msgstr "" #: src/lang.c:1843 -msgid "Color of twice quoted line :" +msgid "Color of twice quoted line" msgstr "" #: src/lang.c:1844 @@ -5164,7 +5255,7 @@ msgid "# Color of twice quoted lines\n" msgstr "" #: src/lang.c:1849 -msgid "Color of =>3 times quoted line :" +msgid "Color of =>3 times quoted line" msgstr "" #: src/lang.c:1850 @@ -5172,7 +5263,7 @@ msgid "# Color of >=3 times quoted lines msgstr "" #: src/lang.c:1855 -msgid "Color of article header lines :" +msgid "Color of article header lines" msgstr "" #: src/lang.c:1856 @@ -5180,7 +5271,7 @@ msgid "# Color of header-lines\n" msgstr "" #: src/lang.c:1861 -msgid "Color of actual news header fields :" +msgid "Color of actual news header fields" msgstr "" #: src/lang.c:1862 @@ -5188,7 +5279,7 @@ msgid "# Color of actual news header fie msgstr "" #: src/lang.c:1867 -msgid "Color of article subject lines :" +msgid "Color of article subject lines" msgstr "" #: src/lang.c:1868 @@ -5196,7 +5287,7 @@ msgid "# Color of article subject\n" msgstr "" #: src/lang.c:1873 -msgid "Color of response counter :" +msgid "Color of response counter" msgstr "" #: src/lang.c:1874 @@ -5204,7 +5295,7 @@ msgid "# Color of response counter\n" msgstr "" #: src/lang.c:1879 -msgid "Color of sender (From:) :" +msgid "Color of sender (From:)" msgstr "" #: src/lang.c:1880 @@ -5212,7 +5303,7 @@ msgid "# Color of sender (From:)\n" msgstr "" #: src/lang.c:1885 -msgid "Color of help/mail sign :" +msgid "Color of help/mail sign" msgstr "" #: src/lang.c:1886 @@ -5220,7 +5311,7 @@ msgid "# Color of Help/Mail-Sign\n" msgstr "" #: src/lang.c:1891 -msgid "Color of signatures :" +msgid "Color of signatures" msgstr "" #: src/lang.c:1892 @@ -5228,7 +5319,7 @@ msgid "# Color of signature\n" msgstr "" #: src/lang.c:1897 -msgid "Color of highlighted URLs :" +msgid "Color of highlighted URLs" msgstr "" #: src/lang.c:1898 @@ -5236,7 +5327,7 @@ msgid "# Color of highlighted URLs\n" msgstr "" #: src/lang.c:1903 -msgid "Color of highlighting with *stars* :" +msgid "Color of highlighting with *stars*" msgstr "" #: src/lang.c:1904 @@ -5245,19 +5336,19 @@ msgid "# Color of word highlighting. The msgstr "" #: src/lang.c:1910 -msgid "Color of highlighting with _dash_ :" +msgid "Color of highlighting with _dash_" msgstr "" #: src/lang.c:1916 -msgid "Color of highlighting with /slash/ :" +msgid "Color of highlighting with /slash/" msgstr "" #: src/lang.c:1922 -msgid "Color of highlighting with -stroke-:" +msgid "Color of highlighting with -stroke-" msgstr "" #: src/lang.c:1929 -msgid "Attr. of highlighting with *stars* :" +msgid "Attr. of highlighting with *stars*" msgstr "" #: src/lang.c:1930 @@ -5270,19 +5361,19 @@ msgid "# Attribute of word highlighting msgstr "" #: src/lang.c:1940 -msgid "Attr. of highlighting with _dash_ :" +msgid "Attr. of highlighting with _dash_" msgstr "" #: src/lang.c:1946 -msgid "Attr. of highlighting with /slash/ :" +msgid "Attr. of highlighting with /slash/" msgstr "" #: src/lang.c:1952 -msgid "Attr. of highlighting with -stroke-:" +msgid "Attr. of highlighting with -stroke-" msgstr "" #: src/lang.c:1958 -msgid "URL highlighting in message body :" +msgid "URL highlighting in message body" msgstr "" #: src/lang.c:1959 @@ -5290,7 +5381,7 @@ msgid "# Enable URL highlighting?\n" msgstr "" #: src/lang.c:1964 -msgid "Word highlighting in message body :" +msgid "Word highlighting in message body" msgstr "" #: src/lang.c:1965 @@ -5298,7 +5389,7 @@ msgid "# Enable word highlighting?\n" msgstr "" #: src/lang.c:1970 -msgid "What to display instead of mark :" +msgid "What to display instead of mark" msgstr "" #: src/lang.c:1971 @@ -5309,18 +5400,18 @@ msgstr "" #: src/lang.c:1977 msgid "Enter column number to wrap article lines to in the pager. sets." -msgstr "" +msgstr "Largeur du pager. valide." #: src/lang.c:1978 -msgid "Page line wrap column :" -msgstr "" +msgid "Page line wrap column" +msgstr "Largeur du pager" #: src/lang.c:1979 msgid "# Wrap article lines at column\n" msgstr "" #: src/lang.c:1984 -msgid "Wrap around threads on next unread :" +msgid "Wrap around threads on next unread" msgstr "" #: src/lang.c:1985 @@ -5332,7 +5423,7 @@ msgid "Enter default mail address (and f msgstr "" #: src/lang.c:1990 -msgid "Mail address (and fullname) :" +msgid "Mail address (and fullname)" msgstr "" #: src/lang.c:1991 @@ -5340,7 +5431,7 @@ msgid "# User's mail address (and fullna msgstr "" #: src/lang.c:1996 -msgid "Show empty Followup-To in editor :" +msgid "Show empty Followup-To in editor" msgstr "" #: src/lang.c:1997 @@ -5352,7 +5443,7 @@ msgid "Enter path/! command/--none to cr msgstr "" #: src/lang.c:2002 -msgid "Create signature from path/command :" +msgid "Create signature from path/command" msgstr "" #: src/lang.c:2003 @@ -5368,7 +5459,7 @@ msgid "Prepend signature with \"-- \" on msgstr "" #: src/lang.c:2011 -msgid "Prepend signature with \"-- \" :" +msgid "Prepend signature with \"-- \"" msgstr "" #: src/lang.c:2012 @@ -5380,7 +5471,7 @@ msgid "Add signature when reposting arti msgstr "" #: src/lang.c:2017 -msgid "Add signature when reposting :" +msgid "Add signature when reposting" msgstr "" #: src/lang.c:2018 @@ -5392,7 +5483,7 @@ msgid "Enter quotation marks, %s or %S f msgstr "" #: src/lang.c:2023 -msgid "Characters used as quote-marks :" +msgid "Characters used as quote-marks" msgstr "" #: src/lang.c:2024 @@ -5401,7 +5492,7 @@ msgid "# Characters used in quoting to f msgstr "" #: src/lang.c:2030 -msgid "Quoting behavior :" +msgid "Quoting behavior" msgstr "" #: src/lang.c:2031 @@ -5421,7 +5512,7 @@ msgid "%A Addr %D Date %F Addr+Name %G G msgstr "" #: src/lang.c:2044 -msgid "Quote line when following up :" +msgid "Quote line when following up" msgstr "" #: src/lang.c:2045 @@ -5431,11 +5522,11 @@ msgid "# Format of quote line when maili msgstr "" #: src/lang.c:2052 -msgid "Quote line when cross-posting :" +msgid "Quote line when cross-posting" msgstr "" #: src/lang.c:2058 -msgid "Quote line when mailing :" +msgid "Quote line when mailing" msgstr "" #: src/lang.c:2063 @@ -5443,19 +5534,19 @@ msgid "If ON, include User-Agent: header msgstr "" #: src/lang.c:2064 -msgid "Insert 'User-Agent:'-header :" -msgstr "" +msgid "Insert 'User-Agent:'-header" +msgstr "Insérer l'en-tête 'User-Agent'" #: src/lang.c:2065 msgid "# If ON include advertising User-Agent: header\n" -msgstr "" +msgstr "# Si ON inclus l'en-tête 'User-Agent:'\n" #: src/lang.c:2069 msgid "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" #: src/lang.c:2070 -msgid "MM_CHARSET :" +msgid "MM_CHARSET" msgstr "" #: src/lang.c:2071 @@ -5468,7 +5559,7 @@ msgid "# Charset supported locally which msgstr "" #: src/lang.c:2082 -msgid "MM_NETWORK_CHARSET :" +msgid "MM_NETWORK_CHARSET" msgstr "" #: src/lang.c:2083 @@ -5476,7 +5567,7 @@ msgid "# Charset used for MIME (Content- msgstr "" #: src/lang.c:2089 -msgid "Mailbox format :" +msgid "Mailbox format" msgstr "" #: src/lang.c:2090 @@ -5484,7 +5575,7 @@ msgid "# Format of the mailbox.\n" msgstr "" #: src/lang.c:2095 -msgid "MIME encoding in news messages :" +msgid "MIME encoding in news messages" msgstr "" #: src/lang.c:2096 @@ -5500,7 +5591,7 @@ msgid "Don't change unless you know what msgstr "" #: src/lang.c:2105 -msgid "Use 8bit characters in news headers:" +msgid "Use 8bit characters in news headers" msgstr "" #: src/lang.c:2106 @@ -5512,23 +5603,24 @@ msgstr "" #: src/lang.c:2113 msgid "Auto-view post-processed files toggles, sets, cancels." -msgstr "" +msgstr "Visualiser automatiquement les fichiers traités. change, " + "valide, annule." #: src/lang.c:2114 -msgid "View post-processed files :" -msgstr "" +msgid "View post-processed files" +msgstr "Voir les fichiers traités" #: src/lang.c:2115 msgid "# If set, post processed files will be opened in a viewer\n" -msgstr "" +msgstr "# Si actif, les fichiers traités seront ouverts\n" #: src/lang.c:2120 -msgid "MIME encoding in mail messages :" -msgstr "" +msgid "MIME encoding in mail messages" +msgstr "Encodage MIME pour les mails" #: src/lang.c:2126 -msgid "Use 8bit characters in mail headers:" -msgstr "" +msgid "Use 8bit characters in mail headers" +msgstr "Caractères 8bits dans en-têtes mail" #: src/lang.c:2127 msgid "# If ON, 8bit characters in mail headers are NOT encoded.\n" @@ -5541,60 +5633,67 @@ msgid "# If ON, 8bit characters in mail msgstr "" #: src/lang.c:2137 -msgid "Strip blanks from ends of lines :" -msgstr "" +msgid "Strip blanks from ends of lines" +msgstr "Nettoyer les fins de lignes" #: src/lang.c:2138 msgid "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" -msgstr "" +msgstr "# Si ON, enlève les blancs présents aux fins de lignes pour un affichage \n# plus " + "rapide sur les terminaux lents.\n" #: src/lang.c:2143 msgid "If ON, use transliteration. toggles & sets." -msgstr "" +msgstr "Si ON, utilise 'translit' pour iconv_open(3). change & " + "valide." #: src/lang.c:2144 -msgid "Transliteration :" -msgstr "" +msgid "Transliteration" +msgstr "Transliteration (conversion)" #: src/lang.c:2145 msgid "# If ON, use //TRANSLIT extension. This means that when a character cannot\n" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" -msgstr "" +msgstr "# Si ON, utilise l'extension //TRANSLIT. Cela veut dire que lorsqu'un\n" + "# caractère n'est pas disponible dans l'encodage choisi, il peut être\n" + "# remplacé par un ou plusieurs autres caractères similaires.\n" #: src/lang.c:2152 msgid "Send you a carbon copy automatically. toggles & sets." -msgstr "" +msgstr "Vous envoie automatiquement une copie. change & valide." #: src/lang.c:2153 -msgid "Send you a cc automatically :" -msgstr "" +msgid "Send you a cc automatically" +msgstr "Envoyer automatiquement une copie" #: src/lang.c:2154 msgid "# If ON automatically put your name in the Cc: field when mailing an article\n" -msgstr "" +msgstr "# Si ON, inclus automatiquement votre nom dans le champ Cc: lors d'un envoi " + "par mail d'un article.\n" #: src/lang.c:2158 msgid "Send you a blind carbon copy automatically. toggles & sets." -msgstr "" +msgstr "Vous envoie automatiquement une copie privée. change & " + "valide." #: src/lang.c:2159 -msgid "Send you a blind cc automatically :" -msgstr "" +msgid "Send you a blind cc automatically" +msgstr "Envoyer auto. d'une copie privée" #: src/lang.c:2160 msgid "# If ON automatically put your name in the Bcc: field when mailing an " "article\n" -msgstr "" +msgstr "# Si ON, inclus automatiquement votre nom dans le champ Bcc: lors d'un envoi " + "par mail d'un article.\n" #: src/lang.c:2164 msgid "Enter address elements about which you want to be warned. sets." -msgstr "" +msgstr "Être averti de ces éléments. valide." #: src/lang.c:2165 -msgid "Spamtrap warning address parts :" -msgstr "" +msgid "Spamtrap warning address parts" +msgstr "Pièges à spam dans les adresses" #: src/lang.c:2166 msgid "# A comma-delimited list of address-parts you want to be warned\n" @@ -5606,7 +5705,7 @@ msgid "Enter default number of days a fi msgstr "" #: src/lang.c:2172 -msgid "No. of days a filter entry is valid:" +msgid "No. of days a filter entry is valid" msgstr "" #: src/lang.c:2173 @@ -5618,7 +5717,7 @@ msgid "Add posted articles to filter. toggles & sets." -msgstr "Créer des copies locales des en-têtes NNTP. change & choisi." +msgstr "Créer des copies locales des en-têtes NNTP. change & valide." #: src/lang.c:2330 -msgid "Cache NNTP overview files locally :" -msgstr "Cache local des en-têtes NNTP :" +msgid "Cache NNTP overview files locally" +msgstr "Cache local des en-têtes NNTP" #: src/lang.c:2331 msgid "# If ON, create local copies of NNTP overview files.\n" @@ -5894,7 +5993,7 @@ msgid "Enter format string. sets, < msgstr "" #: src/lang.c:2336 -msgid "Format string for display of dates :" +msgid "Format string for display of dates" msgstr "" #: src/lang.c:2337 @@ -5902,7 +6001,7 @@ msgid "# Format string for date represen msgstr "" #: src/lang.c:2343 -msgid "Unicode normalization form :" +msgid "Unicode normalization form" msgstr "" #: src/lang.c:2344 @@ -5910,6 +6009,14 @@ msgid "# Unicode normalization form\n" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" +#: src/lang.c:2351 +msgid "Render BiDi" +msgstr "" + +#: src/lang.c:2352 +msgid "# If ON, bi-directional text is rendered by tin\n" +msgstr "" + #: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" @@ -5920,27 +6027,27 @@ msgstr "Version : %s release %s (\"%s\") msgid "Version: %s release %s (\"%s\")" msgstr "Version : %s release %s (\"%s\")" -#: src/newsrc.c:433 +#: src/newsrc.c:432 msgid "Unreachable?\n" msgstr "Inacessible ?\n" -#: src/nntplib.c:822 +#: src/nntplib.c:823 #, c-format msgid "\n" "Server timed out, trying reconnect # %d\n" msgstr "\n" "Connexion au serveur expirée, reconnexion # %d\n" -#: src/nntplib.c:840 +#: src/nntplib.c:841 msgid "Rejoin current group\n" msgstr "Rejoindre l'actuel groupe\n" -#: src/nntplib.c:847 +#: src/nntplib.c:848 #, c-format msgid "Read (%s)\n" msgstr "Lecture (%s)\n" -#: src/nntplib.c:849 +#: src/nntplib.c:850 #, c-format msgid "Resend last command (%s)\n" msgstr "Réenvoyer la dernière commande (%s)\n" @@ -5974,11 +6081,22 @@ msgstr "Purge\n" msgid "unchanged" msgstr "non changé" -#: src/refs.c:610 +#: src/refs.c:609 msgid "[- Unavailable -]" msgstr "[- Indisponible -]" -#: src/save.c:976 +#. +#. * preamble +#. * TODO: -> lang.c +#. +#: src/rfc2047.c:1203 +msgid "This message has been composed in the 'multipart/mixed' MIME-format. If you\n" + "are reading this prefix, your mail reader probably has not yet been modified\n" + "to understand the new format, and some of what follows may look strange.\n" + "\n" +msgstr "" + +#: src/save.c:967 msgid "bytes" msgstr "octets" Binary files tin-1.7.4/po/messages and tin-1.7.5/po/messages differ diff -Nurp tin-1.7.4/po/tin.pot tin-1.7.5/po/tin.pot --- tin-1.7.4/po/tin.pot 2004-02-25 10:33:55.000000000 +0100 +++ tin-1.7.5/po/tin.pot 2004-06-15 11:51:35.000000000 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2004-02-25 10:33+0100\n" +"POT-Creation-Date: 2004-06-04 13:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,223 +18,227 @@ msgstr "" msgid "%d Bad overview record (%d fields) '%s'" msgstr "" -#: src/attrib.c:585 +#: src/attrib.c:590 msgid "" "# Do not edit this comment block\n" "#\n" msgstr "" -#: src/attrib.c:586 +#: src/attrib.c:591 msgid "# scope=STRING (ie. alt.*,!alt.bin*) [mandatory]\n" msgstr "" -#: src/attrib.c:587 +#: src/attrib.c:592 msgid "# maildir=STRING (ie. ~/Mail)\n" msgstr "" -#: src/attrib.c:588 +#: src/attrib.c:593 msgid "# savedir=STRING (ie. ~user/News)\n" msgstr "" -#: src/attrib.c:589 +#: src/attrib.c:594 msgid "# savefile=STRING (ie. =linux)\n" msgstr "" -#: src/attrib.c:590 +#: src/attrib.c:595 msgid "# sigfile=STRING (ie. $var/sig)\n" msgstr "" -#: src/attrib.c:591 +#: src/attrib.c:596 msgid "# organization=STRING (if beginning with '/' read from file)\n" msgstr "" -#: src/attrib.c:592 +#: src/attrib.c:597 msgid "# followup_to=STRING\n" msgstr "" -#: src/attrib.c:593 +#: src/attrib.c:598 msgid "# mailing_list=STRING (ie. majordomo@example.org)\n" msgstr "" -#: src/attrib.c:594 +#: src/attrib.c:599 msgid "# x_headers=STRING (ie. ~/.tin/extra-headers)\n" msgstr "" -#: src/attrib.c:595 +#: src/attrib.c:600 msgid "# x_body=STRING (ie. ~/.tin/extra-body-text)\n" msgstr "" -#: src/attrib.c:596 +#: src/attrib.c:601 msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" msgstr "" -#: src/attrib.c:597 +#: src/attrib.c:602 msgid "# news_quote_format=STRING\n" msgstr "" -#: src/attrib.c:598 +#: src/attrib.c:603 msgid "# quote_chars=STRING (%%s, %%S for initials)\n" msgstr "" -#: src/attrib.c:599 +#: src/attrib.c:604 msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" msgstr "" -#: src/attrib.c:601 +#: src/attrib.c:606 msgid "# ispell=STRING\n" msgstr "" -#: src/attrib.c:603 +#: src/attrib.c:608 msgid "# auto_select=ON/OFF\n" msgstr "" -#: src/attrib.c:604 +#: src/attrib.c:609 msgid "# auto_save=ON/OFF\n" msgstr "" -#: src/attrib.c:605 +#: src/attrib.c:610 msgid "# batch_save=ON/OFF\n" msgstr "" -#: src/attrib.c:606 +#: src/attrib.c:611 msgid "# delete_tmp_files=ON/OFF\n" msgstr "" -#: src/attrib.c:607 +#: src/attrib.c:612 msgid "# show_only_unread=ON/OFF\n" msgstr "" -#: src/attrib.c:608 +#: src/attrib.c:613 msgid "# thread_arts=NUM" msgstr "" -#: src/attrib.c:615 +#: src/attrib.c:620 msgid "# show_author=NUM\n" msgstr "" -#: src/attrib.c:621 +#: src/attrib.c:626 msgid "# show_info=NUM\n" msgstr "" -#: src/attrib.c:627 +#: src/attrib.c:632 msgid "# sort_art_type=NUM\n" msgstr "" -#: src/attrib.c:645 +#: src/attrib.c:650 msgid "# sort_threads_type=NUM\n" msgstr "" -#: src/attrib.c:650 +#: src/attrib.c:655 msgid "# post_proc_type=NUM\n" msgstr "" -#: src/attrib.c:655 +#: src/attrib.c:660 msgid "# quick_kill_scope=STRING (ie. talk.*)\n" msgstr "" -#: src/attrib.c:656 +#: src/attrib.c:661 msgid "# quick_kill_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:657 +#: src/attrib.c:662 msgid "# quick_kill_case=ON/OFF\n" msgstr "" -#: src/attrib.c:658 +#: src/attrib.c:663 msgid "# quick_kill_header=NUM\n" msgstr "" -#: src/attrib.c:659 src/attrib.c:666 +#: src/attrib.c:664 src/attrib.c:671 msgid "# 0=subj (case sensitive) 1=subj (ignore case)\n" msgstr "" -#: src/attrib.c:660 src/attrib.c:667 +#: src/attrib.c:665 src/attrib.c:672 msgid "# 2=from (case sensitive) 3=from (ignore case)\n" msgstr "" -#: src/attrib.c:661 src/attrib.c:668 +#: src/attrib.c:666 src/attrib.c:673 msgid "# 4=msgid 5=lines\n" msgstr "" -#: src/attrib.c:662 +#: src/attrib.c:667 msgid "# quick_select_scope=STRING\n" msgstr "" -#: src/attrib.c:663 +#: src/attrib.c:668 msgid "# quick_select_expire=ON/OFF\n" msgstr "" -#: src/attrib.c:664 +#: src/attrib.c:669 msgid "# quick_select_case=ON/OFF\n" msgstr "" -#: src/attrib.c:665 +#: src/attrib.c:670 msgid "# quick_select_header=NUM\n" msgstr "" -#: src/attrib.c:669 +#: src/attrib.c:674 msgid "# x_comment_to=ON/OFF\n" msgstr "" -#: src/attrib.c:670 +#: src/attrib.c:675 msgid "# fcc=STRING (eg. =mailbox)\n" msgstr "" -#: src/attrib.c:671 +#: src/attrib.c:676 msgid "# tex2iso_conv=ON/OFF\n" msgstr "" -#: src/attrib.c:673 +#: src/attrib.c:677 +msgid "# mime_forward=ON/OFF\n" +msgstr "" + +#: src/attrib.c:679 msgid "# mm_network_charset=supported_charset" msgstr "" -#: src/attrib.c:680 +#: src/attrib.c:686 msgid "# undeclared_charset=STRING (default is US-ASCII)\n" msgstr "" -#: src/attrib.c:682 +#: src/attrib.c:688 msgid "" "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" -#: src/attrib.c:683 +#: src/attrib.c:689 msgid "" "# entries first followed by group specific entries.\n" "#\n" msgstr "" -#: src/attrib.c:684 +#: src/attrib.c:690 msgid "" "############################################################################" "\n" "\n" msgstr "" -#: src/attrib.c:690 +#: src/attrib.c:696 msgid "# include extra headers\n" msgstr "" -#: src/attrib.c:698 +#: src/attrib.c:704 msgid "# in *sources* set post process type to shar only\n" msgstr "" -#: src/attrib.c:702 +#: src/attrib.c:708 msgid "# in *binaries* do full post processing, remove tmp files\n" msgstr "" -#: src/attrib.c:703 +#: src/attrib.c:709 msgid "# and set Followup-To: poster\n" msgstr "" -#: src/cook.c:809 +#: src/cook.c:814 msgid "(unknown)" msgstr "" #. #. * TODO: add to the right rule, give better explanation, -> lang.c #. -#: src/filter.c:612 src/filter.c:620 +#: src/filter.c:600 src/filter.c:608 msgid "Removed from the previous rule: " msgstr "" @@ -884,7 +888,7 @@ msgstr "" msgid "Insecure permissions of %s (%o)" msgstr "" -#: src/lang.c:199 src/newsrc.c:410 +#: src/lang.c:199 #, c-format msgid "Invalid response to GROUP command, %s" msgstr "" @@ -3779,7 +3783,7 @@ msgid "Trying %s" msgstr "" #: src/lang.c:1066 src/lang.c:1091 src/lang.c:1107 src/lang.c:1286 -#: src/refs.c:297 +#: src/refs.c:296 msgid "None" msgstr "" @@ -4151,12 +4155,12 @@ msgstr "" #: src/lang.c:1995 src/lang.c:2029 src/lang.c:2081 src/lang.c:2088 #: src/lang.c:2094 src/lang.c:2119 src/lang.c:2136 src/lang.c:2189 #: src/lang.c:2222 src/lang.c:2242 src/lang.c:2277 src/lang.c:2286 -#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 +#: src/lang.c:2311 src/lang.c:2323 src/lang.c:2342 src/lang.c:2350 msgid " toggles, sets, cancels." msgstr "" #: src/lang.c:1344 -msgid "Show mini menu & posting etiquette :" +msgid "Show mini menu & posting etiquette" msgstr "" #: src/lang.c:1345 @@ -4170,7 +4174,7 @@ msgid "Show short description for each n msgstr "" #: src/lang.c:1351 -msgid "Show description of each newsgroup :" +msgid "Show description of each newsgroup" msgstr "" #: src/lang.c:1352 @@ -4186,7 +4190,7 @@ msgid "" msgstr "" #: src/lang.c:1358 -msgid "In group menu, show author by :" +msgid "In group menu, show author by" msgstr "" #: src/lang.c:1359 @@ -4199,7 +4203,7 @@ msgid "Draw -> or highlighted bar for se msgstr "" #: src/lang.c:1364 -msgid "Draw -> instead of highlighted bar :" +msgid "Draw -> instead of highlighted bar" msgstr "" #: src/lang.c:1365 @@ -4207,7 +4211,7 @@ msgid "# If ON use -> otherwise highligh msgstr "" #: src/lang.c:1370 -msgid "Use inverse video for page headers :" +msgid "Use inverse video for page headers" msgstr "" #: src/lang.c:1371 @@ -4215,7 +4219,7 @@ msgid "# If ON use inverse video for pag msgstr "" #: src/lang.c:1376 -msgid "Thread articles by :" +msgid "Thread articles by" msgstr "" #: src/lang.c:1377 @@ -4225,7 +4229,7 @@ msgid "" msgstr "" #: src/lang.c:1383 -msgid "Score of a thread :" +msgid "Score of a thread" msgstr "" #: src/lang.c:1384 @@ -4238,7 +4242,7 @@ msgid "" msgstr "" #: src/lang.c:1389 -msgid "Sort articles by :" +msgid "Sort articles by" msgstr "" #: src/lang.c:1390 @@ -4253,7 +4257,7 @@ msgid "Sort threads by Nothing or Score. msgstr "" #: src/lang.c:1397 -msgid "Sort threads by :" +msgid "Sort threads by" msgstr "" #: src/lang.c:1398 @@ -4266,7 +4270,7 @@ msgid "" msgstr "" #: src/lang.c:1403 -msgid "Goto first unread article in group :" +msgid "Goto first unread article in group" msgstr "" #: src/lang.c:1404 @@ -4278,7 +4282,7 @@ msgid "Show all articles or only unread msgstr "" #: src/lang.c:1409 -msgid "Show only unread articles :" +msgid "Show only unread articles" msgstr "" #: src/lang.c:1410 @@ -4286,7 +4290,7 @@ msgid "# If ON show only new/unread arti msgstr "" #: src/lang.c:1415 -msgid "Show only groups with unread arts :" +msgid "Show only groups with unread arts" msgstr "" #: src/lang.c:1416 @@ -4294,7 +4298,7 @@ msgid "# If ON show only subscribed to g msgstr "" #: src/lang.c:1421 -msgid "Filter which articles :" +msgid "Filter which articles" msgstr "" #: src/lang.c:1422 @@ -4305,7 +4309,7 @@ msgid "" msgstr "" #: src/lang.c:1429 -msgid "Tab goes to next unread article :" +msgid "Tab goes to next unread article" msgstr "" #: src/lang.c:1430 @@ -4320,7 +4324,7 @@ msgid "" msgstr "" #: src/lang.c:1435 -msgid "Space goes to next unread article :" +msgid "Space goes to next unread article" msgstr "" #: src/lang.c:1436 @@ -4335,7 +4339,7 @@ msgid "" msgstr "" #: src/lang.c:1442 -msgid "PgDn goes to next unread article :" +msgid "PgDn goes to next unread article" msgstr "" #: src/lang.c:1443 @@ -4345,7 +4349,7 @@ msgid "" msgstr "" #: src/lang.c:1449 -msgid "List thread using right arrow key :" +msgid "List thread using right arrow key" msgstr "" #: src/lang.c:1450 @@ -4358,7 +4362,7 @@ msgid "Enter character to indicate delet msgstr "" #: src/lang.c:1455 -msgid "Character to show deleted articles :" +msgid "Character to show deleted articles" msgstr "" #: src/lang.c:1456 @@ -4373,7 +4377,7 @@ msgid "" msgstr "" #: src/lang.c:1462 -msgid "Character to show inrange articles :" +msgid "Character to show inrange articles" msgstr "" #: src/lang.c:1463 @@ -4389,7 +4393,7 @@ msgid "" msgstr "" #: src/lang.c:1469 -msgid "Character to show returning arts :" +msgid "Character to show returning arts" msgstr "" #: src/lang.c:1470 @@ -4404,7 +4408,7 @@ msgid "" msgstr "" #: src/lang.c:1476 -msgid "Character to show selected articles:" +msgid "Character to show selected articles" msgstr "" #: src/lang.c:1477 @@ -4418,7 +4422,7 @@ msgid "Enter character to indicate recen msgstr "" #: src/lang.c:1483 -msgid "Character to show recent articles :" +msgid "Character to show recent articles" msgstr "" #: src/lang.c:1484 @@ -4432,7 +4436,7 @@ msgid "Enter character to indicate unrea msgstr "" #: src/lang.c:1490 -msgid "Character to show unread articles :" +msgid "Character to show unread articles" msgstr "" #: src/lang.c:1491 @@ -4446,7 +4450,7 @@ msgid "Enter character to indicate read msgstr "" #: src/lang.c:1497 -msgid "Character to show read articles :" +msgid "Character to show read articles" msgstr "" #: src/lang.c:1498 @@ -4460,7 +4464,7 @@ msgid "Enter character to indicate kille msgstr "" #: src/lang.c:1504 -msgid "Character to show killed articles :" +msgid "Character to show killed articles" msgstr "" #: src/lang.c:1505 @@ -4475,7 +4479,7 @@ msgid "" msgstr "" #: src/lang.c:1511 -msgid "Character to show readselected arts:" +msgid "Character to show readselected arts" msgstr "" #: src/lang.c:1512 @@ -4489,7 +4493,7 @@ msgid "Enter maximum length of newsgroup msgstr "" #: src/lang.c:1518 -msgid "Max. length of group names shown :" +msgid "Max. length of group names shown" msgstr "" #: src/lang.c:1519 @@ -4497,7 +4501,7 @@ msgid "# Maximum length of the names of msgstr "" #: src/lang.c:1524 -msgid "Show lines/score in listings :" +msgid "Show lines/score in listings" msgstr "" #: src/lang.c:1525 @@ -4513,7 +4517,7 @@ msgid "" msgstr "" #: src/lang.c:1531 -msgid "Number of lines to scroll in pager :" +msgid "Number of lines to scroll in pager" msgstr "" #: src/lang.c:1532 @@ -4529,7 +4533,7 @@ msgid "Display signatures. toggl msgstr "" #: src/lang.c:1540 -msgid "Display signatures :" +msgid "Display signatures" msgstr "" #: src/lang.c:1541 @@ -4542,7 +4546,7 @@ msgid "" msgstr "" #: src/lang.c:1546 -msgid "Display uue data as an attachment :" +msgid "Display uue data as an attachment" msgstr "" #: src/lang.c:1547 @@ -4561,7 +4565,7 @@ msgid "" msgstr "" #: src/lang.c:1557 -msgid "Display \"a as Umlaut-a :" +msgid "Display \"a as Umlaut-a" msgstr "" #: src/lang.c:1558 @@ -4575,7 +4579,7 @@ msgid "Space separated list of header fi msgstr "" #: src/lang.c:1564 -msgid "Display these header fields (or *) :" +msgid "Display these header fields (or *)" msgstr "" #: src/lang.c:1565 @@ -4589,7 +4593,7 @@ msgid "" msgstr "" #: src/lang.c:1574 -msgid "Do not display these header fields :" +msgid "Do not display these header fields" msgstr "" #: src/lang.c:1575 @@ -4610,7 +4614,7 @@ msgid "" msgstr "" #: src/lang.c:1586 -msgid "Skip multipart/alternative parts :" +msgid "Skip multipart/alternative parts" msgstr "" #: src/lang.c:1587 @@ -4622,7 +4626,7 @@ msgid "A regex used to decide which line msgstr "" #: src/lang.c:1593 -msgid "Regex used to show quoted lines :" +msgid "Regex used to show quoted lines" msgstr "" #: src/lang.c:1594 @@ -4637,7 +4641,7 @@ msgid "A regex used to decide which line msgstr "" #: src/lang.c:1601 -msgid "Regex used to show twice quoted l. :" +msgid "Regex used to show twice quoted l." msgstr "" #: src/lang.c:1602 @@ -4652,7 +4656,7 @@ msgid "A regex used to decide which line msgstr "" #: src/lang.c:1609 -msgid "Regex used to show >= 3 times q.l. :" +msgid "Regex used to show >= 3 times q.l." msgstr "" #: src/lang.c:1610 @@ -4667,7 +4671,7 @@ msgid "A regex used to decide which word msgstr "" #: src/lang.c:1618 -msgid "Regex used to highlight /slashes/ :" +msgid "Regex used to highlight /slashes/" msgstr "" #: src/lang.c:1619 @@ -4682,7 +4686,7 @@ msgid "A regex used to decide which word msgstr "" #: src/lang.c:1626 -msgid "Regex used to highlight *stars* :" +msgid "Regex used to highlight *stars*" msgstr "" #: src/lang.c:1627 @@ -4697,7 +4701,7 @@ msgid "A regex used to decide which word msgstr "" #: src/lang.c:1634 -msgid "Regex used to highlight -strokes- :" +msgid "Regex used to highlight -strokes-" msgstr "" #: src/lang.c:1635 @@ -4712,7 +4716,7 @@ msgid "A regex used to decide which word msgstr "" #: src/lang.c:1642 -msgid "Regex used to highlight _underline_:" +msgid "Regex used to highlight _underline_" msgstr "" #: src/lang.c:1643 @@ -4727,7 +4731,7 @@ msgid "A regex used to find Subject pref msgstr "" #: src/lang.c:1650 -msgid "Regex with Subject prefixes :" +msgid "Regex with Subject prefixes" msgstr "" #: src/lang.c:1651 @@ -4741,7 +4745,7 @@ msgid "A regex used to find Subject suff msgstr "" #: src/lang.c:1657 -msgid "Regex with Subject suffixes :" +msgid "Regex with Subject suffixes" msgstr "" #: src/lang.c:1658 @@ -4757,7 +4761,7 @@ msgid "" msgstr "" #: src/lang.c:1664 -msgid "MIME binary content viewer :" +msgid "MIME binary content viewer" msgstr "" #: src/lang.c:1665 @@ -4774,7 +4778,7 @@ msgid "Confirm before starting non-text msgstr "" #: src/lang.c:1673 -msgid "Ask before using MIME viewer :" +msgid "Ask before using MIME viewer" msgstr "" #: src/lang.c:1674 @@ -4788,7 +4792,7 @@ msgid "Ask to mark groups read when quit msgstr "" #: src/lang.c:1680 -msgid "Catchup read groups when quitting :" +msgid "Catchup read groups when quitting" msgstr "" #: src/lang.c:1681 @@ -4796,7 +4800,7 @@ msgid "# If ON ask user if read groups s msgstr "" #: src/lang.c:1686 -msgid "Catchup group using left key :" +msgid "Catchup group using left key" msgstr "" #: src/lang.c:1687 @@ -4804,11 +4808,11 @@ msgid "# If ON catchup group/thread when msgstr "" #: src/lang.c:1692 -msgid "Catchup thread by using left key :" +msgid "Catchup thread by using left key" msgstr "" #: src/lang.c:1698 -msgid "Which actions require confirmation :" +msgid "Which actions require confirmation" msgstr "" #: src/lang.c:1699 @@ -4816,7 +4820,7 @@ msgid "# What should we ask confirmation msgstr "" #: src/lang.c:1704 -msgid "'Mark article read' ignores tags :" +msgid "'Mark article read' ignores tags" msgstr "" #: src/lang.c:1705 @@ -4829,7 +4833,7 @@ msgid "Program to run to open URL's, 3 times quoted line :" +msgid "Color of =>3 times quoted line" msgstr "" #: src/lang.c:1850 @@ -5046,7 +5050,7 @@ msgid "# Color of >=3 times quoted lines msgstr "" #: src/lang.c:1855 -msgid "Color of article header lines :" +msgid "Color of article header lines" msgstr "" #: src/lang.c:1856 @@ -5054,7 +5058,7 @@ msgid "# Color of header-lines\n" msgstr "" #: src/lang.c:1861 -msgid "Color of actual news header fields :" +msgid "Color of actual news header fields" msgstr "" #: src/lang.c:1862 @@ -5062,7 +5066,7 @@ msgid "# Color of actual news header fie msgstr "" #: src/lang.c:1867 -msgid "Color of article subject lines :" +msgid "Color of article subject lines" msgstr "" #: src/lang.c:1868 @@ -5070,7 +5074,7 @@ msgid "# Color of article subject\n" msgstr "" #: src/lang.c:1873 -msgid "Color of response counter :" +msgid "Color of response counter" msgstr "" #: src/lang.c:1874 @@ -5078,7 +5082,7 @@ msgid "# Color of response counter\n" msgstr "" #: src/lang.c:1879 -msgid "Color of sender (From:) :" +msgid "Color of sender (From:)" msgstr "" #: src/lang.c:1880 @@ -5086,7 +5090,7 @@ msgid "# Color of sender (From:)\n" msgstr "" #: src/lang.c:1885 -msgid "Color of help/mail sign :" +msgid "Color of help/mail sign" msgstr "" #: src/lang.c:1886 @@ -5094,7 +5098,7 @@ msgid "# Color of Help/Mail-Sign\n" msgstr "" #: src/lang.c:1891 -msgid "Color of signatures :" +msgid "Color of signatures" msgstr "" #: src/lang.c:1892 @@ -5102,7 +5106,7 @@ msgid "# Color of signature\n" msgstr "" #: src/lang.c:1897 -msgid "Color of highlighted URLs :" +msgid "Color of highlighted URLs" msgstr "" #: src/lang.c:1898 @@ -5110,7 +5114,7 @@ msgid "# Color of highlighted URLs\n" msgstr "" #: src/lang.c:1903 -msgid "Color of highlighting with *stars* :" +msgid "Color of highlighting with *stars*" msgstr "" #: src/lang.c:1904 @@ -5120,19 +5124,19 @@ msgid "" msgstr "" #: src/lang.c:1910 -msgid "Color of highlighting with _dash_ :" +msgid "Color of highlighting with _dash_" msgstr "" #: src/lang.c:1916 -msgid "Color of highlighting with /slash/ :" +msgid "Color of highlighting with /slash/" msgstr "" #: src/lang.c:1922 -msgid "Color of highlighting with -stroke-:" +msgid "Color of highlighting with -stroke-" msgstr "" #: src/lang.c:1929 -msgid "Attr. of highlighting with *stars* :" +msgid "Attr. of highlighting with *stars*" msgstr "" #: src/lang.c:1930 @@ -5146,19 +5150,19 @@ msgid "" msgstr "" #: src/lang.c:1940 -msgid "Attr. of highlighting with _dash_ :" +msgid "Attr. of highlighting with _dash_" msgstr "" #: src/lang.c:1946 -msgid "Attr. of highlighting with /slash/ :" +msgid "Attr. of highlighting with /slash/" msgstr "" #: src/lang.c:1952 -msgid "Attr. of highlighting with -stroke-:" +msgid "Attr. of highlighting with -stroke-" msgstr "" #: src/lang.c:1958 -msgid "URL highlighting in message body :" +msgid "URL highlighting in message body" msgstr "" #: src/lang.c:1959 @@ -5166,7 +5170,7 @@ msgid "# Enable URL highlighting?\n" msgstr "" #: src/lang.c:1964 -msgid "Word highlighting in message body :" +msgid "Word highlighting in message body" msgstr "" #: src/lang.c:1965 @@ -5174,7 +5178,7 @@ msgid "# Enable word highlighting?\n" msgstr "" #: src/lang.c:1970 -msgid "What to display instead of mark :" +msgid "What to display instead of mark" msgstr "" #: src/lang.c:1971 @@ -5189,7 +5193,7 @@ msgid "Enter column number to wrap artic msgstr "" #: src/lang.c:1978 -msgid "Page line wrap column :" +msgid "Page line wrap column" msgstr "" #: src/lang.c:1979 @@ -5197,7 +5201,7 @@ msgid "# Wrap article lines at column\n" msgstr "" #: src/lang.c:1984 -msgid "Wrap around threads on next unread :" +msgid "Wrap around threads on next unread" msgstr "" #: src/lang.c:1985 @@ -5209,7 +5213,7 @@ msgid "Enter default mail address (and f msgstr "" #: src/lang.c:1990 -msgid "Mail address (and fullname) :" +msgid "Mail address (and fullname)" msgstr "" #: src/lang.c:1991 @@ -5217,7 +5221,7 @@ msgid "# User's mail address (and fullna msgstr "" #: src/lang.c:1996 -msgid "Show empty Followup-To in editor :" +msgid "Show empty Followup-To in editor" msgstr "" #: src/lang.c:1997 @@ -5230,7 +5234,7 @@ msgid "" msgstr "" #: src/lang.c:2002 -msgid "Create signature from path/command :" +msgid "Create signature from path/command" msgstr "" #: src/lang.c:2003 @@ -5248,7 +5252,7 @@ msgid "" msgstr "" #: src/lang.c:2011 -msgid "Prepend signature with \"-- \" :" +msgid "Prepend signature with \"-- \"" msgstr "" #: src/lang.c:2012 @@ -5260,7 +5264,7 @@ msgid "Add signature when reposting arti msgstr "" #: src/lang.c:2017 -msgid "Add signature when reposting :" +msgid "Add signature when reposting" msgstr "" #: src/lang.c:2018 @@ -5272,7 +5276,7 @@ msgid "Enter quotation marks, %s or %S f msgstr "" #: src/lang.c:2023 -msgid "Characters used as quote-marks :" +msgid "Characters used as quote-marks" msgstr "" #: src/lang.c:2024 @@ -5282,7 +5286,7 @@ msgid "" msgstr "" #: src/lang.c:2030 -msgid "Quoting behavior :" +msgid "Quoting behavior" msgstr "" #: src/lang.c:2031 @@ -5304,7 +5308,7 @@ msgid "" msgstr "" #: src/lang.c:2044 -msgid "Quote line when following up :" +msgid "Quote line when following up" msgstr "" #: src/lang.c:2045 @@ -5315,11 +5319,11 @@ msgid "" msgstr "" #: src/lang.c:2052 -msgid "Quote line when cross-posting :" +msgid "Quote line when cross-posting" msgstr "" #: src/lang.c:2058 -msgid "Quote line when mailing :" +msgid "Quote line when mailing" msgstr "" #: src/lang.c:2063 @@ -5327,7 +5331,7 @@ msgid "If ON, include User-Agent: header msgstr "" #: src/lang.c:2064 -msgid "Insert 'User-Agent:'-header :" +msgid "Insert 'User-Agent:'-header" msgstr "" #: src/lang.c:2065 @@ -5340,7 +5344,7 @@ msgid "" msgstr "" #: src/lang.c:2070 -msgid "MM_CHARSET :" +msgid "MM_CHARSET" msgstr "" #: src/lang.c:2071 @@ -5354,7 +5358,7 @@ msgid "" msgstr "" #: src/lang.c:2082 -msgid "MM_NETWORK_CHARSET :" +msgid "MM_NETWORK_CHARSET" msgstr "" #: src/lang.c:2083 @@ -5362,7 +5366,7 @@ msgid "# Charset used for MIME (Content- msgstr "" #: src/lang.c:2089 -msgid "Mailbox format :" +msgid "Mailbox format" msgstr "" #: src/lang.c:2090 @@ -5370,7 +5374,7 @@ msgid "# Format of the mailbox.\n" msgstr "" #: src/lang.c:2095 -msgid "MIME encoding in news messages :" +msgid "MIME encoding in news messages" msgstr "" #: src/lang.c:2096 @@ -5387,7 +5391,7 @@ msgid "Don't change unless you know what msgstr "" #: src/lang.c:2105 -msgid "Use 8bit characters in news headers:" +msgid "Use 8bit characters in news headers" msgstr "" #: src/lang.c:2106 @@ -5404,7 +5408,7 @@ msgid "" msgstr "" #: src/lang.c:2114 -msgid "View post-processed files :" +msgid "View post-processed files" msgstr "" #: src/lang.c:2115 @@ -5412,11 +5416,11 @@ msgid "# If set, post processed files wi msgstr "" #: src/lang.c:2120 -msgid "MIME encoding in mail messages :" +msgid "MIME encoding in mail messages" msgstr "" #: src/lang.c:2126 -msgid "Use 8bit characters in mail headers:" +msgid "Use 8bit characters in mail headers" msgstr "" #: src/lang.c:2127 @@ -5431,7 +5435,7 @@ msgid "" msgstr "" #: src/lang.c:2137 -msgid "Strip blanks from ends of lines :" +msgid "Strip blanks from ends of lines" msgstr "" #: src/lang.c:2138 @@ -5445,7 +5449,7 @@ msgid "If ON, use transliteration. sets, < msgstr "" #: src/lang.c:2336 -msgid "Format string for display of dates :" +msgid "Format string for display of dates" msgstr "" #: src/lang.c:2337 @@ -5826,7 +5830,7 @@ msgid "# Format string for date represen msgstr "" #: src/lang.c:2343 -msgid "Unicode normalization form :" +msgid "Unicode normalization form" msgstr "" #: src/lang.c:2344 @@ -5835,6 +5839,14 @@ msgid "" "# 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n" msgstr "" +#: src/lang.c:2351 +msgid "Render BiDi" +msgstr "" + +#: src/lang.c:2352 +msgid "# If ON, bi-directional text is rendered by tin\n" +msgstr "" + #: src/main.c:590 #, c-format msgid "Version: %s release %s (\"%s\") %s %s" @@ -5845,27 +5857,27 @@ msgstr "" msgid "Version: %s release %s (\"%s\")" msgstr "" -#: src/newsrc.c:433 +#: src/newsrc.c:432 msgid "Unreachable?\n" msgstr "" -#: src/nntplib.c:822 +#: src/nntplib.c:823 #, c-format msgid "" "\n" "Server timed out, trying reconnect # %d\n" msgstr "" -#: src/nntplib.c:840 +#: src/nntplib.c:841 msgid "Rejoin current group\n" msgstr "" -#: src/nntplib.c:847 +#: src/nntplib.c:848 #, c-format msgid "Read (%s)\n" msgstr "" -#: src/nntplib.c:849 +#: src/nntplib.c:850 #, c-format msgid "Resend last command (%s)\n" msgstr "" @@ -5899,11 +5911,24 @@ msgstr "" msgid "unchanged" msgstr "" -#: src/refs.c:610 +#: src/refs.c:609 msgid "[- Unavailable -]" msgstr "" -#: src/save.c:976 +#. +#. * preamble +#. * TODO: -> lang.c +#. +#: src/rfc2047.c:1203 +msgid "" +"This message has been composed in the 'multipart/mixed' MIME-format. If you\n" +"are reading this prefix, your mail reader probably has not yet been " +"modified\n" +"to understand the new format, and some of what follows may look strange.\n" +"\n" +msgstr "" + +#: src/save.c:967 msgid "bytes" msgstr "" diff -Nurp tin-1.7.4/src/active.c tin-1.7.5/src/active.c --- tin-1.7.4/src/active.c 2003-12-28 15:15:23.000000000 +0100 +++ tin-1.7.5/src/active.c 2004-03-16 15:55:08.000000000 +0100 @@ -3,7 +3,7 @@ * Module : active.c * Author : I. Lea * Created : 1992-02-16 - * Updated : 2003-09-24 + * Updated : 2004-03-16 * Notes : * * Copyright (c) 1992-2004 Iain Lea @@ -121,7 +121,6 @@ resync_active_file( toggle_my_groups(old_group); FreeAndNull(old_group); - set_groupname_len(FALSE); show_selection_page(); return TRUE; @@ -461,7 +460,7 @@ static void read_active_file( void) { - FILE *fp = (FILE *) 0; + FILE *fp = NULL; char *ptr; char moderated[PATH_LEN]; long count = -1L, min = 1L, max = 0L; @@ -547,7 +546,7 @@ void read_news_active_file( void) { - FILE *fp = 0; + FILE *fp = NULL; /* * Ignore -n if no .newsrc can be found or .newsrc is empty @@ -797,7 +796,7 @@ match_group_list( * find end/length of this entry */ separator = strchr(group_list, ','); - group_len = ((separator == NULL) ? list_len : (size_t) (separator - group_list)); + group_len = MIN(((separator == NULL) ? list_len : (size_t) (separator - group_list)), sizeof(pattern) - 1); if ((negate = ('!' == *group_list))) { /* diff -Nurp tin-1.7.4/src/art.c tin-1.7.5/src/art.c --- tin-1.7.4/src/art.c 2003-12-28 15:15:32.000000000 +0100 +++ tin-1.7.5/src/art.c 2004-05-30 13:30:31.000000000 +0200 @@ -3,7 +3,7 @@ * Module : art.c * Author : I.Lea & R.Skrenta * Created : 1991-04-01 - * Updated : 2003-12-28 + * Updated : 2004-05-27 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -541,12 +541,11 @@ open_art_header( *next = atoi(buf); /* Set next art number */ return NULL; - } else -#endif /* NNTP_ABLE */ - { - snprintf(buf, sizeof(buf), "%ld", art); - return (fopen(buf, "r")); } +#endif /* NNTP_ABLE */ + + snprintf(buf, sizeof(buf), "%ld", art); + return (fopen(buf, "r")); } @@ -759,8 +758,8 @@ global_look_for_multipart_info( char stop, int *offset) { - char *subj = (char *) 0; - char *pch = (char *) 0; + char *subj; + char *pch; MultiPartInfo tmp; *offset = 0; @@ -815,7 +814,7 @@ global_get_multiparts( int aindex, MultiPartInfo **malloc_and_setme_info) { - int i = 0; + int i; int part_index; MultiPartInfo tmp, tmp2; MultiPartInfo *info = 0; @@ -1368,7 +1367,8 @@ read_overview( 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)); + /* buffer_to_ascii() is correct but might confuse too many ppl. */ + art->subject = hash_str(eat_re(eat_tab(rfc1522_decode(/*buffer_to_ascii(*/ptr/*)*/)), FALSE)); break; case 2: /* From */ @@ -1376,7 +1376,7 @@ read_overview( art->from = hash_str(art_from_addr); if (*art_full_name) - art->name = hash_str(eat_tab(rfc1522_decode(art_full_name))); + art->name = hash_str(eat_tab(rfc1522_decode(buffer_to_ascii(art_full_name)))); break; case 3: /* Date */ @@ -2010,6 +2010,7 @@ set_article( art->tagged = FALSE; art->thread = ART_EXPIRED; art->prev = ART_NORMAL; + art->score = 0; art->status = ART_UNREAD; art->killed = ART_NOTKILLED; art->zombie = FALSE; @@ -2125,7 +2126,7 @@ open_xover_fp( snprintf(line, sizeof(line), "%s %ld-%ld", xover_cmd, min, max); return (nntp_command(line, OK_XOVER, NULL, 0)); - } else + } #endif /* NNTP_ABLE */ { FILE *fp; @@ -2138,6 +2139,6 @@ open_xover_fp( if (*mode != 'r') error_message(_(txt_cannot_open), nov_file); } - return NULL; } + return NULL; } diff -Nurp tin-1.7.4/src/attrib.c tin-1.7.5/src/attrib.c --- tin-1.7.4/src/attrib.c 2003-12-28 15:15:42.000000000 +0100 +++ tin-1.7.5/src/attrib.c 2004-03-14 15:43:08.000000000 +0100 @@ -3,7 +3,7 @@ * Module : attrib.c * Author : I. Lea * Created : 1993-12-01 - * Updated : 2003-12-19 + * Updated : 2004-03-14 * Notes : Group attribute routines * * Copyright (c) 1993-2004 Iain Lea @@ -86,6 +86,7 @@ enum { ATTRIB_NEWS_QUOTE, ATTRIB_QUOTE_CHARS, ATTRIB_MIME_TYPES_TO_SAVE, + ATTRIB_MIME_FORWARD, #ifdef HAVE_ISPELL ATTRIB_ISPELL, #endif /* HAVE_ISPELL */ @@ -161,8 +162,9 @@ set_default_attributes( attributes->delete_tmp_files = FALSE; attributes->post_proc_type = tinrc.post_process; attributes->x_comment_to = FALSE; - attributes->fcc = (char *) 0; attributes->tex2iso_conv = tinrc.tex2iso_conv; + attributes->mime_forward = FALSE; + attributes->fcc = (char *) 0; #ifdef CHARSET_CONVERSION attributes->mm_network_charset = tinrc.mm_network_charset; attributes->undeclared_charset = (char *) 0; @@ -291,6 +293,7 @@ read_attributes_file( case 'm': MATCH_STRING("maildir=", ATTRIB_MAILDIR); MATCH_STRING("mailing_list=", ATTRIB_MAILING_LIST); + MATCH_BOOLEAN("mime_forward=", ATTRIB_MIME_FORWARD); MATCH_STRING("mime_types_to_save=", ATTRIB_MIME_TYPES_TO_SAVE); #ifdef CHARSET_CONVERSION MATCH_LIST("mm_network_charset=", ATTRIB_MM_NETWORK_CHARSET,txt_mime_charsets, NUM_MIME_CHARSETS); @@ -537,6 +540,8 @@ do_set_attrib( case ATTRIB_MIME_TYPES_TO_SAVE: FreeIfNeeded(group->attribute->mime_types_to_save); SET_STRING(mime_types_to_save); + case ATTRIB_MIME_FORWARD: + SET_INTEGER(mime_forward); #ifdef HAVE_ISPELL case ATTRIB_ISPELL: FreeIfNeeded(group->attribute->ispell); @@ -669,6 +674,7 @@ write_attributes_file( fprintf(fp, _("# x_comment_to=ON/OFF\n")); fprintf(fp, _("# fcc=STRING (eg. =mailbox)\n")); fprintf(fp, _("# tex2iso_conv=ON/OFF\n")); + fprintf(fp, _("# mime_forward=ON/OFF\n")); #ifdef CHARSET_CONVERSION fprintf(fp, _("# mm_network_charset=supported_charset")); for (i = 0; i < NUM_MIME_CHARSETS; i++) { @@ -777,6 +783,7 @@ write_attributes_file( fprintf(fp, "x_comment_to=%s\n", print_boolean(attr->x_comment_to)); fprintf(fp, "fcc=%s\n", attr->fcc); fprintf(fp, "tex2iso_conv=%s\n", print_boolean(attr->tex2iso_conv)); + fprintf(fp, "mime_forward=%s\n", print_boolean(attr->mime_forward)); # ifdef CHARSET_CONVERSION fprintf(fp, "mm_network_charset=%s\n", txt_mime_charsets[attr->mm_network_charset]); fprintf(fp, "undeclared_charset=%s\n", attr->undeclared_charset); @@ -868,6 +875,7 @@ dump_attributes( fprintf(stderr, "\tx_comment_to=%s\n", print_boolean(group->attribute->x_comment_to)); fprintf(stderr, "\tfcc=%s\n", group->attribute->fcc); fprintf(stderr, "\ttex2iso_conv=%s\n", print_boolean(group->attribute->tex2iso_conv)); + fprintf(stderr, "\tmime_forward=%s\n", print_boolean(group->attribute->mime_forward)); # ifdef CHARSET_CONVERSION fprintf(stderr, "\tmm_network_charset=%s\n", txt_mime_charsets[group->attribute->mm_network_charset]); fprintf(stderr, "\tundeclared_charset=%s\n", group->attribute->undeclared_charset); diff -Nurp tin-1.7.4/src/charset.c tin-1.7.5/src/charset.c --- tin-1.7.4/src/charset.c 2003-12-28 15:16:24.000000000 +0100 +++ tin-1.7.5/src/charset.c 2004-06-07 12:17:52.000000000 +0200 @@ -3,7 +3,7 @@ * Module : charset.c * Author : M. Kuhn, T. Burmester * Created : 1993-12-10 - * Updated : 2003-03-22 + * Updated : 2004-06-07 * Notes : ISO to ascii charset conversion routines * * Copyright (c) 1993-2004 Markus Kuhn @@ -379,20 +379,19 @@ convert_to_printable( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) char *buffer; wchar_t *wbuffer; - size_t len = strlen(buf); + size_t len = strlen(buf) + 1; - buffer = my_malloc(len + 1); - wbuffer = my_malloc(sizeof(wchar_t) * (len + 1)); - - if (mbstowcs(wbuffer, buf, len) != (size_t) (-1)) { - wbuffer[len] = (wchar_t) '\0'; + if ((wbuffer = char2wchar_t(buf)) != NULL) { wconvert_to_printable(wbuffer); - wcstombs(buffer, wbuffer, len); - buffer[len] = '\0'; - strcpy(buf, (const char *) buffer); + + if ((buffer = wchar_t2char(wbuffer)) != NULL) { + strncpy(buf, buffer, len); + buf[len - 1] = '\0'; + + free(buffer); + } + free(wbuffer); } - free(buffer); - free(wbuffer); #else unsigned char *c; @@ -443,23 +442,21 @@ convert_body2printable( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) char *buffer; wchar_t *wc, *wbuffer; - size_t len = strlen(buf); + size_t len = strlen(buf) + 1; - buffer = my_malloc(len + 1); - wbuffer = my_malloc(sizeof(wchar_t) * (len + 1)); - - if (mbstowcs(wbuffer, buf, len) != (size_t) (-1)) { - wbuffer[len] = (wchar_t) '\0'; + if ((wbuffer = char2wchar_t(buf)) != NULL) { for (wc = wbuffer; *wc; wc++) { if (!(iswprint((wint_t) *wc) || *wc == (wchar_t) 8 || *wc == (wchar_t) 9 || *wc == (wchar_t) 10 || *wc == (wchar_t) 12 || *wc == (wchar_t) 13 || (IS_LOCAL_CHARSET("Big5") && *wc == (wchar_t) 27))) *wc = (wchar_t) '?'; } - wcstombs(buffer, wbuffer, len); - buffer[len] = '\0'; - strcpy(buf, (const char *) buffer); + if ((buffer = wchar_t2char(wbuffer)) != NULL) { + strncpy(buf, buffer, len); + buffer[len - 1] = '\0'; + + free(buffer); + } + free(wbuffer); } - free(buffer); - free(wbuffer); #else unsigned char *c; diff -Nurp tin-1.7.4/src/color.c tin-1.7.5/src/color.c --- tin-1.7.4/src/color.c 2004-01-20 15:21:00.000000000 +0100 +++ tin-1.7.5/src/color.c 2004-06-07 12:18:02.000000000 +0200 @@ -7,7 +7,7 @@ * Julien Oster (word highlighting) * T.Dickey (curses support) * Created : 1995-06-02 - * Updated : 2004-01-11 + * Updated : 2004-06-07 * Notes : This are the basic function for ansi-color * and word highlighting * @@ -234,9 +234,48 @@ draw_pager_line( } #endif /* HAVE_COLOR */ - if (!raw_data) - my_fputs(str, stdout); - else { + if (!raw_data) { +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + /* + * BiDi support + */ + /* don't run it on empty lines and lines containing only one char (which must be an ASCII one) */ + if (tinrc.render_bidi && IS_LOCAL_CHARSET("UTF-8") && strlen(str) > 1) { + char *line; + t_bool is_rtl; + + if ((line = render_bidi(str, &is_rtl)) != NULL) { + if (is_rtl) { /* RTL */ + /* determine visual length and pad out so that line is right-aligned */ + wchar_t *wline; + + if ((wline = char2wchar_t(line)) != NULL) { + int visual_len; + + wconvert_to_printable(wline); + visual_len = wcswidth(wline, wcslen(wline) + 1); + free(wline); + + if (visual_len > 0) { + int i; + + for (i = 0; i < cCOLS - visual_len - 1; i++) + my_fputc(' ', stdout); + } + my_fputs(line, stdout); + } else /* fallback */ + my_fputs(line, stdout); + + } else /* LTR */ + my_fputs(line, stdout); + + free(line); + } else + my_fputs(str, stdout); + } else +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ + my_fputs(str, stdout); + } else { /* in RAW-mode (show_all_headers) display non-printable chars as octals */ const char *c; char octal[5]; diff -Nurp tin-1.7.4/src/config.c tin-1.7.5/src/config.c --- tin-1.7.4/src/config.c 2004-01-20 15:39:40.000000000 +0100 +++ tin-1.7.5/src/config.c 2004-06-06 20:06:30.000000000 +0200 @@ -3,7 +3,7 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-01-20 + * Updated : 2004-06-06 * Notes : Configuration file routines * * Copyright (c) 1991-2004 Iain Lea @@ -64,7 +64,6 @@ static t_bool match_item(char *line, con static t_bool rc_update(FILE *fp); static void RepaintOption(int option); static void check_score_defaults(void); -static void expand_rel_abs_pathname(int line, int col, char *str); static void highlight_option(int option); static void print_any_option(int act_option); static void print_option(enum option_enum the_option); @@ -312,8 +311,11 @@ read_config_file( if (match_string(buf, "default_sigfile=", tinrc.sigfile, sizeof(tinrc.sigfile))) break; - if (match_integer(buf, "default_filter_days=", &tinrc.filter_days, 0)) + if (match_integer(buf, "default_filter_days=", &tinrc.filter_days, 0)) { + if (tinrc.filter_days <= 0) + tinrc.filter_days = 1; break; + } if (match_integer(buf, "default_filter_kill_header=", &tinrc.default_filter_kill_header, FILTER_LINES)) break; @@ -619,6 +621,11 @@ read_config_file( if (match_integer(buf, "recent_time=", &tinrc.recent_time, 16383)) /* use INT_MAX? */ break; +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + if (match_boolean(buf, "render_bidi=", &tinrc.render_bidi)) + break; +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ + if (match_integer(buf, "reread_active_file_secs=", &tinrc.reread_active_file_secs, 16383)) /* use INT_MAX? */ break; @@ -1308,6 +1315,11 @@ write_config_file( fprintf(fp, "normalization_form=%d\n\n", tinrc.normalization_form); #endif /* HAVE_UNICODE_NORMALIZATION */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + fprintf(fp, _(txt_render_bidi.tinrc)); + fprintf(fp, "render_bidi=%s\n\n", print_boolean(tinrc.render_bidi)); +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ + fprintf(fp, _(txt_tinrc_filter)); fprintf(fp, "default_filter_kill_header=%d\n", tinrc.default_filter_kill_header); fprintf(fp, "default_filter_kill_global=%s\n", print_boolean(tinrc.default_filter_kill_global)); @@ -1429,72 +1441,57 @@ set_option_num( } -#define OPTION_WIDTH 35 char * fmt_option_prompt( char *dst, - int len, + size_t len, t_bool editing, int option) { char *buf; int num = get_option_num(option); + size_t option_width = MAX(35, cCOLS / 2 - 9); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - size_t size, wsize; wchar_t *wbuf, *wbuf2; -#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - /* - * TODO: make the open length (OPTION_WIDTH) cCOLS dependent - * requries changes in various prompt_*() functions (and lang.c) - */ - -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) /* convert the option text to wchar_t */ - wsize = mbstowcs(NULL, _(option_table[option].txt->opt), 0); - if (wsize != (size_t) (-1)) { - wbuf = my_malloc(sizeof(wchar_t) * (wsize + 1)); - mbstowcs(wbuf, _(option_table[option].txt->opt), wsize + 1); - } else - wbuf = NULL; + wbuf = char2wchar_t(_(option_table[option].txt->opt)); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ if (num) { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (wsize != (size_t) (-1)) { - wbuf2 = my_malloc(sizeof(wchar_t) * (wsize + 1)); - wcspart(wbuf2, wbuf, OPTION_WIDTH, wsize + 1, TRUE); - size = wcstombs(NULL, wbuf2, 0); - if (size != (size_t) (-1)) { - buf = my_malloc(size + 1); - wcstombs(buf, wbuf2, size + 1); - } else { + if (wbuf != NULL) { + wbuf2 = my_malloc(sizeof(wchar_t) * (option_width + 1)); + wstrunc(wbuf, wbuf2, option_width + 1, option_width); + + if ((buf = wchar_t2char(wbuf2)) == NULL) { /* conversion failed, truncate original string */ - buf = my_malloc(OPTION_WIDTH + 1); - snprintf(buf, OPTION_WIDTH + 1, "%.*s", OPTION_WIDTH, _(option_table[option].txt->opt)); + buf = my_malloc(option_width + 1); + strunc(_(option_table[option].txt->opt), buf, option_width + 1, option_width); + snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, option_width, option_width, buf); + } else { + snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, + strlen(buf) + option_width - wcswidth(wbuf2, option_width + 1), + strlen(buf) + option_width - wcswidth(wbuf2, option_width + 1), buf); } free(wbuf2); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ { /* truncate original string */ - buf = my_malloc(OPTION_WIDTH + 1); - snprintf(buf, OPTION_WIDTH + 1, "%.*s", OPTION_WIDTH, _(option_table[option].txt->opt)); + buf = my_malloc(option_width + 1); + strunc(_(option_table[option].txt->opt), buf, option_width + 1, option_width); + snprintf(dst, len, "%s %3d. %-*.*s: ", editing ? "->" : " ", num, option_width, option_width, buf); } - snprintf(dst, len, "%s %3d. %s: ", editing ? "->" : " ", num, buf); } else { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (wsize != (size_t) (-1)) { - wbuf2 = my_malloc(sizeof(wchar_t) * (wsize + 1)); - wcspart(wbuf2, wbuf, cCOLS - 3, wsize + 1, FALSE); - size = wcstombs(NULL, wbuf2, 0); - if (size != (size_t) (-1)) { - buf = my_malloc(size + 1); - wcstombs(buf, wbuf2, size + 1); - } else { + if (wbuf != NULL) { + wbuf2 = my_malloc(sizeof(wchar_t) * (cCOLS - 3 + 1)); + wstrunc(wbuf, wbuf2, cCOLS - 3 + 1, cCOLS - 3); + if ((buf = wchar_t2char(wbuf2)) == NULL) { /* conversion failed, truncate original string */ buf = my_malloc(cCOLS - 3 + 1); - snprintf(buf, cCOLS - 3 + 1, "%.*s", cCOLS - 3, _(option_table[option].txt->opt)); + strunc(_(option_table[option].txt->opt), buf, cCOLS - 3 + 1, cCOLS - 3); } free(wbuf2); } else @@ -1502,7 +1499,7 @@ fmt_option_prompt( { /* truncate original string */ buf = my_malloc(cCOLS - 3 + 1); - snprintf(buf, cCOLS - 3 + 1, "%.*s", cCOLS - 3, _(option_table[option].txt->opt)); + strunc(_(option_table[option].txt->opt), buf, cCOLS - 3 + 1, cCOLS - 3); } snprintf(dst, len, " %s", buf); } @@ -1510,7 +1507,7 @@ fmt_option_prompt( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) FreeIfNeeded(wbuf); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - free(buf); + FreeIfNeeded(buf); return dst; } @@ -1522,7 +1519,7 @@ print_any_option( constext **list; char temp[LEN], *ptr, *ptr2; int row = option_row(act_option); - int len = sizeof(temp) - 1; + size_t len = sizeof(temp) - 1; MoveCursor(row, 0); @@ -1559,7 +1556,7 @@ print_any_option( break; } #ifdef USE_CURSES - my_printf("%.*s", cCOLS, temp); + my_printf("%.*s", cCOLS - 1, temp); { int y, x; @@ -1637,6 +1634,7 @@ highlight_option( refresh_config_page(option); draw_arrow_mark(option_row(option)); + info_message("%s", _(option_table[option].txt->opt)); } @@ -1652,6 +1650,7 @@ unhighlight_option( currmenu->curr = option_row(option) - INDEX_TOP; erase_arrow(); currmenu = savemenu; + clear_message(); } @@ -1708,15 +1707,13 @@ change_config_file( struct t_group *group) { int ch = 0; - int original_list_value; int option, old_option; int ret_code = NO_FILTERING; int mime_encoding = MIME_ENCODING_7BIT; t_bool change_option = FALSE; - t_bool original_on_off_value; actual_top_option = -1; - option = 0; + option = 1; ClearScreen(); set_xclick_off(); @@ -1778,7 +1775,9 @@ change_config_file( case iKeyUp: case iKeyUp2: unhighlight_option(option); - if (--option < 0) + if (!get_option_num(--option)) /* skip over titles */ + option--; + if (option < 0) option = LAST_OPT; highlight_option(option); break; @@ -1786,15 +1785,17 @@ change_config_file( case iKeyDown: case iKeyDown2: unhighlight_option(option); - if (++option > LAST_OPT) - option = 0; + if (!get_option_num(++option)) /* skip over titles */ + option++; + if (option > LAST_OPT) + option = 1; highlight_option(option); break; case iKeyFirstPage: case iKeyConfigFirstPage2: unhighlight_option(option); - option = 0; + option = 1; highlight_option(option); break; @@ -1817,7 +1818,7 @@ change_config_file( ClearScreen(); show_config_page(); } else if ((option -= option_lines_per_page) < 0) { - option = 0; + option = 1; first_option_on_screen = 0; } else { first_option_on_screen -= (tinrc.scroll_lines == -2) ? option_lines_per_page / 2 : option_lines_per_page; @@ -1884,26 +1885,63 @@ change_config_file( if (change_option) { switch (option_table[option].var_type) { case OPT_ON_OFF: - original_on_off_value = *OPT_ON_OFF_list[option_table[option].var_index]; - prompt_on_off(option_row(option), - OPT_ARG_COLUMN, - OPT_ON_OFF_list[option_table[option].var_index], - option_table[option].txt->help, - option_table[option].txt->opt - ); - /* - * some options need further action to take effect - */ switch (option) { + case OPT_ADD_POSTED_TO_FILTER: + case OPT_ADVERTISING: + case OPT_ALTERNATIVE_HANDLING: + case OPT_ASK_FOR_METAMAIL: + case OPT_AUTO_BCC: + case OPT_AUTO_CC: + case OPT_AUTO_LIST_THREAD: + case OPT_AUTO_RECONNECT: + case OPT_AUTO_SAVE: + case OPT_BATCH_SAVE: + case OPT_CACHE_OVERVIEW_FILES: + case OPT_CATCHUP_READ_GROUPS: + case OPT_FORCE_SCREEN_REDRAW: + case OPT_GROUP_CATCHUP_ON_EXIT: + case OPT_KEEP_DEAD_ARTICLES: + case OPT_MARK_IGNORE_TAGS: + case OPT_MARK_SAVED_READ: + case OPT_PGDN_GOTO_NEXT: + case OPT_POS_FIRST_UNREAD: + case OPT_POST_PROCESS_VIEW: + case OPT_PRINT_HEADER: + case OPT_PROCESS_ONLY_UNREAD: + case OPT_PROMPT_FOLLOWUPTO: + case OPT_SHOW_ONLY_UNREAD_GROUPS: + case OPT_SHOW_SIGNATURES: + case OPT_SIGDASHES: + case OPT_SIGNATURE_REPOST: + case OPT_SPACE_GOTO_NEXT_UNREAD: + case OPT_START_EDITOR_OFFSET: + case OPT_STRIP_BLANKS: + case OPT_STRIP_NEWSRC: + case OPT_TAB_GOTO_NEXT_UNREAD: + case OPT_TEX2ISO_CONV: + case OPT_THREAD_CATCHUP_ON_EXIT: +#if defined(HAVE_ICONV_OPEN_TRANSLIT) && defined(CHARSET_CONVERSION) + case OPT_TRANSLIT: +#endif /* HAVE_ICONV_OPEN_TRANSLIT && CHARSET_CONVERSION */ + case OPT_UNLINK_ARTICLE: + case OPT_URL_HIGHLIGHT: +#ifdef HAVE_KEYPAD + case OPT_USE_KEYPAD: +#endif /* HAVE_KEYPAD */ + case OPT_USE_MOUSE: + case OPT_WRAP_ON_NEXT_UNREAD: + prompt_option_on_off(option); + break; + /* show mini help menu */ case OPT_BEGINNER_LEVEL: - if (!bool_equal(tinrc.beginner_level, original_on_off_value)) + if (prompt_option_on_off(option)) set_noteslines(cLINES); break; /* show all arts or just new/unread arts */ case OPT_SHOW_ONLY_UNREAD_ARTS: - if (!bool_equal(tinrc.show_only_unread_arts, original_on_off_value) && group != NULL) { + if (prompt_option_on_off(option) && group != NULL) { make_threads(group, TRUE); pos_first_unread_thread(); } @@ -1911,6 +1949,7 @@ change_config_file( /* draw -> / highlighted bar */ case OPT_DRAW_ARROW: + prompt_option_on_off(option); unhighlight_option(option); if (!tinrc.draw_arrow && !tinrc.inverse_okay) { tinrc.inverse_okay = TRUE; @@ -1921,6 +1960,7 @@ change_config_file( /* draw inversed screen header lines */ /* draw inversed group/article/option line if draw_arrow is OFF */ case OPT_INVERSE_OKAY: + prompt_option_on_off(option); unhighlight_option(option); if (!tinrc.draw_arrow && !tinrc.inverse_okay) { tinrc.draw_arrow = TRUE; /* we don't want to navigate blindly */ @@ -1929,6 +1969,7 @@ change_config_file( break; case OPT_MAIL_8BIT_HEADER: + prompt_option_on_off(option); if (strcasecmp(txt_mime_encodings[tinrc.mail_mime_encoding], txt_8bit)) { tinrc.mail_8bit_header = FALSE; print_option(OPT_MAIL_8BIT_HEADER); @@ -1936,6 +1977,7 @@ change_config_file( break; case OPT_POST_8BIT_HEADER: + prompt_option_on_off(option); /* if post_mime_encoding != 8bit, post_8bit_header is disabled */ if (strcasecmp(txt_mime_encodings[tinrc.post_mime_encoding], txt_8bit)) { tinrc.post_8bit_header = FALSE; @@ -1945,16 +1987,16 @@ change_config_file( /* show newsgroup description text next to newsgroups */ case OPT_SHOW_DESCRIPTION: + prompt_option_on_off(option); show_description = tinrc.show_description; if (show_description) /* force reread of newgroups file */ read_descriptions(FALSE); - else - set_groupname_len(FALSE); break; #ifdef HAVE_COLOR /* use ANSI color */ case OPT_USE_COLOR: + prompt_option_on_off(option); # ifdef USE_CURSES if (!has_colors()) use_color = FALSE; @@ -1967,7 +2009,7 @@ change_config_file( #ifdef XFACE_ABLE /* use slrnface */ case OPT_USE_SLRNFACE: - if (!bool_equal(tinrc.use_slrnface, original_on_off_value)) { + if (prompt_option_on_off(option)) { if (!tinrc.use_slrnface) slrnface_stop(); else @@ -1978,50 +2020,15 @@ change_config_file( /* word_highlight */ case OPT_WORD_HIGHLIGHT: + prompt_option_on_off(option); word_highlight = tinrc.word_highlight; break; - /* - * 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: - * case OPT_AUTO_RECONNECT: - * case OPT_AUTO_SAVE: - * case OPT_BATCH_SAVE: - * case OPT_CATCHUP_READ_GROUPS: - * case OPT_FORCE_SCREEN_REDRAW: - * case OPT_FULL_PAGE_SCROLL: - * case OPT_GROUP_CATCHUP_ON_EXIT: - * case OPT_KEEP_DEAD_ARTICLES: - * case OPT_MARK_SAVED_READ: - * case OPT_NO_ADVERTISING: - * case OPT_POS_FIRST_UNREAD: - * case OPT_POSTED_ARTICLES: - * case OPT_PRINT_HEADER: - * case OPT_PROCESS_ONLY_UNREAD: - * case OPT_SHOW_ONLY_UNREAD_GROUPS: - * case OPT_SHOW_XCOMMENTTO: - * case OPT_SIGDASHES: - * case OPT_SPACE_GOTO_NEXT_UNREAD: - * case OPT_START_EDITOR_OFFSET: - * case OPT_STRIP_BLANKS: - * 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_URL_HIGHLIGHT: -#ifdef HAVE_KEYPAD - * case OPT_USE_KEYPAD: -#endif - * case OPT_USE_MOUSE: - * case OPT_WRAP_ON_NEXT_UNREAD: - */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + case OPT_RENDER_BIDI: + prompt_option_on_off(option); + break; +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ default: break; @@ -2029,26 +2036,59 @@ change_config_file( break; case OPT_LIST: - original_list_value = *(option_table[option].variable); - *(option_table[option].variable) = prompt_list(option_row(option), - OPT_ARG_COLUMN, - *(option_table[option].variable), /* post_process */ - option_table[option].txt->help, - _(option_table[option].txt->opt), - option_table[option].opt_list, - option_table[option].opt_count - ); - - /* - * some options need further action to take effect - */ switch (option) { +#ifdef HAVE_COLOR + case OPT_COL_BACK: + case OPT_COL_FROM: + case OPT_COL_HEAD: + case OPT_COL_HELP: + case OPT_COL_INVERS_BG: + case OPT_COL_INVERS_FG: + case OPT_COL_MESSAGE: + case OPT_COL_MINIHELP: + case OPT_COL_NEWSHEADERS: + case OPT_COL_NORMAL: + case OPT_COL_QUOTE: + case OPT_COL_QUOTE2: + case OPT_COL_QUOTE3: + case OPT_COL_RESPONSE: + case OPT_COL_SIGNATURE: + case OPT_COL_SUBJECT: + case OPT_COL_TEXT: + case OPT_COL_TITLE: + case OPT_COL_MARKSTAR: + case OPT_COL_MARKDASH: + case OPT_COL_MARKSLASH: + case OPT_COL_MARKSTROKE: + case OPT_COL_URLS: +#endif /* HAVE_COLOR */ + case OPT_HIDE_UUE: + case OPT_INTERACTIVE_MAILER: + case OPT_WORD_H_DISPLAY_MARKS: + case OPT_MONO_MARKSTAR: + case OPT_MONO_MARKDASH: + case OPT_MONO_MARKSLASH: + case OPT_MONO_MARKSTROKE: + case OPT_CONFIRM_CHOICE: + case OPT_KILL_LEVEL: + case OPT_MAILBOX_FORMAT: + case OPT_SHOW_INFO: + case OPT_SORT_ARTICLE_TYPE: + case OPT_STRIP_BOGUS: +#ifdef HAVE_UNICODE_NORMALIZATION + case OPT_NORMALIZATION_FORM: +#endif /* HAVE_UNICODE_NORMALIZATION */ + case OPT_QUOTE_STYLE: + case OPT_WILDCARD: + prompt_option_list(option); + break; + case OPT_THREAD_ARTICLES: /* * If the threading strategy has changed, fix things * so that rethreading will occur */ - if (tinrc.thread_articles != original_list_value && group != NULL) { + if (prompt_option_list(option) && group != NULL) { int n, old_base_art = base[grpmenu.curr]; group->attribute->thread_arts = tinrc.thread_articles; @@ -2067,7 +2107,7 @@ change_config_file( * If the sorting strategy of threads has changed, fix things * so that resorting will occur */ - if (tinrc.sort_threads_type != original_list_value && group != NULL) { + if (prompt_option_list(option) && group != NULL) { group->attribute->sort_threads_type = tinrc.sort_threads_type; make_threads(group, TRUE); } @@ -2079,24 +2119,27 @@ change_config_file( * If the scoring of a thread has changed, * resort base[] */ - if (tinrc.thread_score != original_list_value && group != NULL) + if (prompt_option_list(option) && group != NULL) find_base(group); clear_message(); break; case OPT_POST_PROCESS: + prompt_option_list(option); glob_attributes.post_proc_type = tinrc.post_process; if (group != NULL) group->attribute->post_proc_type = tinrc.post_process; break; case OPT_SHOW_AUTHOR: + prompt_option_list(option); if (group != NULL) group->attribute->show_author = tinrc.show_author; break; case OPT_MAIL_MIME_ENCODING: case OPT_POST_MIME_ENCODING: + prompt_option_list(option); mime_encoding = *(option_table[option].variable); /* do not use 8 bit headers if mime encoding is not 8bit */ if (strcasecmp(txt_mime_encodings[mime_encoding], txt_8bit)) { @@ -2112,7 +2155,7 @@ change_config_file( #ifdef CHARSET_CONVERSION case OPT_MM_NETWORK_CHARSET: - if (tinrc.mm_network_charset != original_list_value) { + if (prompt_option_list(option)) { glob_attributes.mm_network_charset = tinrc.mm_network_charset; if (group) group->attribute->mm_network_charset = tinrc.mm_network_charset; @@ -2185,46 +2228,6 @@ change_config_file( break; #endif /* CHARSET_CONVERSION */ - /* - * the following are picklists and don't need any further action -#ifdef HAVE_COLOR - * case OPT_COL_BACK: - * case OPT_COL_FROM: - * case OPT_COL_HEAD: - * case OPT_COL_HELP: - * case OPT_COL_INVERS: - * case OPT_COL_MESSAGE: - * case OPT_COL_MINIHELP: - * case OPT_COL_NORMAL: - * case OPT_COL_QUOTE: - * case OPT_COL_QUOTE2: - * case OPT_COL_QUOTE3: - * case OPT_COL_RESPONSE: - * case OPT_COL_SIGNATURE: - * case OPT_COL_SUBJECT: - * case OPT_COL_TEXT: - * case OPT_COL_TITLE: - * case OPT_COL_MARKSTAR: - * case OPT_COL_MARKDASH: - * case OPT_COL_MARKSLASH: - * case OPT_COL_MARKSTROKE: -#endif - * case OPT_HIDE_UUE: - * case OPT_INTERACTIVE_MAILER: - * case OPT_WORD_H_DISPLAY_MARKS: - * case OPT_MONO_MARKSTAR: - * case OPT_MONO_MARKDASH: - * case OPT_MONO_MARKSLASH: - * case OPT_MONO_MARKSTROKE: - * case OPT_CONFIRM_CHOICE: - * case OPT_DEFAULT_SORT_ART_TYPE: - * case OPT_MAILBOX_FORMAT: - * case OPT_SHOW_INFO: - * case OPT_NORMALIZATION_FORM: - * case OPT_WILDCARD: - * break; - */ - default: break; } /* switch (option) */ @@ -2272,11 +2275,12 @@ change_config_file( case OPT_SAVEDIR: case OPT_SIGFILE: case OPT_POSTED_ARTICLES_FILE: - prompt_option_string(option); - expand_rel_abs_pathname(option_row(option), - OPT_ARG_COLUMN + OPTION_WIDTH, - OPT_STRING_list[option_table[option].var_index] - ); + if (prompt_option_string(option)) { + char buf[PATH_LEN]; + + strfpath(tinrc.posted_articles_file, buf, sizeof(buf), &CURR_GROUP); + STRCPY(tinrc.posted_articles_file, buf); + } break; #ifdef HAVE_COLOR @@ -2391,13 +2395,33 @@ change_config_file( case OPT_NUM: switch (option) { - case OPT_REREAD_ACTIVE_FILE_SECS: case OPT_GETART_LIMIT: + case OPT_SCROLL_LINES: + prompt_option_num(option); + break; + + case OPT_REREAD_ACTIVE_FILE_SECS: + prompt_option_num(option); + if (tinrc.reread_active_file_secs < 0) + tinrc.reread_active_file_secs = 0; + break; + case OPT_RECENT_TIME: + prompt_option_num(option); + if (tinrc.recent_time < 0) + tinrc.recent_time = 0; + break; + case OPT_GROUPNAME_MAX_LENGTH: - case OPT_SCROLL_LINES: + prompt_option_num(option); + if (tinrc.groupname_max_length < 0) + tinrc.groupname_max_length = 0; + break; + case OPT_FILTER_DAYS: prompt_option_num(option); + if (tinrc.filter_days <= 0) + tinrc.filter_days = 1; break; case OPT_SCORE_LIMIT_KILL: @@ -2463,26 +2487,6 @@ change_config_file( /* - * expand ~/News to /usr/username/News and print to screen - */ -static void -expand_rel_abs_pathname( - int line, - int col, - char *str) -{ - char buf[PATH_LEN]; - - strfpath(str, buf, sizeof(buf), &CURR_GROUP); - sprintf(str, "%-.*s", cCOLS - col - 1, buf); - MoveCursor(line, col); - CleartoEOLN(); - my_fputs(str, stdout); - my_flush(); -} - - -/* * show_menu_help */ void diff -Nurp tin-1.7.4/src/cook.c tin-1.7.5/src/cook.c --- tin-1.7.4/src/cook.c 2003-12-28 15:16:41.000000000 +0100 +++ tin-1.7.5/src/cook.c 2004-05-27 15:29:37.000000000 +0200 @@ -3,7 +3,7 @@ * Module : cook.c * Author : J. Faultless * Created : 2000-03-08 - * Updated : 2003-08-26 + * Updated : 2004-05-27 * Notes : Split from page.c * * Copyright (c) 2000-2004 Jason Faultless @@ -729,7 +729,12 @@ process_text_body_part( break; /* premature end of file, file error etc. */ /* convert network to local charset, tex2iso, iso2asc etc. */ - process_charsets(&line, &max_line_len, get_param(part->params, "charset"), tinrc.mm_local_charset, CURR_GROUP.attribute->tex2iso_conv && art->tex2iso); + process_charsets(&line, &max_line_len, get_param(part->params, "charset"), tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso); + +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + if (IS_LOCAL_CHARSET("UTF-8")) + utf8_valid(line); +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ len = (int) strlen(line); @@ -996,7 +1001,7 @@ cook_article( /* * FIXME: don't decode addr-part of From:/Cc:/ etc.pp. */ - put_cooked(LEN, wrap_lines, C_HEADER, "%s\n", rfc1522_decode(line)); + put_cooked(LEN, wrap_lines, C_HEADER, "%s\n", rfc1522_decode(buffer_to_ascii(line))); } } diff -Nurp tin-1.7.4/src/curses.c tin-1.7.5/src/curses.c --- tin-1.7.4/src/curses.c 2003-11-29 22:30:23.000000000 +0100 +++ tin-1.7.5/src/curses.c 2004-06-07 12:18:18.000000000 +0200 @@ -3,7 +3,7 @@ * Module : curses.c * Author : D. Taylor & I. Lea * Created : 1986-01-01 - * Updated : 2003-09-19 + * Updated : 2004-06-07 * Notes : This is a screen management library borrowed with permission * from the Elm mail system. This library was hacked to provide * what tin needs. @@ -941,13 +941,13 @@ highlight_string( */ if (col > 0) { char tmp[LEN]; - wchar_t wtmp[LEN]; + wchar_t *wtmp; my_strncpy(tmp, &(screen[row].col[0]), sizeof(tmp) - 1); tmp[col] = '\0'; - if (mbstowcs(wtmp, tmp, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { - wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - col = wcswidth(wtmp, ARRAY_SIZE(wtmp)); + if ((wtmp = char2wchar_t(tmp)) != NULL) { + col = wcswidth(wtmp, wcslen(wtmp) + 1); + free(wtmp); } } #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -981,7 +981,7 @@ word_highlight_string( int byte_offset = col; int wsize = size; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t wtmp[LEN]; + wchar_t *wtmp; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ attributes[0] = _reset; /* Normal */ @@ -1004,14 +1004,14 @@ word_highlight_string( char tmp[LEN]; my_strncpy(tmp, &(screen[row].col[0]), sizeof(tmp) - 1); tmp[byte_offset] = '\0'; - if (mbstowcs(wtmp, tmp, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { - wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - col = wcswidth(wtmp, ARRAY_SIZE(wtmp)); + if ((wtmp = char2wchar_t(tmp)) != NULL) { + col = wcswidth(wtmp, wcslen(wtmp) + 1); + free(wtmp); } } - if (mbstowcs(wtmp, output, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { - wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - wsize = wcswidth(wtmp, ARRAY_SIZE(wtmp)); + if ((wtmp = char2wchar_t(output)) != NULL) { + wsize = wcswidth(wtmp, wcslen(wtmp) + 1); + free(wtmp); } #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ diff -Nurp tin-1.7.4/src/feed.c tin-1.7.5/src/feed.c --- tin-1.7.4/src/feed.c 2004-01-05 03:59:09.000000000 +0100 +++ tin-1.7.5/src/feed.c 2004-03-14 15:43:45.000000000 +0100 @@ -3,7 +3,7 @@ * Module : feed.c * Author : I. Lea * Created : 1991-08-31 - * Updated : 2004-01-05 + * Updated : 2004-03-14 * Notes : provides same interface to mail,pipe,print,save & repost commands * * Copyright (c) 1991-2004 Iain Lea @@ -469,7 +469,7 @@ feed_article( */ if (function == FEED_SAVE || function == FEED_AUTOSAVE) { if (ok && tinrc.mark_saved_read) - art_mark(&CURR_GROUP, &arts[art], ART_READ); + art_mark(curr_group, &arts[art], ART_READ); } if (!use_current) @@ -813,7 +813,7 @@ got_sig_pipe_while_piping: if (proc_ch != iKeyPProcNo) { t_bool delete_post_proc = FALSE; - if (CURR_GROUP.attribute->delete_tmp_files) + if (curr_group->attribute->delete_tmp_files) delete_post_proc = TRUE; else { if (function != FEED_AUTOSAVE) { @@ -890,8 +890,8 @@ print_file( t_openartinfo *artinfo) { FILE *fp; - t_bool ok = TRUE; struct t_header *hdr = &artinfo->hdr; + t_bool ok; # ifdef DONT_HAVE_PIPING char cmd[PATH_LEN], file[PATH_LEN]; # endif /* DONT_HAVE_PIPING */ diff -Nurp tin-1.7.4/src/filter.c tin-1.7.5/src/filter.c --- tin-1.7.4/src/filter.c 2004-01-10 15:16:33.000000000 +0100 +++ tin-1.7.5/src/filter.c 2004-06-07 12:18:31.000000000 +0200 @@ -3,7 +3,7 @@ * Module : filter.c * Author : I. Lea * Created : 1992-12-28 - * Updated : 2004-01-10 + * Updated : 2004-06-07 * Notes : Filter articles. Kill & auto selection are supported. * * Copyright (c) 1991-2004 Iain Lea @@ -295,7 +295,7 @@ read_filter_file( FILE *fp; char buf[HEADER_LEN]; char scope[HEADER_LEN]; - char comment_line[LEN]; /* one line of comment */ + char comment_line[LEN]; /* one line of comment */ char subj[HEADER_LEN]; char from[HEADER_LEN]; char msgid[HEADER_LEN]; @@ -307,8 +307,8 @@ read_filter_file( int icase = 0; int score = 0; long secs = 0L; - struct t_filter_comment *comment; - struct t_filter *ptr; + struct t_filter_comment *comment = NULL; + struct t_filter *ptr = NULL; t_bool expired = FALSE; t_bool expired_time = FALSE; time_t current_secs = (time_t) 0; @@ -329,9 +329,6 @@ read_filter_file( if (!first_read) free_filter_array(&glob_filter); - ptr = (struct t_filter *) 0; - comment = (struct t_filter_comment *) 0; - while (fgets(buf, (int) sizeof(buf), fp) != NULL) { if (*buf == '#' || *buf == '\n') { if (upgrade == RC_CHECK && first_read) { @@ -345,287 +342,277 @@ read_filter_file( } switch (tolower((unsigned char) buf[0])) { - case 'c': - if (match_integer(buf + 1, "ase=", &icase, 1)) { - if (ptr && !expired_time) - ptr[i].icase = (unsigned) icase; + case 'c': + if (match_integer(buf + 1, "ase=", &icase, 1)) { + if (ptr && !expired_time) + ptr[i].icase = (unsigned) icase; + break; + } + if (match_string(buf + 1, "omment=", comment_line, sizeof(comment_line))) + comment = add_filter_comment(comment, comment_line); break; - } - if (match_string(buf + 1, "omment=", comment_line, sizeof(comment_line))) { - comment = add_filter_comment(comment, comment_line); - break; - } - break; - case 'f': - if (match_string(buf + 1, "rom=", from, sizeof(from))) { - if (ptr && !expired_time) { - if (tinrc.wildcard && ptr[i].from != NULL) { - /* merge with already read value */ - ptr[i].from = my_realloc(ptr[i].from, strlen(ptr[i].from) + strlen(from) + 2); - strcat(ptr[i].from, "|"); - strcat(ptr[i].from, from); - } else { - FreeIfNeeded(ptr[i].from); - ptr[i].from = my_strdup(from); + case 'f': + if (match_string(buf + 1, "rom=", from, sizeof(from))) { + if (ptr && !expired_time) { + if (tinrc.wildcard && ptr[i].from != NULL) { + /* merge with already read value */ + ptr[i].from = my_realloc(ptr[i].from, strlen(ptr[i].from) + strlen(from) + 2); + strcat(ptr[i].from, "|"); + strcat(ptr[i].from, from); + } else { + FreeIfNeeded(ptr[i].from); + ptr[i].from = my_strdup(from); + } } } break; - } - break; - case 'g': - if (match_string(buf + 1, "roup=", scope, sizeof(scope))) { + case 'g': + if (match_string(buf + 1, "roup=", scope, sizeof(scope))) { #ifdef DEBUG - if (debug) { - my_printf("group=[%s] num=[%d]\n", scope, glob_filter.num); - my_flush(); - } + if (debug) { + my_printf("group=[%s] num=[%d]\n", scope, glob_filter.num); + my_flush(); + } #endif /* DEBUG */ - if (glob_filter.num >= glob_filter.max) - expand_filter_array(&glob_filter); + if (glob_filter.num >= glob_filter.max) + expand_filter_array(&glob_filter); - ptr = glob_filter.filter; - i = glob_filter.num++; - set_filter(&ptr[i]); - expired_time = FALSE; - ptr[i].scope = my_strdup(scope); - if (comment != NULL) { - ptr[i].comment = copy_filter_comment(comment, ptr[i].comment); - comment = free_filter_comment(comment); + ptr = glob_filter.filter; + i = glob_filter.num++; + set_filter(&ptr[i]); + expired_time = FALSE; + ptr[i].scope = my_strdup(scope); + if (comment != NULL) { + ptr[i].comment = copy_filter_comment(comment, ptr[i].comment); + comment = free_filter_comment(comment); + } + subj[0] = '\0'; + from[0] = '\0'; + msgid[0] = '\0'; + buffer[0] = '\0'; + xref[0] = '\0'; + icase = 0; + secs = 0L; + break; } - subj[0] = '\0'; - from[0] = '\0'; - msgid[0] = '\0'; - buffer[0] = '\0'; - xref[0] = '\0'; - icase = 0; - secs = 0L; - break; - } - if (match_string(buf + 1, "nksa=", gnksa, sizeof(gnksa))) { - if (ptr && !expired_time) { - if (gnksa[0] == '<') { - ptr[i].gnksa_cmp = FILTER_LINES_LT; - ptr[i].gnksa_num = atoi(&gnksa[1]); - } else if (gnksa[0] == '>') { - ptr[i].gnksa_cmp = FILTER_LINES_GT; - ptr[i].gnksa_num = atoi(&gnksa[1]); - } else { - ptr[i].gnksa_cmp = FILTER_LINES_EQ; - ptr[i].gnksa_num = atoi(gnksa); + if (match_string(buf + 1, "nksa=", gnksa, sizeof(gnksa))) { + if (ptr && !expired_time) { + if (gnksa[0] == '<') { + ptr[i].gnksa_cmp = FILTER_LINES_LT; + ptr[i].gnksa_num = atoi(&gnksa[1]); + } else if (gnksa[0] == '>') { + ptr[i].gnksa_cmp = FILTER_LINES_GT; + ptr[i].gnksa_num = atoi(&gnksa[1]); + } else { + ptr[i].gnksa_cmp = FILTER_LINES_EQ; + ptr[i].gnksa_num = atoi(gnksa); + } } } - break; - } - break; + break; - case 'l': - if (match_string(buf + 1, "ines=", buffer, sizeof(buffer))) { - if (ptr && !expired_time) { - if (buffer[0] == '<') { - ptr[i].lines_cmp = FILTER_LINES_LT; - ptr[i].lines_num = atoi(&buffer[1]); - } else if (buffer[0] == '>') { - ptr[i].lines_cmp = FILTER_LINES_GT; - ptr[i].lines_num = atoi(&buffer[1]); - } else { - ptr[i].lines_cmp = FILTER_LINES_EQ; - ptr[i].lines_num = atoi(buffer); + case 'l': + if (match_string(buf + 1, "ines=", buffer, sizeof(buffer))) { + if (ptr && !expired_time) { + if (buffer[0] == '<') { + ptr[i].lines_cmp = FILTER_LINES_LT; + ptr[i].lines_num = atoi(&buffer[1]); + } else if (buffer[0] == '>') { + ptr[i].lines_cmp = FILTER_LINES_GT; + ptr[i].lines_num = atoi(&buffer[1]); + } else { + ptr[i].lines_cmp = FILTER_LINES_EQ; + ptr[i].lines_num = atoi(buffer); + } } } break; - } - break; - case 'm': - if (match_string(buf + 1, "sgid=", msgid, sizeof(msgid))) { - if (ptr && !expired_time) { - if (tinrc.wildcard && ptr[i].msgid != NULL && ptr[i].fullref == FILTER_MSGID) { - /* merge with already read value */ - ptr[i].msgid = my_realloc(ptr[i].msgid, strlen(ptr[i].msgid) + strlen(msgid) + 2); - strcat(ptr[i].msgid, "|"); - strcat(ptr[i].msgid, msgid); - } else { - FreeIfNeeded(ptr[i].msgid); - ptr[i].msgid = my_strdup(msgid); - ptr[i].fullref = FILTER_MSGID; + case 'm': + if (match_string(buf + 1, "sgid=", msgid, sizeof(msgid))) { + if (ptr && !expired_time) { + if (tinrc.wildcard && ptr[i].msgid != NULL && ptr[i].fullref == FILTER_MSGID) { + /* merge with already read value */ + ptr[i].msgid = my_realloc(ptr[i].msgid, strlen(ptr[i].msgid) + strlen(msgid) + 2); + strcat(ptr[i].msgid, "|"); + strcat(ptr[i].msgid, msgid); + } else { + FreeIfNeeded(ptr[i].msgid); + ptr[i].msgid = my_strdup(msgid); + ptr[i].fullref = FILTER_MSGID; + } } + break; } - break; - } - if (match_string(buf + 1, "sgid_last=", msgid, sizeof(msgid))) { - if (ptr && !expired_time) { - if (tinrc.wildcard && ptr[i].msgid != NULL && ptr[i].fullref == FILTER_MSGID_LAST) { - /* merge with already read value */ - ptr[i].msgid = my_realloc(ptr[i].msgid, strlen(ptr[i].msgid) + strlen(msgid) + 2); - strcat(ptr[i].msgid, "|"); - strcat(ptr[i].msgid, msgid); - } else { - FreeIfNeeded(ptr[i].msgid); - ptr[i].msgid = my_strdup(msgid); - ptr[i].fullref = FILTER_MSGID_LAST; + if (match_string(buf + 1, "sgid_last=", msgid, sizeof(msgid))) { + if (ptr && !expired_time) { + if (tinrc.wildcard && ptr[i].msgid != NULL && ptr[i].fullref == FILTER_MSGID_LAST) { + /* merge with already read value */ + ptr[i].msgid = my_realloc(ptr[i].msgid, strlen(ptr[i].msgid) + strlen(msgid) + 2); + strcat(ptr[i].msgid, "|"); + strcat(ptr[i].msgid, msgid); + } else { + FreeIfNeeded(ptr[i].msgid); + ptr[i].msgid = my_strdup(msgid); + ptr[i].fullref = FILTER_MSGID_LAST; + } } + break; } - break; - } - if (match_string(buf + 1, "sgid_only=", msgid, sizeof(msgid))) { - if (ptr && !expired_time) { - if (tinrc.wildcard && ptr[i].msgid != NULL && ptr[i].fullref == FILTER_MSGID_ONLY) { - /* merge with already read value */ - ptr[i].msgid = my_realloc(ptr[i].msgid, strlen(ptr[i].msgid) + strlen(msgid) + 2); - strcat(ptr[i].msgid, "|"); - strcat(ptr[i].msgid, msgid); - } else { - FreeIfNeeded(ptr[i].msgid); - ptr[i].msgid = my_strdup(msgid); - ptr[i].fullref = FILTER_MSGID_ONLY; + if (match_string(buf + 1, "sgid_only=", msgid, sizeof(msgid))) { + if (ptr && !expired_time) { + if (tinrc.wildcard && ptr[i].msgid != NULL && ptr[i].fullref == FILTER_MSGID_ONLY) { + /* merge with already read value */ + ptr[i].msgid = my_realloc(ptr[i].msgid, strlen(ptr[i].msgid) + strlen(msgid) + 2); + strcat(ptr[i].msgid, "|"); + strcat(ptr[i].msgid, msgid); + } else { + FreeIfNeeded(ptr[i].msgid); + ptr[i].msgid = my_strdup(msgid); + ptr[i].fullref = FILTER_MSGID_ONLY; + } } } break; - } - break; - case 'r': - if (match_string(buf + 1, "efs_only=", msgid, sizeof(msgid))) { - if (ptr && !expired_time) { - if (tinrc.wildcard && ptr[i].msgid != NULL && ptr[i].fullref == FILTER_REFS_ONLY) { - /* merge with already read value */ - ptr[i].msgid = my_realloc(ptr[i].msgid, strlen(ptr[i].msgid) + strlen(msgid) + 2); - strcat(ptr[i].msgid, "|"); - strcat(ptr[i].msgid, msgid); - } else { - FreeIfNeeded(ptr[i].msgid); - ptr[i].msgid = my_strdup(msgid); - ptr[i].fullref = FILTER_REFS_ONLY; + case 'r': + if (match_string(buf + 1, "efs_only=", msgid, sizeof(msgid))) { + if (ptr && !expired_time) { + if (tinrc.wildcard && ptr[i].msgid != NULL && ptr[i].fullref == FILTER_REFS_ONLY) { + /* merge with already read value */ + ptr[i].msgid = my_realloc(ptr[i].msgid, strlen(ptr[i].msgid) + strlen(msgid) + 2); + strcat(ptr[i].msgid, "|"); + strcat(ptr[i].msgid, msgid); + } else { + FreeIfNeeded(ptr[i].msgid); + ptr[i].msgid = my_strdup(msgid); + ptr[i].fullref = FILTER_REFS_ONLY; + } } } break; - } - break; - case 's': - if (match_string(buf + 1, "ubj=", subj, sizeof(subj))) { - if (ptr && !expired_time) { - if (tinrc.wildcard && ptr[i].subj != NULL) { - /* merge with already read value */ - ptr[i].subj = my_realloc(ptr[i].subj, strlen(ptr[i].subj) + strlen(subj) + 2); - strcat(ptr[i].subj, "|"); - strcat(ptr[i].subj, subj); - } else { - FreeIfNeeded(ptr[i].subj); - ptr[i].subj = my_strdup(subj); + case 's': + if (match_string(buf + 1, "ubj=", subj, sizeof(subj))) { + if (ptr && !expired_time) { + if (tinrc.wildcard && ptr[i].subj != NULL) { + /* merge with already read value */ + ptr[i].subj = my_realloc(ptr[i].subj, strlen(ptr[i].subj) + strlen(subj) + 2); + strcat(ptr[i].subj, "|"); + strcat(ptr[i].subj, subj); + } else { + FreeIfNeeded(ptr[i].subj); + ptr[i].subj = my_strdup(subj); + } } - } #ifdef DEBUG - if (debug) { - my_printf("6. buf=[%s] Gsubj=[%s]\n", ptr[i].subj, glob_filter.filter[i].subj); - my_flush(); - } + if (debug) { + my_printf("6. buf=[%s] Gsubj=[%s]\n", ptr[i].subj, glob_filter.filter[i].subj); + my_flush(); + } #endif /* DEBUG */ - break; - } + break; + } - /* - * read score for rule - */ - if (match_string(buf + 1, "core=", scbuf, PATH_LEN)) { - score = atoi(scbuf); + /* + * read score for rule + */ + if (match_string(buf + 1, "core=", scbuf, PATH_LEN)) { + score = atoi(scbuf); #ifdef DEBUG - if (debug) { - my_printf("score=[%d]\n", score); - my_flush(); - } + if (debug) { + my_printf("score=[%d]\n", score); + my_flush(); + } #endif /* DEBUG */ - if (ptr && !expired_time) { - if (score > SCORE_MAX) - score = SCORE_MAX; - else { - if (score < -SCORE_MAX) - score = -SCORE_MAX; + if (ptr && !expired_time) { + if (score > SCORE_MAX) + score = SCORE_MAX; else { - if (!score) { - if (!strncasecmp(scbuf, "kill", 4)) - score = tinrc.score_kill; - else { - if (!strncasecmp(scbuf, "hot", 3)) - score = tinrc.score_select; + if (score < -SCORE_MAX) + score = -SCORE_MAX; + else { + if (!score) { + if (!strncasecmp(scbuf, "kill", 4)) + score = tinrc.score_kill; + else { + if (!strncasecmp(scbuf, "hot", 3)) + score = tinrc.score_select; + } } } } + ptr[i].score = score; } - ptr[i].score = score; } break; - } - break; - case 't': - if (match_long(buf + 1, "ime=", &secs)) { - if (ptr && !expired_time) { - ptr[i].time = (time_t) secs; - /* rule expired? */ - if (secs && current_secs > (time_t) secs) { + case 't': + if (match_long(buf + 1, "ime=", &secs)) { + if (ptr && !expired_time) { + ptr[i].time = (time_t) secs; + /* rule expired? */ + if (secs && current_secs > (time_t) secs) { #ifdef DEBUG - if (debug) { - my_printf("EXPIRED secs=[%lu] current_secs=[%lu]\n", (unsigned long int) secs, (unsigned long int) current_secs); - my_flush(); - } + if (debug) { + my_printf("EXPIRED secs=[%lu] current_secs=[%lu]\n", (unsigned long int) secs, (unsigned long int) current_secs); + my_flush(); + } #endif /* DEBUG */ - glob_filter.num--; - expired_time = TRUE; - expired = TRUE; + glob_filter.num--; + expired_time = TRUE; + expired = TRUE; + } } } break; - } - break; - case 'x': - /* - * TODO: fromat has changed in FILTER_VERSION 1.0.0, - * should we comment out older xref rules like below? - */ - if (match_string(buf + 1, "ref=", xref, sizeof(xref))) { - if (ptr && !expired_time) { - if (tinrc.wildcard && ptr[i].xref != NULL) { - /* merge with already read value */ - ptr[i].xref = my_realloc(ptr[i].xref, strlen(ptr[i].xref) + strlen(xref) + 2); - strcat(ptr[i].xref, "|"); - strcat(ptr[i].xref, xref); - } else { - FreeIfNeeded(ptr[i].xref); - ptr[i].xref = my_strdup(xref); + case 'x': + /* + * TODO: fromat has changed in FILTER_VERSION 1.0.0, + * should we comment out older xref rules like below? + */ + if (match_string(buf + 1, "ref=", xref, sizeof(xref))) { + if (ptr && !expired_time) { + if (tinrc.wildcard && ptr[i].xref != NULL) { + /* merge with already read value */ + ptr[i].xref = my_realloc(ptr[i].xref, strlen(ptr[i].xref) + strlen(xref) + 2); + strcat(ptr[i].xref, "|"); + strcat(ptr[i].xref, xref); + } else { + FreeIfNeeded(ptr[i].xref); + ptr[i].xref = my_strdup(xref); + } } - } - break; - } - if (upgrade == RC_UPGRADE) { - char foo[HEADER_LEN]; - - if (match_string(buf + 1, "ref_max=", foo, LEN - 1)) { - /* - * TODO: add to the right rule, give better explanation, -> lang.c - */ - snprintf(foo, HEADER_LEN, "%s%s", _("Removed from the previous rule: "), str_trim(buf)); - comment = (struct t_filter_comment *) add_filter_comment(comment, foo); break; } - if (match_string(buf + 1, "ref_score=", foo, LEN - 1)) { - /* - * TODO: add to the right rule, give better explanation, -> lang.c - */ - snprintf(foo, HEADER_LEN, "%s%s", _("Removed from the previous rule: "), str_trim(buf)); - comment = (struct t_filter_comment *) add_filter_comment(comment, foo); - break; + if (upgrade == RC_UPGRADE) { + char foo[HEADER_LEN]; + + if (match_string(buf + 1, "ref_max=", foo, LEN - 1)) { + /* + * TODO: add to the right rule, give better explanation, -> lang.c + */ + snprintf(foo, HEADER_LEN, "%s%s", _("Removed from the previous rule: "), str_trim(buf)); + comment = add_filter_comment(comment, foo); + break; + } + if (match_string(buf + 1, "ref_score=", foo, LEN - 1)) { + /* + * TODO: add to the right rule, give better explanation, -> lang.c + */ + snprintf(foo, HEADER_LEN, "%s%s", _("Removed from the previous rule: "), str_trim(buf)); + comment = add_filter_comment(comment, foo); + } } - } - break; + break; - default: - break; + default: + break; } } fclose(fp); @@ -695,7 +682,7 @@ write_filter_array( struct t_filters *ptr) { int i; - struct t_filter_comment *comment = (struct t_filter_comment *) 0; + struct t_filter_comment *comment; time_t theTime = time(NULL); if (ptr == NULL) @@ -852,15 +839,11 @@ get_choice( do { int y; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - size_t wsize; wchar_t *wbuf; - wsize = mbstowcs(NULL, prompt, 0); - if (wsize != (size_t) (-1)) { - wbuf = my_malloc(sizeof(wchar_t) * (wsize + 1)); - mbstowcs(wbuf, prompt, wsize + 1); + if ((wbuf = char2wchar_t(prompt)) != NULL) { wconvert_to_printable(wbuf); - y = wcswidth(wbuf, wsize + 1); + y = wcswidth(wbuf, wcslen(wbuf) + 1); if (y == -1) /* something went wrong, use wcslen() as fallback */ y = wcslen(wbuf); @@ -957,21 +940,15 @@ fmt_filter_menu_prompt( { char *buf; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - size_t size, wsize; + size_t wsize; wchar_t *wbuf, *wbuf2; - wsize = mbstowcs(NULL, text, 0); - if (wsize != (size_t) (-1)) { - wbuf = my_malloc(sizeof(wchar_t) * (wsize + 1)); + if ((wbuf = char2wchar_t(text)) != NULL) { + wsize = wcslen(wbuf) + 1; /* make sure there is enough space for padding with ' ' */ - wbuf2 = my_malloc(sizeof(wchar_t) * (wsize + len + 1)); - mbstowcs(wbuf, text, wsize + 1); - wcspart(wbuf2, wbuf, len, wsize + len + 1, TRUE); - size = wcstombs(NULL, wbuf2, 0); - if (size != (size_t) (-1)) { - buf = my_malloc(size + 1); - wcstombs(buf, wbuf2, size + 1); - } else { + wbuf2 = my_malloc(sizeof(wchar_t) * (wsize + len)); + wcspart(wbuf2, wbuf, len, wsize + len, TRUE); + if ((buf = wchar_t2char(wbuf2)) == NULL) { /* conversion failed, truncate original string */ buf = my_malloc(len + 1); snprintf(buf, len + 1, "%-*.*s", len, len, text); @@ -1825,9 +1802,11 @@ filter_articles( case 1: SET_FILTER(group, i, j); break; + case -1: error = TRUE; break; + default: break; } @@ -2018,9 +1997,9 @@ wait_message(1, "FILTERED Lines arts[%d] *e++ = ','; skip = TRUE; } - if (*s != ':' && !isspace(*s) && !skip) + if (*s != ':' && !isspace((int) *s) && !skip) *e++ = *s; - if (isspace(*s)) + if (isspace((int) *s)) skip = FALSE; s++; } @@ -2031,9 +2010,11 @@ wait_message(1, "FILTERED Lines arts[%d] case 1: SET_FILTER(group, i, j); break; + case -1: error = TRUE; break; + default: break; } diff -Nurp tin-1.7.4/src/getline.c tin-1.7.5/src/getline.c --- tin-1.7.4/src/getline.c 2004-02-23 11:45:48.000000000 +0100 +++ tin-1.7.5/src/getline.c 2004-06-05 16:34:06.000000000 +0200 @@ -3,7 +3,7 @@ * Module : getline.c * Author : Chris Thewalt & Iain Lea * Created : 1991-11-09 - * Updated : 2004-02-23 + * Updated : 2004-03-14 * Notes : emacs style line editing input package. * Copyright : (c) Copyright 1991-99 by Chris Thewalt & Iain Lea * Permission to use, copy, modify, and distribute this @@ -23,7 +23,6 @@ #endif /* !TCURSES_H */ #define BUF_SIZE 1024 -#define SCROLL 30 #define TABSIZE 4 #define CTRL_A '\001' @@ -540,6 +539,8 @@ gl_fixup( int new_shift; /* value of shift based on cursor */ int extra; /* adjusts when shift (scroll) happens */ int i; + /* FIXME: there are some small problems if SCROLL >= gl_width - 2 */ + int SCROLL = MIN(30, gl_width - 3); if (change == -1 && cursor == 0 && gl_buf[0] == 0) { /* reset */ gl_shift = off_right = off_left = 0; @@ -678,24 +679,27 @@ hist_add( { char *p; char *tmp; -#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - int size = wcstombs(NULL, gl_buf, 0); - tmp = my_malloc(size + 1); - if (wcstombs(tmp, gl_buf, size) == (size_t) -1) { - /* conversation failed */ - free(tmp); + if (w == HIST_NONE) return; - } else - tmp[size] = '\0'; + +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + { + int size = wcstombs(NULL, gl_buf, 0); + + tmp = my_malloc(size + 1); + if (wcstombs(tmp, gl_buf, size) == (size_t) -1) { + /* conversion failed */ + free(tmp); + return; + } else + tmp[size] = '\0'; + } #else tmp = my_strdup(gl_buf); #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ - p = tmp; - - if (w == HIST_NONE) - return; + p = tmp; while (*p == ' ' || *p == '\t') /* only save nonblank line */ p++; diff -Nurp tin-1.7.4/src/group.c tin-1.7.5/src/group.c --- tin-1.7.4/src/group.c 2004-02-23 11:08:32.000000000 +0100 +++ tin-1.7.5/src/group.c 2004-04-07 17:52:31.000000000 +0200 @@ -3,7 +3,7 @@ * Module : group.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-02-21 + * Updated : 2004-03-16 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -70,16 +70,16 @@ static int enter_thread(int depth, t_pag static int group_catchup(int ch); static int group_left(void); static int group_right(void); -static int tab_pressed(void); static int prompt_getart_limit(void); +static int tab_pressed(void); static void build_sline(int i); +static void build_multipart_header(char *dest, int maxlen, const char *src, int cmplen, int have, int total); static void draw_subject_arrow(void); +static void mark_thd_read(struct t_group *group, t_bool range_active); static void show_group_title(t_bool clear_title); static void show_tagged_lines(void); static void toggle_read_unread(t_bool force); static void update_group_page(void); -static void build_multipart_header(char *dest, int maxlen, const char *src, int cmplen, int have, int total); -static void mark_thd_read(struct t_group *group, t_bool range_active); /* * grpmenu.curr is an index into base[] and so equates to the cursor location @@ -149,7 +149,6 @@ group_page( int ch = 0; int i, n, ii; int old_top = 0; - int old_group_top; int ret_code = 0; /* Set to < 0 when it is time to leave this menu */ int thread_depth; /* Starting depth in threads we enter */ long old_artnum = 0L; @@ -202,8 +201,7 @@ group_page( if ((ch = handle_keypad(group_left, group_right, &menukeymap.group_nav)) == iKeySearchRepeat) { ch = i_key_search_last; repeat_search = TRUE; - } - else + } else repeat_search = FALSE; switch (ch) { @@ -279,7 +277,7 @@ group_page( } break; - case iKeySearchAuthF: /* author forward/backward search */ + case iKeySearchAuthF: /* author forward/backward search */ case iKeySearchAuthB: if ((thread_depth = do_search(SEARCH_AUTH, (ch == iKeySearchAuthF), repeat_search)) != 0) ret_code = enter_thread(thread_depth, NULL); @@ -404,15 +402,8 @@ group_page( break; case iKeyGroupGoto: /* choose a new group by name */ - old_group_top = selmenu.max; n = choose_new_group(); if (n >= 0 && n != selmenu.curr) { - /* - * if we added a group, set the length as appropriate - * for the group selection display - */ - if (old_group_top != selmenu.max) - set_groupname_len(FALSE); selmenu.curr = n; ret_code = GRP_ENTER; } @@ -561,12 +552,11 @@ group_page( case iKeyGroupTagParts: /* tag all in order */ if (0 <= grpmenu.curr) { - i = tag_multipart(grpmenu.curr); - /* - * on success, move the pointer to the next - * untagged article just for ease of use's sake - */ - if (i != 0) { + if (tag_multipart(grpmenu.curr) != 0) { + /* + * on success, move the pointer to the next + * untagged article just for ease of use's sake + */ n = grpmenu.curr; update_group_page(); do { @@ -679,13 +669,11 @@ group_page( break; case iKeyGroupMarkArtUnread: /* mark base article of thread unread */ - { + if (grpmenu.curr < 0) + info_message(_(txt_no_arts)); + else { const char *ptr; - if (grpmenu.curr < 0) { - info_message(_(txt_no_arts)); - break; - } if (range_active) { /* * We are tied to following base[] here, not arts[], as we operate on @@ -712,18 +700,15 @@ group_page( draw_line(grpmenu.curr, MAGIC); draw_subject_arrow(); info_message(_(txt_marked_as_unread), ptr); - break; } + break; case iKeyGroupMarkThdUnread: /* mark whole thread as unread */ - { + if (grpmenu.curr < 0) + info_message(_(txt_no_arts)); + else { const char *ptr; - if (grpmenu.curr < 0) { - info_message(_(txt_no_arts)); - break; - } - /* * We process all articles in case the threading changed since * the range was created @@ -748,8 +733,8 @@ group_page( draw_line(grpmenu.curr, MAGIC); draw_subject_arrow(); info_message(_(txt_marked_as_unread), ptr); - break; } + break; case iKeyGroupSelThd: /* mark thread as selected */ case iKeyGroupToggleThdSel: /* toggle thread */ diff -Nurp tin-1.7.4/src/init.c tin-1.7.5/src/init.c --- tin-1.7.4/src/init.c 2004-01-07 11:39:53.000000000 +0100 +++ tin-1.7.5/src/init.c 2004-06-06 20:22:57.000000000 +0200 @@ -3,7 +3,7 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-01-07 + * Updated : 2004-06-06 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -124,7 +124,6 @@ char userid[PATH_LEN]; char rcdir_asfile[PATH_LEN]; /* rcdir expressed as dev:[dir]tin.dir, for stat() */ #endif /* VMS */ -int groupname_len = 0; /* 'runtime' copy of groupname_max_len */ int hist_last[HIST_MAXNUM + 1]; int hist_pos[HIST_MAXNUM + 1]; int i_key_search_last; /* for repeated search */ @@ -413,8 +412,11 @@ struct t_config tinrc = { TRUE, /* default_filter_select_global */ DEFAULT_DATE_FORMAT, /* date_format */ #ifdef HAVE_UNICODE_NORMALIZATION - NORMALIZE_NFKC /* normalization form */ + NORMALIZE_NFKC, /* normalization form */ #endif /* HAVE_UNICODE_NORMALIZATION */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + FALSE /* render_bidi */ +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ }; static mode_t real_umask; diff -Nurp tin-1.7.4/src/lang.c tin-1.7.5/src/lang.c --- tin-1.7.4/src/lang.c 2004-02-23 11:08:53.000000000 +0100 +++ tin-1.7.5/src/lang.c 2004-06-06 20:22:50.000000000 +0200 @@ -3,7 +3,7 @@ * Module : lang.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-02-21 + * Updated : 2004-06-06 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -1341,52 +1341,52 @@ struct opttxt txt_filtering_options = { struct opttxt txt_beginner_level = { N_(" toggles, sets, cancels."), - N_("Show mini menu & posting etiquette :"), + N_("Show mini menu & posting etiquette"), N_("# If ON show a mini menu of useful commands at each level\n\ # and posting etiquette after composing an article\n") }; struct opttxt txt_show_description = { N_("Show short description for each newsgroup. toggles & sets."), - N_("Show description of each newsgroup :"), + N_("Show description of each newsgroup"), N_("# If ON show group description text after newsgroup name at\n\ # group selection level\n") }; struct opttxt txt_show_author = { N_("Show Subject & From (author) fields in group menu. toggles & sets."), - N_("In group menu, show author by :"), + N_("In group menu, show author by"), N_("# Part of from field to display 0) none 1) address 2) full name 3) both\n") }; struct opttxt txt_draw_arrow = { N_("Draw -> or highlighted bar for selection. toggles & sets."), - N_("Draw -> instead of highlighted bar :"), + N_("Draw -> instead of highlighted bar"), N_("# If ON use -> otherwise highlighted bar for selection\n") }; struct opttxt txt_inverse_okay = { N_(" toggles, sets, cancels."), - N_("Use inverse video for page headers :"), + N_("Use inverse video for page headers"), N_("# If ON use inverse video for page headers at different levels\n") }; struct opttxt txt_thread_articles = { N_(" toggles, sets, cancels."), - N_("Thread articles by :"), + N_("Thread articles by"), N_("# Thread articles on 0=(nothing) 1=(Subject) 2=(References) 3=(Both)\n\ # 4=(Multipart Subject).\n") }; struct opttxt txt_thread_score = { N_(" toggles, sets, cancels."), - N_("Score of a thread :"), + N_("Score of a thread"), N_("# Thread score 0=(Max) 1=(Sum) 2=(Average)\n") }; struct opttxt txt_sort_article_type = { N_("Sort articles by Subject, From, Date or Score. toggles & sets."), - N_("Sort articles by :"), + N_("Sort articles by"), N_("# 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") @@ -1394,31 +1394,31 @@ struct opttxt txt_sort_article_type = { struct opttxt txt_sort_threads_type = { N_("Sort threads by Nothing or Score. toggles & sets."), - N_("Sort threads by :"), + N_("Sort threads by"), N_("# Sort thread by 0=(nothing) 1=(Score descend) 2=(Score ascend)\n") }; struct opttxt txt_pos_first_unread = { N_("Put cursor at first/last unread art in groups. toggles & sets."), - N_("Goto first unread article in group :"), + N_("Goto first unread article in group"), N_("# If ON put cursor at first unread art in group otherwise last art\n") }; struct opttxt txt_show_only_unread_arts = { N_("Show all articles or only unread articles. toggles & sets."), - N_("Show only unread articles :"), + N_("Show only unread articles"), N_("# If ON show only new/unread articles otherwise show all.\n") }; struct opttxt txt_show_only_unread_groups = { N_(" toggles, sets, cancels."), - N_("Show only groups with unread arts :"), + N_("Show only groups with unread arts"), N_("# If ON show only subscribed to groups that contain unread articles.\n") }; struct opttxt txt_kill_level = { N_(" toggles, sets, cancels."), - N_("Filter which articles :"), + N_("Filter which articles"), N_("# 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") @@ -1426,109 +1426,109 @@ struct opttxt txt_kill_level = { struct opttxt txt_tab_goto_next_unread = { N_(" toggles, sets, cancels."), - N_("Tab goes to next unread article :"), + N_("Tab goes to next unread article"), N_("# If ON the TAB command will go to next unread article at article viewer level\n") }; struct opttxt txt_space_goto_next_unread = { N_("Scrolling with past the end of an art. jumps to the next unread one."), - N_("Space goes to next unread article :"), + N_("Space goes to next unread article"), N_("# 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") }; struct opttxt txt_pgdn_goto_next = { N_("Scrolling with / past the end of an art. jumps to the unread one."), - N_("PgDn goes to next unread article :"), + N_("PgDn goes to next unread article"), N_("# If ON the PGDN or DOWN command will go to next unread article when\n\ # pressed at end of message\n") }; struct opttxt txt_auto_list_thread = { N_(" toggles, sets, cancels."), - N_("List thread using right arrow key :"), + N_("List thread using right arrow key"), N_("# If ON automatically list thread when entering it using right arrow key.\n") }; struct opttxt txt_art_marked_deleted = { N_("Enter character to indicate deleted articles. sets, cancels."), - N_("Character to show deleted articles :"), + N_("Character to show deleted articles"), N_("# Character used to show that an art was deleted (default 'D')\n\ # _ is turned into ' '\n") }; struct opttxt txt_art_marked_inrange = { N_("Enter character to indicate articles in a range. sets, cancels."), - N_("Character to show inrange articles :"), + N_("Character to show inrange articles"), N_("# Character used to show that an art is in a range (default '#')\n\ # _ is turned into ' '\n") }; struct opttxt txt_art_marked_return = { N_("Enter character to indicate that article will return. sets, cancels."), - N_("Character to show returning arts :"), + N_("Character to show returning arts"), N_("# Character used to show that an art will return (default '-')\n\ # _ is turned into ' '\n") }; struct opttxt txt_art_marked_selected = { N_("Enter character to indicate selected articles. sets, cancels."), - N_("Character to show selected articles:"), + N_("Character to show selected articles"), N_("# Character used to show that an art was auto-selected (default '*')\n\ # _ is turned into ' '\n") }; struct opttxt txt_art_marked_recent = { N_("Enter character to indicate recent articles. sets, cancels."), - N_("Character to show recent articles :"), + N_("Character to show recent articles"), N_("# Character used to show that an art is recent (default 'o')\n\ # _ is turned into ' '\n") }; struct opttxt txt_art_marked_unread = { N_("Enter character to indicate unread articles. sets, cancels."), - N_("Character to show unread articles :"), + N_("Character to show unread articles"), N_("# Character used to show that an art is unread (default '+')\n\ # _ is turned into ' '\n") }; struct opttxt txt_art_marked_read = { N_("Enter character to indicate read articles. sets, cancels."), - N_("Character to show read articles :"), + N_("Character to show read articles"), N_("# Character used to show that an art was read (default ' ')\n\ # _ is turned into ' '\n") }; struct opttxt txt_art_marked_killed = { N_("Enter character to indicate killed articles. sets, cancels."), - N_("Character to show killed articles :"), + N_("Character to show killed articles"), N_("# Character used to show that an art was killed (default 'K')\n\ # kill_level must be set accordingly, _ is turned into ' '\n") }; struct opttxt txt_art_marked_read_selected = { N_("Enter character to indicate read selected articles. sets, cancels."), - N_("Character to show readselected arts:"), + N_("Character to show readselected arts"), N_("# Character used to show that an art was selected before read (default ':')\n\ # kill_level must be set accordingly, _ is turned into ' '\n") }; struct opttxt txt_groupname_max_length = { N_("Enter maximum length of newsgroup names displayed. sets."), - N_("Max. length of group names shown :"), + N_("Max. length of group names shown"), N_("# Maximum length of the names of newsgroups displayed\n") }; struct opttxt txt_show_info = { N_(" toggles, sets, cancels."), - N_("Show lines/score in listings :"), + N_("Show lines/score in listings"), N_("# What informations should be displayed in article/thread listing\n\ # 0 = nothing, 1 = lines, 2 = score, 3 = lines & score\n") }; struct opttxt txt_scroll_lines = { N_("0 = full page scrolling, -1 = show previous last line as first on next page, -2 = half page"), - N_("Number of lines to scroll in pager :"), + N_("Number of lines to scroll in pager"), N_("# 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\ @@ -1537,13 +1537,13 @@ struct opttxt txt_scroll_lines = { struct opttxt txt_show_signatures = { N_("Display signatures. toggles & sets."), - N_("Display signatures :"), + N_("Display signatures"), N_("# If OFF don't show signatures when displaying articles\n") }; struct opttxt txt_hide_uue = { N_("Display uuencoded data as tagged attachments. toggles & sets."), - N_("Display uue data as an attachment :"), + N_("Display uue data as an attachment"), N_("# 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\ @@ -1554,14 +1554,14 @@ struct opttxt txt_hide_uue = { struct opttxt txt_tex2iso_conv = { N_("Decode German style TeX umlaut codes to ISO. toggles & sets."), - N_("Display \"a as Umlaut-a :"), + N_("Display \"a as Umlaut-a"), N_("# If ON decode German style TeX umlaut codes to ISO and\n\ # show \"a as Umlaut-a, etc.\n") }; struct opttxt txt_news_headers_to_display = { N_("Space separated list of header fields"), - N_("Display these header fields (or *) :"), + N_("Display these header fields (or *)"), N_("# 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\ @@ -1571,7 +1571,7 @@ struct opttxt txt_news_headers_to_displa struct opttxt txt_news_headers_to_not_display = { N_("Space separated list of header fields"), - N_("Do not display these header fields :"), + N_("Do not display these header fields"), N_("# 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 you\n\ @@ -1583,14 +1583,14 @@ struct opttxt txt_news_headers_to_not_di struct opttxt txt_alternative_handling = { N_("Do you want to enable automatic handling of multipart/alternative articles?"), - N_("Skip multipart/alternative parts :"), + N_("Skip multipart/alternative parts"), N_("# If ON strip multipart/alternative messages automatically\n") }; #ifdef HAVE_COLOR struct opttxt txt_quote_regex = { N_("A regex used to decide which lines to show in col_quote."), - N_("Regex used to show quoted lines :"), + N_("Regex used to show quoted lines"), N_("# 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") @@ -1598,7 +1598,7 @@ struct opttxt txt_quote_regex = { struct opttxt txt_quote_regex2 = { N_("A regex used to decide which lines to show in col_quote2."), - N_("Regex used to show twice quoted l. :"), + N_("Regex used to show twice quoted l."), N_("# 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") @@ -1606,7 +1606,7 @@ struct opttxt txt_quote_regex2 = { struct opttxt txt_quote_regex3 = { N_("A regex used to decide which lines to show in col_quote3."), - N_("Regex used to show >= 3 times q.l. :"), + N_("Regex used to show >= 3 times q.l."), N_("# 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") @@ -1615,7 +1615,7 @@ struct opttxt txt_quote_regex3 = { struct opttxt txt_slashes_regex = { N_("A regex used to decide which words to show in col_markslashes."), - N_("Regex used to highlight /slashes/ :"), + N_("Regex used to highlight /slashes/"), N_("# 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") @@ -1623,7 +1623,7 @@ struct opttxt txt_slashes_regex = { struct opttxt txt_stars_regex = { N_("A regex used to decide which words to show in col_markstars."), - N_("Regex used to highlight *stars* :"), + N_("Regex used to highlight *stars*"), N_("# 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") @@ -1631,7 +1631,7 @@ struct opttxt txt_stars_regex = { struct opttxt txt_strokes_regex = { N_("A regex used to decide which words to show in col_markstroke."), - N_("Regex used to highlight -strokes- :"), + N_("Regex used to highlight -strokes-"), N_("# 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") @@ -1639,7 +1639,7 @@ struct opttxt txt_strokes_regex = { struct opttxt txt_underscores_regex = { N_("A regex used to decide which words to show in col_markdash."), - N_("Regex used to highlight _underline_:"), + N_("Regex used to highlight _underline_"), N_("# 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") @@ -1647,21 +1647,21 @@ struct opttxt txt_underscores_regex = { struct opttxt txt_strip_re_regex = { N_("A regex used to find Subject prefixes to remove. Use '|' as separator."), - N_("Regex with Subject prefixes :"), + N_("Regex with Subject prefixes"), N_("# A regular expression that tin will use to find Subject prefixes\n\ # which will be removed before showing the header.\n") }; struct opttxt txt_strip_was_regex = { N_("A regex used to find Subject suffixes to remove. Use '|' as separator."), - N_("Regex with Subject suffixes :"), + N_("Regex with Subject suffixes"), N_("# A regular expression that tin will use to find Subject suffixes\n\ # which will be removed when replying or posting followup.\n") }; struct opttxt txt_metamail_prog = { N_("Enter name and options for external MIME viewer, --internal for built-in viewer"), - N_("MIME binary content viewer :"), + N_("MIME binary content viewer"), N_("# 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\ @@ -1670,108 +1670,108 @@ struct opttxt txt_metamail_prog = { struct opttxt txt_ask_for_metamail = { N_("Confirm before starting non-text viewing program"), - N_("Ask before using MIME viewer :"), + N_("Ask before using MIME viewer"), N_("# If ON tin will ask before using metamail to display MIME messages\n\ # this only happens if metamail_prog is set to something\n") }; struct opttxt txt_catchup_read_groups = { N_("Ask to mark groups read when quitting. toggles & sets."), - N_("Catchup read groups when quitting :"), + N_("Catchup read groups when quitting"), N_("# If ON ask user if read groups should all be marked read\n") }; struct opttxt txt_group_catchup_on_exit = { N_(" toggles, sets, cancels."), - N_("Catchup group using left key :"), + N_("Catchup group using left key"), N_("# If ON catchup group/thread when leaving with the left arrow key.\n") }; struct opttxt txt_thread_catchup_on_exit = { N_(" toggles, sets, cancels."), - N_("Catchup thread by using left key :"), + N_("Catchup thread by using left key"), "" }; struct opttxt txt_confirm_choice = { N_(" toggles, sets, cancels."), - N_("Which actions require confirmation :"), + N_("Which actions require confirmation"), N_("# What should we ask confirmation for.\n") }; struct opttxt txt_mark_ignore_tags = { N_(" toggles, sets, cancels."), - N_("'Mark article read' ignores tags :"), + N_("'Mark article read' ignores tags"), N_("# If ON the 'Mark article read' function marks only the current article.\n") }; struct opttxt txt_url_handler = { N_("Program to run to open URL's, sets, cancels."), - N_("Program that opens URL's :"), + N_("Program that opens URL's"), N_("# The program used to open URL's. The actual URL will be appended\n") }; struct opttxt txt_use_mouse = { N_(" toggles, sets, cancels."), - N_("Use mouse in xterm :"), + N_("Use mouse in xterm"), N_("# If ON enable mouse key support on xterm terminals\n") }; #ifdef HAVE_KEYPAD struct opttxt txt_use_keypad = { N_(" toggles, sets, cancels."), - N_("Use scroll keys on keypad :"), + N_("Use scroll keys on keypad"), N_("# If ON enable scroll keys on terminals that support it\n") }; #endif /* HAVE_KEYPAD */ struct opttxt txt_getart_limit = { N_("Enter maximum number of article to get. sets."), - N_("Number of articles to get :"), + N_("Number of articles to get"), N_("# 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") }; struct opttxt txt_recent_time = { N_("Enter number of days article is considered recent. sets."), - N_("Article recentness time limit :"), + N_("Article recentness time limit"), N_("# Number of days in which article is considered recent, (0=OFF)\n") }; struct opttxt txt_wildcard = { N_("WILDMAT for normal wildcards, REGEX for full regular expression matching."), - N_("Wildcard matching :"), + N_("Wildcard matching"), N_("# Wildcard matching 0=(wildmat) 1=(regex)\n") }; struct opttxt txt_score_limit_kill = { N_("Enter minimal score before an article is marked killed. sets."), - N_("Score limit (kill) :"), + N_("Score limit (kill)"), N_("# Score limit before an article is marked killed\n") }; struct opttxt txt_score_kill = { N_("Enter default score to kill articles. sets."), - N_("Default score to kill articles :"), + N_("Default score to kill articles"), N_("# Default score to kill articles\n") }; struct opttxt txt_score_limit_select = { N_("Enter minimal score before an article is marked hot. sets."), - N_("Score limit (select) :"), + N_("Score limit (select)"), N_("# Score limit before an article is marked hot\n") }; struct opttxt txt_score_select = { N_("Enter default score to select articles. sets."), - N_("Default score to select articles :"), + N_("Default score to select articles"), N_("# Default score to select articles\n") }; #ifdef XFACE_ABLE struct opttxt txt_use_slrnface = { N_(" toggles, sets, cancels."), - N_("Use slrnface to show ''X-Face:''s :"), + N_("Use slrnface to show ''X-Face:''s"), N_("# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n\ # Only useful when running in an xterm.\n") }; @@ -1780,153 +1780,153 @@ struct opttxt txt_use_slrnface = { #ifdef HAVE_COLOR struct opttxt txt_use_color = { N_(" toggles, sets, cancels."), - N_("Use ANSI color :"), + N_("Use ANSI color"), N_("# If ON using ANSI-color\n") }; struct opttxt txt_col_normal = { N_(" toggles, sets, cancels."), - N_("Standard foreground color :"), + N_("Standard foreground color"), N_("# Standard foreground color\n") }; struct opttxt txt_col_back = { N_(" toggles, sets, cancels."), - N_("Standard background color :"), + N_("Standard background color"), N_("# Standard-Background-Color\n") }; struct opttxt txt_col_invers_bg = { N_(" toggles, sets, cancels."), - N_("Color for inverse text (background):"), + N_("Color for inverse text (background)"), N_("# Color of background for inverse text\n") }; struct opttxt txt_col_invers_fg = { N_(" toggles, sets, cancels."), - N_("Color for inverse text (foreground):"), + N_("Color for inverse text (foreground)"), N_("# Color of foreground for inverse text\n") }; struct opttxt txt_col_text = { N_(" toggles, sets, cancels."), - N_("Color of text lines :"), + N_("Color of text lines"), N_("# Color of text-lines\n") }; struct opttxt txt_col_minihelp = { N_(" toggles, sets, cancels."), - N_("Color of mini help menu :"), + N_("Color of mini help menu"), N_("# Color of mini help menu\n") }; struct opttxt txt_col_help = { N_(" toggles, sets, cancels."), - N_("Color of help text :"), + N_("Color of help text"), N_("# Color of help pages\n") }; struct opttxt txt_col_message = { N_(" toggles, sets, cancels."), - N_("Color of status messages :"), + N_("Color of status messages"), N_("# Color of messages in last line\n") }; struct opttxt txt_col_quote = { N_(" toggles, sets, cancels."), - N_("Color of quoted lines :"), + N_("Color of quoted lines"), N_("# Color of quote-lines\n") }; struct opttxt txt_col_quote2 = { N_(" toggles, sets, cancels."), - N_("Color of twice quoted line :"), + N_("Color of twice quoted line"), N_("# Color of twice quoted lines\n") }; struct opttxt txt_col_quote3 = { N_(" toggles, sets, cancels."), - N_("Color of =>3 times quoted line :"), + N_("Color of =>3 times quoted line"), N_("# Color of >=3 times quoted lines\n") }; struct opttxt txt_col_head = { N_(" toggles, sets, cancels."), - N_("Color of article header lines :"), + N_("Color of article header lines"), N_("# Color of header-lines\n") }; struct opttxt txt_col_newsheaders = { N_(" toggles, sets, cancels."), - N_("Color of actual news header fields :"), + N_("Color of actual news header fields"), N_("# Color of actual news header fields\n") }; struct opttxt txt_col_subject = { N_(" toggles, sets, cancels."), - N_("Color of article subject lines :"), + N_("Color of article subject lines"), N_("# Color of article subject\n") }; struct opttxt txt_col_response = { N_(" toggles, sets, cancels."), - N_("Color of response counter :"), + N_("Color of response counter"), N_("# Color of response counter\n") }; struct opttxt txt_col_from = { N_(" toggles, sets, cancels."), - N_("Color of sender (From:) :"), + N_("Color of sender (From:)"), N_("# Color of sender (From:)\n") }; struct opttxt txt_col_title = { N_(" toggles, sets, cancels."), - N_("Color of help/mail sign :"), + N_("Color of help/mail sign"), N_("# Color of Help/Mail-Sign\n") }; struct opttxt txt_col_signature = { N_(" toggles, sets, cancels."), - N_("Color of signatures :"), + N_("Color of signatures"), N_("# Color of signature\n") }; struct opttxt txt_col_urls = { N_(" toggles, sets, cancels."), - N_("Color of highlighted URLs :"), + N_("Color of highlighted URLs"), N_("# Color of highlighted URLs\n") }; struct opttxt txt_col_markstar = { N_(" toggles, sets, cancels."), - N_("Color of highlighting with *stars* :"), + N_("Color of highlighting with *stars*"), N_("# Color of word highlighting. There are four possibilities\n\ # in articles: *stars*, /slashes/, _underdashes_ and -strokes-.\n") }; struct opttxt txt_col_markdash = { N_(" toggles, sets, cancels."), - N_("Color of highlighting with _dash_ :"), + N_("Color of highlighting with _dash_"), "" }; struct opttxt txt_col_markslash = { N_(" toggles, sets, cancels."), - N_("Color of highlighting with /slash/ :"), + N_("Color of highlighting with /slash/"), "" }; struct opttxt txt_col_markstroke = { N_(" toggles, sets, cancels."), - N_("Color of highlighting with -stroke-:"), + N_("Color of highlighting with -stroke-"), "" }; #endif /* HAVE_COLOR */ struct opttxt txt_mono_markstar = { N_(" toggles, sets, cancels."), - N_("Attr. of highlighting with *stars* :"), + N_("Attr. of highlighting with *stars*"), N_("# Attribute of word highlighting on mono terminals.\n\ # There are four possibilities in articles:\n\ # *stars*, /slashes/, _underdashes_ and -strokes-.\n\ @@ -1937,37 +1937,37 @@ struct opttxt txt_mono_markstar = { struct opttxt txt_mono_markdash = { N_(" toggles, sets, cancels."), - N_("Attr. of highlighting with _dash_ :"), + N_("Attr. of highlighting with _dash_"), "" }; struct opttxt txt_mono_markslash = { N_(" toggles, sets, cancels."), - N_("Attr. of highlighting with /slash/ :"), + N_("Attr. of highlighting with /slash/"), "" }; struct opttxt txt_mono_markstroke = { N_(" toggles, sets, cancels."), - N_("Attr. of highlighting with -stroke-:"), + N_("Attr. of highlighting with -stroke-"), "" }; struct opttxt txt_url_highlight = { N_(" toggles, sets, cancels."), - N_("URL highlighting in message body :"), + 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 :"), + N_("Word highlighting in message body"), N_("# Enable word highlighting?\n") }; struct opttxt txt_word_h_display_marks = { N_(" toggles, sets, cancels."), - N_("What to display instead of mark :"), + N_("What to display instead of mark"), N_("# 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") @@ -1975,31 +1975,31 @@ struct opttxt txt_word_h_display_marks = struct opttxt txt_wrap_column = { N_("Enter column number to wrap article lines to in the pager. sets."), - N_("Page line wrap column :"), + N_("Page line wrap column"), N_("# Wrap article lines at column\n") }; struct opttxt txt_wrap_on_next_unread = { N_(" toggles, sets, cancels."), - N_("Wrap around threads on next unread :"), + N_("Wrap around threads on next unread"), N_("# If ON wrap around threads on searching next unread article\n") }; struct opttxt txt_mail_address = { N_("Enter default mail address (and fullname). sets."), - N_("Mail address (and fullname) :"), + N_("Mail address (and fullname)"), N_("# User's mail address (and fullname), if not username@host (fullname)\n") }; struct opttxt txt_prompt_followupto = { N_(" toggles, sets, cancels."), - N_("Show empty Followup-To in editor :"), + N_("Show empty Followup-To in editor"), N_("# If ON show empty Followup-To header when editing an article\n") }; struct opttxt txt_sigfile = { N_("Enter path/! command/--none to create your default signature. sets."), - N_("Create signature from path/command :"), + N_("Create signature from path/command"), N_("# 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 signature\n\ @@ -2008,26 +2008,26 @@ struct opttxt txt_sigfile = { struct opttxt txt_sigdashes = { N_("Prepend signature with \"-- \" on own line. toggles & sets."), - N_("Prepend signature with \"-- \" :"), + N_("Prepend signature with \"-- \""), N_("# If ON prepend the signature with dashes '\\n-- \\n'\n") }; struct opttxt txt_signature_repost = { N_("Add signature when reposting articles. toggles & sets."), - N_("Add signature when reposting :"), + N_("Add signature when reposting"), N_("# If ON add signature to reposted articles\n") }; struct opttxt txt_quote_chars = { N_("Enter quotation marks, %s or %S for author's initials."), - N_("Characters used as quote-marks :"), + N_("Characters used as quote-marks"), N_("# Characters used in quoting to followups and replies.\n\ # '_' is replaced by ' ', %%s, %%S are replaced by author's initials.\n") }; struct opttxt txt_quote_style = { N_(" toggles, sets, cancels."), - N_("Quoting behavior :"), + N_("Quoting behavior"), N_("# How quoting should be handled when following up or replying.\n\ # 0 = Nothing special\n\ # 1 = Compress quotes\n\ @@ -2041,7 +2041,7 @@ struct opttxt txt_quote_style = { struct opttxt txt_news_quote_format = { N_("%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name"), - N_("Quote line when following up :"), + N_("Quote line when following up"), N_("# 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") @@ -2049,25 +2049,25 @@ struct opttxt txt_news_quote_format = { struct opttxt txt_xpost_quote_format = { N_("%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name"), - N_("Quote line when cross-posting :"), + N_("Quote line when cross-posting"), "" }; struct opttxt txt_mail_quote_format = { N_("%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name"), - N_("Quote line when mailing :"), + N_("Quote line when mailing"), "" }; struct opttxt txt_advertising = { N_("If ON, include User-Agent: header. toggles & sets."), - N_("Insert 'User-Agent:'-header :"), + N_("Insert 'User-Agent:'-header"), N_("# If ON include advertising User-Agent: header\n") }; struct opttxt txt_mm_charset = { N_("Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set."), - N_("MM_CHARSET :"), + N_("MM_CHARSET"), N_("# 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\ @@ -2079,20 +2079,20 @@ struct opttxt txt_mm_charset = { #ifdef CHARSET_CONVERSION struct opttxt txt_mm_network_charset = { N_(" toggles, sets, cancels."), - N_("MM_NETWORK_CHARSET :"), + N_("MM_NETWORK_CHARSET"), N_("# Charset used for MIME (Content-Type) header in postings.\n") }; #endif /* CHARSET_CONVERSION */ struct opttxt txt_mailbox_format = { N_(" toggles, sets, cancels."), - N_("Mailbox format :"), + N_("Mailbox format"), N_("# Format of the mailbox.\n") }; struct opttxt txt_post_mime_encoding = { N_(" toggles, sets, cancels."), - N_("MIME encoding in news messages :"), + N_("MIME encoding in news messages"), N_("# 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\ @@ -2102,7 +2102,7 @@ struct opttxt txt_post_mime_encoding = { struct opttxt txt_post_8bit_header = { N_("Don't change unless you know what you are doing. cancels."), - N_("Use 8bit characters in news headers:"), + N_("Use 8bit characters in news headers"), N_("# 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\ @@ -2111,19 +2111,19 @@ struct opttxt txt_post_8bit_header = { struct opttxt txt_post_process_view = { N_("Auto-view post-processed files toggles, sets, cancels."), - N_("View post-processed files :"), + N_("View post-processed files"), N_("# If set, post processed files will be opened in a viewer\n") }; struct opttxt txt_mail_mime_encoding = { N_(" toggles, sets, cancels."), - N_("MIME encoding in mail messages :"), + N_("MIME encoding in mail messages"), "" }; struct opttxt txt_mail_8bit_header = { N_("Don't change unless you know what you are doing. cancels."), - N_("Use 8bit characters in mail headers:"), + N_("Use 8bit characters in mail headers"), N_("# 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 parameter\n\ @@ -2134,14 +2134,14 @@ struct opttxt txt_mail_8bit_header = { struct opttxt txt_strip_blanks = { N_(" toggles, sets, cancels."), - N_("Strip blanks from ends of lines :"), + N_("Strip blanks from ends of lines"), N_("# If ON strip blanks from ends of lines for faster display on slow terminals.\n") }; #ifdef HAVE_ICONV_OPEN_TRANSLIT struct opttxt txt_translit = { N_("If ON, use transliteration. toggles & sets."), - N_("Transliteration :"), + N_("Transliteration"), N_("# 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") @@ -2150,123 +2150,123 @@ struct opttxt txt_translit = { struct opttxt txt_auto_cc = { N_("Send you a carbon copy automatically. toggles & sets."), - N_("Send you a cc automatically :"), + N_("Send you a cc automatically"), N_("# If ON automatically put your name in the Cc: field when mailing an article\n") }; struct opttxt txt_auto_bcc = { N_("Send you a blind carbon copy automatically. toggles & sets."), - N_("Send you a blind cc automatically :"), + N_("Send you a blind cc automatically"), N_("# If ON automatically put your name in the Bcc: field when mailing an article\n") }; struct opttxt txt_spamtrap_warning_addresses = { N_("Enter address elements about which you want to be warned. sets."), - N_("Spamtrap warning address parts :"), + N_("Spamtrap warning address parts"), N_("# A comma-delimited list of address-parts you want to be warned\n\ # about when trying to reply by email.\n") }; struct opttxt txt_filter_days = { N_("Enter default number of days a filter entry will be valid. sets."), - N_("No. of days a filter entry is valid:"), + N_("No. of days a filter entry is valid"), N_("# Number of days a short term filter will be active\n") }; struct opttxt txt_add_posted_to_filter = { N_("Add posted articles to filter. toggles & sets."), - N_("Add posted articles to filter :"), + N_("Add posted articles to filter"), N_("# If ON add posted articles which start a new thread to filter for\n# highlighting follow-ups\n") }; struct opttxt txt_maildir = { N_("The directory where articles/threads are to be saved in mailbox format."), - N_("Mail directory :"), + N_("Mail directory"), N_("# (-m) directory where articles/threads are saved in mailbox format\n") }; struct opttxt txt_batch_save = { N_(" toggles, sets, cancels."), - N_("Save articles in batch mode (-S) :"), + N_("Save articles in batch mode (-S)"), N_("# 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") }; struct opttxt txt_savedir = { N_("The directory where you want articles/threads saved."), - N_("Directory to save arts/threads in :"), + N_("Directory to save arts/threads in"), N_("# Directory where articles/threads are saved\n") }; struct opttxt txt_auto_save = { N_("Auto save article/thread by Archive-name: header. toggles & sets."), - N_("Use Archive-name: header for save :"), + N_("Use Archive-name: header for save"), N_("# If ON articles/threads with Archive-name: in mail header will\n\ # be automatically saved with the Archive-name & part/patch no.\n") }; struct opttxt txt_mark_saved_read = { N_("Mark saved articles/threads as read. toggles, sets, cancels."), - N_("Mark saved articles/threads as read:"), + N_("Mark saved articles/threads as read"), N_("# If ON mark articles that are saved as read\n") }; struct opttxt txt_post_process = { N_("Do post processing (eg. extract attachments) for saved articles."), - N_("Post process saved articles :"), + N_("Post process saved articles"), N_("# Perform post processing (saving binary attachments) from saved articles.\n\ # 0=(no) 1=(yes) 2=(extract shell archives (shar) only)\n") }; struct opttxt txt_process_only_unread = { N_(" toggles, sets, cancels."), - N_("Process only unread articles :"), + N_("Process only unread articles"), N_("# If ON only save/print/pipe/mail unread articles (tagged articles excepted)\n") }; #ifndef DISABLE_PRINTING struct opttxt txt_print_header = { N_("Print all or just part of header. toggles & sets."), - N_("Print all headers when printing :"), + N_("Print all headers when printing"), N_("# If ON print all of article header otherwise just the important lines\n") }; struct opttxt txt_printer = { N_("The printer program with options that is to be used to print articles/threads."), - N_("Printer program with options :"), + N_("Printer program with options"), N_("# Print program with parameters used to print articles/threads\n"), }; #endif /* !DISABLE_PRINTING */ struct opttxt txt_force_screen_redraw = { N_(" toggles, sets, cancels."), - N_("Force redraw after certain commands:"), + N_("Force redraw after certain commands"), N_("# If ON a screen redraw will always be done after certain external commands\n") }; struct opttxt txt_start_editor_offset = { N_("Start editor with line offset. toggles, sets, cancels."), - N_("Start editor with line offset :"), + N_("Start editor with line offset"), N_("# If ON editor will be started with cursor offset into the file\n\ # otherwise the cursor will be positioned at the first line\n") }; struct opttxt txt_editor_format = { N_("Enter %E for editor, %F for filename, %N for line-number, to set."), - N_("Invocation of your editor :"), + N_("Invocation of your editor"), N_("# Format of editor line including parameters\n\ # %%E Editor %%F Filename %%N Linenumber\n") }; struct opttxt txt_inews_prog = { N_("Enter name and options for external-inews, --internal for internal inews"), - N_("External inews :"), + N_("External inews"), N_("# If --internal use the built in mini inews for posting via NNTP\n# otherwise use an external inews program\n"), }; struct opttxt txt_mailer_format = { N_("Enter %M for mailer, %S for subject, %T for to, %F for filename, to set."), - N_("Invocation of your mail command :"), + N_("Invocation of your mail command"), N_("# Format of mailer line including parameters\n\ # %%M Mailer %%S Subject %%T To %%F Filename\n\ # ie. to use elm as your mailer: elm -s \"%%S\" \"%%T\" < %%F\n\ @@ -2275,7 +2275,7 @@ struct opttxt txt_mailer_format = { struct opttxt txt_interactive_mailer = { N_(" toggles, sets, cancels."), - N_("Use interactive mail reader :"), + N_("Use interactive mail reader"), N_("# Interactive mailreader:\n\ # 0 = no interactive mailreader\n\ # 1 = use interactive mailreader with headers in file\n\ @@ -2284,64 +2284,71 @@ struct opttxt txt_interactive_mailer = { struct opttxt txt_unlink_article = { N_(" toggles, sets, cancels."), - N_("Remove ~/.article after posting :"), + N_("Remove ~/.article after posting"), N_("# If ON remove ~/.article after posting.\n") }; struct opttxt txt_posted_articles_file = { N_("Filename for all posted articles, sets, no filename=do not save."), - N_("Filename for posted articles :"), + N_("Filename for posted articles"), N_("# Filename where to keep all postings (default posted)\n\ # If no filename is set then postings will not be saved\n") }; struct opttxt txt_keep_dead_articles = { N_("Keep all failed articles in ~/dead.articles. toggles & sets."), - N_("Keep failed arts in ~/dead.articles:"), + N_("Keep failed arts in ~/dead.articles"), N_("# If ON keep all failed postings in ~/dead.articles\n") }; struct opttxt txt_strip_newsrc = { N_("Do you want to strip unsubscribed groups from .newsrc"), - N_("No unsubscribed groups in newsrc :"), + N_("No unsubscribed groups in newsrc"), N_("# If ON strip unsubscribed groups from newsrc\n") }; struct opttxt txt_strip_bogus = { N_(" toggles, sets, cancels."), - N_("Remove bogus groups from newsrc :"), + N_("Remove bogus groups from newsrc"), N_("# What to do with bogus groups in newsrc file\n# 0=(Keep) 1=(Remove) 2=(Highlight with D on selection screen).\n") }; struct opttxt txt_reread_active_file_secs = { N_("Enter number of seconds until active file will be reread. sets."), - N_("Interval in secs to reread active :"), + N_("Interval in secs to reread active"), N_("# Time interval in seconds between rereading the active file (0=never)\n") }; struct opttxt txt_auto_reconnect = { N_(" toggles, sets, cancels."), - N_("Reconnect to server automatically :"), + N_("Reconnect to server automatically"), N_("# If ON automatically reconnect to NNTP server if the connection is broken\n") }; struct opttxt txt_cache_overview_files = { N_("Create local copies of NNTP overview files. toggles & sets."), - N_("Cache NNTP overview files locally :"), + N_("Cache NNTP overview files locally"), N_("# If ON, create local copies of NNTP overview files.\n") }; struct opttxt txt_date_format = { N_("Enter format string. sets, cancels."), - N_("Format string for display of dates :"), + N_("Format string for display of dates"), N_("# Format string for date representation\n") }; #ifdef HAVE_UNICODE_NORMALIZATION struct opttxt txt_normalization_form = { N_(" toggles, sets, cancels."), - N_("Unicode normalization form :"), + N_("Unicode normalization form"), N_("# Unicode normalization form\n\ # 0 = None, 1 = NFKC, 2 = NFKD, 3 = NFC, 4 = NFD\n") }; #endif /* HAVE_UNICODE_NORMALIZATION */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) +struct opttxt txt_render_bidi = { + N_(" toggles, sets, cancels."), + N_("Render BiDi"), + N_("# If ON, bi-directional text is rendered by tin\n") +}; +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ diff -Nurp tin-1.7.4/src/lock.c tin-1.7.5/src/lock.c --- tin-1.7.4/src/lock.c 2003-12-28 15:19:49.000000000 +0100 +++ tin-1.7.5/src/lock.c 2004-03-09 10:55:44.000000000 +0100 @@ -219,16 +219,15 @@ t_bool dot_lock( char tempfile[PATH_LEN]; char lockfile[PATH_LEN]; char base_dir[PATH_LEN]; - int dot_fd = -1; + int dot_fd; struct stat statbuf; t_bool rval = FALSE; dir_name(filename, base_dir); if (!strcmp(filename, base_dir)) /* no filename portion */ return rval; - if ((dot_fd = my_tmpfile(tempfile, sizeof(tempfile) - 1, TRUE, base_dir)) == -1) { + if ((dot_fd = my_tmpfile(tempfile, sizeof(tempfile) - 1, TRUE, base_dir)) == -1) return rval; - } snprintf(lockfile, sizeof(lockfile), "%s%s", filename, LOCK_SUFFIX); #ifdef HAVE_LINK diff -Nurp tin-1.7.4/src/mail.c tin-1.7.5/src/mail.c --- tin-1.7.4/src/mail.c 2003-12-28 15:19:57.000000000 +0100 +++ tin-1.7.5/src/mail.c 2004-03-23 15:24:54.000000000 +0100 @@ -3,7 +3,7 @@ * Module : mail.c * Author : I. Lea * Created : 1992-10-02 - * Updated : 2003-11-18 + * Updated : 2004-03-23 * Notes : Mail handling routines for creating pseudo newsgroups * * Copyright (c) 1992-2004 Iain Lea @@ -398,7 +398,7 @@ read_groups_descriptions( if (++count % 100 == 0) spin_cursor(); } - free(groupname); + FreeIfNeeded(groupname); } diff -Nurp tin-1.7.4/src/makecfg.c tin-1.7.5/src/makecfg.c --- tin-1.7.4/src/makecfg.c 2003-12-28 15:20:23.000000000 +0100 +++ tin-1.7.5/src/makecfg.c 2004-06-03 21:17:25.000000000 +0200 @@ -3,7 +3,7 @@ * Module : makecfg.c * Author : Thomas E. Dickey * Created : 1997-08-23 - * Updated : 2001-11-10 + * Updated : 2004-06-03 * Notes : #defines and structs for config.c * * Copyright (c) 1997-2004 Thomas E. Dickey @@ -213,7 +213,6 @@ generate_tbl( "\tVERY_LAST_OPT };" ,"" ,"#define LAST_OPT VERY_LAST_OPT - 1" - ,"#define OPT_ARG_COLUMN 9" ,"" ,"#define OPT_TITLE 0" ,"#define OPT_ON_OFF 1" diff -Nurp tin-1.7.4/src/misc.c tin-1.7.5/src/misc.c --- tin-1.7.4/src/misc.c 2004-02-04 11:48:33.000000000 +0100 +++ tin-1.7.5/src/misc.c 2004-06-07 12:18:42.000000000 +0200 @@ -3,7 +3,7 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-12-28 + * Updated : 2004-06-07 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -82,9 +82,6 @@ static void write_input_history_file(voi #ifdef CHARSET_CONVERSION static t_bool buffer_to_local(char **line, int *max_line_len, const char *network_charset, const char *local_charset); #endif /* CHARSET_CONVERSION */ -#if (defined(MIME_STRICT_CHARSET) && !defined(NO_LOCALE)) || defined(CHARSET_CONVERSION) - static void buffer_to_ascii(char *c); -#endif /* (MIME_STRICT_CHARSET && !NO_LOCALE) || CHARSET_CONVERSION */ #if 0 /* currently unused */ static t_bool stat_article(long art, const char *group_path); #endif /* 0 */ @@ -330,7 +327,7 @@ copy_body( retcode = fprintf(fp_op, "%s\n", ((tinrc.quote_style & QUOTE_EMPTY) ? prefixbuf : "")); } else { /* no initials in quote_string, just copy */ if ((buf[0] != '\n') || (tinrc.quote_style & QUOTE_EMPTY)) - retcode = fprintf(fp_op, "%s%s", ((buf[0] == '>' || buf[0] == ' ') ? prefixbuf : prefix), buf); /* use blank-stripped quote string if line is already quoted or beginns with a space */ + retcode = fprintf(fp_op, "%s%s", ((buf[0] == '>' || buf[0] == ' ') ? prefixbuf : prefix), buf); /* use blank-stripped quote string if line is already quoted or beginns with a space */ else retcode = fprintf(fp_op, "\n"); } @@ -829,7 +826,7 @@ draw_percent_mark( char buf[32]; /* should be big enough */ int len; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t wbuf[32]; + wchar_t *wbuf; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ if (NOTESLINES <= 0) @@ -841,10 +838,10 @@ draw_percent_mark( clear_message(); snprintf(buf, sizeof(buf), "%s(%d%%) [%ld/%ld]", _(txt_more), (int) (cur_num * 100 / max_num), cur_num, max_num); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (mbstowcs(wbuf, buf, ARRAY_SIZE(wbuf)) != (size_t) (-1)) { - wbuf[ARRAY_SIZE(wbuf) - 1] = (wchar_t) '\0'; + if ((wbuf = char2wchar_t(buf)) != NULL) { wconvert_to_printable(wbuf); - len = wcswidth(wbuf, ARRAY_SIZE(wbuf)); + len = wcswidth(wbuf, wcslen(wbuf) + 1); + free(wbuf); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ len = (int) strlen(buf); @@ -937,7 +934,7 @@ eat_re( char *s, t_bool eat_was) { - int data, slen; + int data; int offsets[6]; int size_offsets = ARRAY_SIZE(offsets); @@ -945,15 +942,13 @@ eat_re( return ""; /* also used in art.c:parse_headers() */ do { - slen = strlen(s); - data = pcre_exec(strip_re_regex.re, strip_re_regex.extra, s, slen, 0, 0, offsets, size_offsets); + data = pcre_exec(strip_re_regex.re, strip_re_regex.extra, s, strlen(s), 0, 0, offsets, size_offsets); if (offsets[0] == 0) s += offsets[1]; } while (data > 0); if (eat_was) do { - slen = strlen(s); - data = pcre_exec(strip_was_regex.re, strip_was_regex.extra, s, slen, 0, 0, offsets, size_offsets); + data = pcre_exec(strip_was_regex.re, strip_was_regex.extra, s, strlen(s), 0, 0, offsets, size_offsets); if (offsets[0] > 0) s[offsets[0]] = '\0'; } while (data > 0); @@ -1004,7 +999,7 @@ get_author( char *p = idna_decode(art->from); int author; - author = ((thread && !show_subject) ? SHOW_FROM_BOTH : CURR_GROUP.attribute->show_author); + author = ((thread && !show_subject) ? SHOW_FROM_BOTH : curr_group->attribute->show_author); switch (author) { case SHOW_FROM_ADDR: @@ -2358,15 +2353,13 @@ buffer_to_local( char *tmpbuf, *tbuf; ICONV_CONST char *cur_inbuf; int used; - size_t inbytesleft; - size_t unknown_bytesleft; + size_t inbytesleft = 1; + size_t unknown_bytesleft = 4; size_t tmpbytesleft, tsize; size_t outbytesleft, osize; size_t cur_obl, cur_ibl; size_t result; - inbytesleft = 1; - unknown_bytesleft = 4; unknown_ucs4 = unknown_buf; /* convert '?' from ASCII to UCS-4 */ @@ -2440,7 +2433,7 @@ buffer_to_local( * outbuf was too small * As some input could be converted successfully * and we don`t know where the last complete char - * ends, redo the last conversation completely. + * ends, redo the last conversion completely. */ /* resize the output buffer */ obuf = my_realloc(obuf, osize * 2 + 1); @@ -2542,18 +2535,20 @@ buffer_to_network( #endif /* CHARSET_CONVERSION */ -#if (defined(MIME_STRICT_CHARSET) && !defined(NO_LOCALE)) || defined(CHARSET_CONVERSION) -static void +char * buffer_to_ascii( char *c) { - while (*c != '\0') { /* reduce to US-ASCII, other non-prints are filtered later */ + char *a = c; + + while (*c != '\0') { + /* reduce to US-ASCII, other non-prints are filtered later */ if ((unsigned char) *c >= 128) *c = '?'; c++; } + return a; } -#endif /* (MIME_STRICT_CHARSET && !NO_LOCALE) || CHARSET_CONVERSION */ /* diff -Nurp tin-1.7.4/src/newsrc.c tin-1.7.5/src/newsrc.c --- tin-1.7.4/src/newsrc.c 2003-12-28 15:21:20.000000000 +0100 +++ tin-1.7.5/src/newsrc.c 2004-03-14 16:11:00.000000000 +0100 @@ -3,7 +3,7 @@ * Module : newsrc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-11-21 + * Updated : 2004-03-14 * Notes : ArtCount = (ArtMax - ArtMin) + 1 [could have holes] * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -404,10 +404,9 @@ group_get_art_info( put_server(buf); switch (get_respcode(line, sizeof(line))) { - case OK_GROUP: if (sscanf(line, "%ld %ld %ld", art_count, art_min, art_max) != 3) - error_message(_("Invalid response to GROUP command, %s"), line); + error_message(_(txt_error_invalid_response_to_group), line); break; case ERR_NOGROUP: diff -Nurp tin-1.7.4/src/nntplib.c tin-1.7.5/src/nntplib.c --- tin-1.7.4/src/nntplib.c 2004-02-16 02:20:30.000000000 +0100 +++ tin-1.7.5/src/nntplib.c 2004-03-24 11:01:11.000000000 +0100 @@ -3,7 +3,7 @@ * Module : nntplib.c * Author : S. Barber & I. Lea * Created : 1991-01-12 - * Updated : 2004-02-16 + * Updated : 2004-03-13 * Notes : NNTP client routines taken from clientlib.c 1.5.11 (1991-02-10) * Copyright : (c) Copyright 1991-99 by Stan Barber & Iain Lea * Permission is hereby granted to copy, reproduce, redistribute @@ -790,7 +790,8 @@ put_server( * remember the last command we wrote to be able to resend it after a * reconnect. reconnection is handled by get_server() */ - strcpy(last_put, string); + if (last_put != string) + STRCPY(last_put, string); } (void) s_flush(nntp_wr_fp); } @@ -956,9 +957,8 @@ close_server( * mentioned in the list of extensions. * Possible extensions include: * - HDR & LIST HEADERS - * - OVER + * - OVER [MSGID] & LIST OVERVIEW.FMT * - LISTGROUP - * - LIST OVERVIEW.FMT * - STARTTLS * * Sets up: have_list_extensions, xover_cmd, (xhdr_cmd) @@ -1277,7 +1277,7 @@ nntp_open( if (!nntp_command(xover_cmds, ERR_COMMAND, NULL, 0)) xover_cmd = xover_cmds; } -#if 0 /* unused */ +# if 0 /* unused */ if (!xhdr_cmd) { /* * LIST EXTENSIONS didn't mention HDR or XHDR, try @@ -1286,7 +1286,7 @@ nntp_open( if (!nntp_command(xhdr_cmds, ERR_COMMAND, NULL, 0)) xhdr_cmd = xhdr_cmds; } -#endif /* 0 */ +# endif /* 0 */ } if (!xover_cmd) { @@ -1298,13 +1298,13 @@ nntp_open( else wait_message(2, _(txt_caching_off)); } -#if 0 +# if 0 } else { /* * TODO: issue warning if old index files found? * in index_newsdir? */ -#endif /* 0 */ +# endif /* 0 */ } # if 0 diff -Nurp tin-1.7.4/src/page.c tin-1.7.5/src/page.c --- tin-1.7.4/src/page.c 2004-02-23 11:09:03.000000000 +0100 +++ tin-1.7.5/src/page.c 2004-06-07 12:18:57.000000000 +0200 @@ -3,7 +3,7 @@ * Module : page.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-02-21 + * Updated : 2004-06-07 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -1050,7 +1050,7 @@ print_message_page( * use the offsets gained while doing line wrapping to * determine the correct position to truncate the line */ - if (base_line + i < messagelines - 1) { /* not last line of message*/ + if (base_line + i < messagelines - 1) { /* not last line of message */ bytes = (curr + 1)->offset - curr->offset; line[bytes] = '\0'; } @@ -1059,7 +1059,6 @@ print_message_page( * rotN encoding on body and sig data only */ if ((rotate != 0) && (curr->flags & (C_BODY | C_SIG))) { - p = line; for (p = line; *p; p++) { if (*p >= 'A' && *p <= 'Z') *p = (*p - 'A' + rotate) % 26 + 'A'; @@ -1197,15 +1196,15 @@ draw_page( char buf[LEN]; int len; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t wbuf[LEN]; + wchar_t *wbuf; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ STRCPY(buf, (arts[this_resp].thread != -1) ? _(txt_next_resp) : _(txt_last_resp)); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - if (mbstowcs(wbuf, buf, ARRAY_SIZE(wbuf)) != (size_t) (-1)) { - wbuf[ARRAY_SIZE(wbuf) - 1] = (wchar_t) '\0'; + if ((wbuf = char2wchar_t(buf)) != NULL) { wconvert_to_printable(wbuf); - len = wcswidth(wbuf, ARRAY_SIZE(wbuf)); + len = wcswidth(wbuf, wcslen(wbuf) + 1); + free(wbuf); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ len = (int) strlen(buf); @@ -1314,19 +1313,8 @@ draw_page_header( wtmp = my_malloc(line_len * sizeof(wchar_t)); /* convert to wide-char format strings */ - len = mbstowcs(NULL, _(txt_thread_x_of_n), 0) + 1; - if (len > 0) { - fmt_thread = my_malloc(len * sizeof(wchar_t)); - mbstowcs(fmt_thread, _(txt_thread_x_of_n), len); - } else - fmt_thread = NULL; - - len = mbstowcs(NULL, _(txt_resp_x_of_n), 0) + 1; - if (len > 0) { - fmt_resp = my_malloc(len * sizeof(wchar_t)); - mbstowcs(fmt_resp, _(txt_resp_x_of_n), len); - } else - fmt_resp = NULL; + fmt_thread = char2wchar_t(_(txt_thread_x_of_n)); + fmt_resp = char2wchar_t(_(txt_resp_x_of_n)); /* * determine the needed space for the text at the right hand margin @@ -1420,16 +1408,11 @@ draw_page_header( { wchar_t *fmt; - len = mbstowcs(NULL, _(txt_lines), 0) + 1; - fmt = my_malloc(len * sizeof(wchar_t)); - if (mbstowcs(fmt, _(txt_lines), len) == (size_t) (-1)) - wbuf[0] = (wchar_t) '\0'; - else { - fmt[len - 1] = (wchar_t) '\0'; + if ((fmt = char2wchar_t(_(txt_lines))) != NULL) { swprintf(wbuf, line_len, fmt, buf); - } - - free(fmt); + free(fmt); + } else + wbuf[0] = (wchar_t) '\0'; } len = wcswidth(wbuf, line_len); diff -Nurp tin-1.7.4/src/post.c tin-1.7.5/src/post.c --- tin-1.7.4/src/post.c 2004-01-10 04:01:47.000000000 +0100 +++ tin-1.7.5/src/post.c 2004-06-15 11:39:43.000000000 +0200 @@ -3,7 +3,7 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-01-07 + * Updated : 2004-06-12 * Notes : mail/post/replyto/followup/repost & cancel articles * * Copyright (c) 1991-2004 Iain Lea @@ -139,7 +139,7 @@ static char prompt_to_send(const char *s static int add_mail_quote(FILE *fp, int respnum); static int check_article_to_be_posted(const char *the_article, int art_type, struct t_group **group, t_bool art_unchanged); static unsigned int get_recipients(struct t_header *hdr, char *buf, size_t buflen); -static int mail_loop(const char *filename, char ch, char *subject, const char *groupname, const char *prompt); +static int mail_loop(const char *filename, char ch, char *subject, const char *groupname, const char *prompt, FILE *articlefp); static int msg_add_x_body(FILE *fp_out, const char *body); static int msg_write_headers(FILE *fp); static int post_loop(int type, struct t_group *psGrp, char ch, const char *posting_msg, int art_type, int offset); @@ -156,7 +156,7 @@ static t_bool insert_from_header(const c static t_bool is_crosspost(const char *xref); static t_bool must_include(const char *id); static t_bool repair_article(char *result, struct t_group *group); -static t_bool submit_mail_file(const char *file, struct t_group *group); +static t_bool submit_mail_file(const char *file, struct t_group *group, FILE *articlefp, t_bool include_text); static void add_headers(const char *infile, const char *a_message_id); static void appendid(char **where, const char **what); static void find_reply_to_addr(char *from_addr, t_bool parse, struct t_header *hdr); @@ -1522,7 +1522,7 @@ post_article_loop: if (submit_news_file(article, group, a_message_id)) ret_code = POSTED_OK; } else { - if (submit_mail_file(article, group)) /* mailing_list */ + if (submit_mail_file(article, group, NULL, FALSE)) /* mailing_list */ ret_code = POSTED_OK; } @@ -1948,7 +1948,7 @@ post_postponed_article( if ((p = strchr(ng, ',')) != NULL) *p = '\0'; - snprintf(buf, sizeof(buf), _("Posting: %.*s ..."), (int) (cCOLS - 14), subject); /* TODO: -> lang.c, use strunc() */ + snprintf(buf, sizeof(buf), _("Posting: %.*s ..."), cCOLS - 14, subject); /* TODO: -> lang.c, use strunc() */ post_loop(POST_POSTPONED, group_find(ng), (ask ? iKeyPostEdit : iKeyPostPost3), buf, GROUP_TYPE_NEWS, 0); free(ng); return; @@ -2335,12 +2335,12 @@ join_references( */ char *b, *c, *d; const char *e; - int space; + int space = 0; b = my_malloc(strlen(oldrefs) + strlen(newref) + 64); c = b; e = oldrefs; - space = 0; + while (*e) { if (*e == ' ') { space++, *c++ = ' ', e++; /* keep existing spaces */ @@ -2782,16 +2782,18 @@ mail_loop( char ch, /* default prompt char */ char *subject, const char *groupname, /* Newsgroup we are posting from */ - const char *prompt) /* If set, used for final query before posting */ + const char *prompt, /* If set, used for final query before posting */ + FILE *articlefp) { FILE *fp; -#ifdef HAVE_PGP_GPG - char mail_to[HEADER_LEN]; -#endif /* HAVE_PGP_GPG */ int ret = POSTED_NONE; long artchanged = 0L; struct t_header hdr; struct t_group *group = (struct t_group *) 0; + t_bool is_changed = FALSE; +#ifdef HAVE_PGP_GPG + char mail_to[HEADER_LEN]; +#endif /* HAVE_PGP_GPG */ if (groupname) group = group_find(groupname); @@ -2809,6 +2811,10 @@ mail_loop( clear_message(); return ret; } + + if (artchanged != file_mtime(filename)) + is_changed = TRUE; + if (!(fp = fopen(filename, "r"))) { /* Oops */ clear_message(); return ret; @@ -2862,8 +2868,7 @@ mail_loop( confirm = FALSE; } - /* TODO: wrap article into message/rfc822? */ - if (confirm && submit_mail_file(filename, group)) { + if (confirm && submit_mail_file(filename, group, articlefp, is_changed)) { info_message(_(txt_articles_mailed), 1, _(txt_article_singular)); return POSTED_OK; } @@ -2925,21 +2930,25 @@ mail_to_someone( char subject[HEADER_LEN]; int ret_code = POSTED_NONE; struct t_header note_h = artinfo->hdr; + t_bool mime_forward = group->attribute->mime_forward; clear_message(); snprintf(subject, sizeof(subject), "(fwd) %s\n", note_h.subj); /* * don't add extra headers in the mail_to_someone() case as we include - * the full original headers in the body of the mail + * the full original headers in either the body of the mail or a separate + * message/rfc822 MIME part. */ if ((fp = create_mail_headers(nam, TIN_LETTER_NAME, address, subject, NULL)) == NULL) return ret_code; - rewind(artinfo->raw); - fprintf(fp, _(txt_forwarded)); - copy_fp(artinfo->raw, fp); - fprintf(fp, _(txt_forwarded_end)); + if (!mime_forward || INTERACTIVE_NONE != tinrc.interactive_mailer) { + rewind(artinfo->raw); + fprintf(fp, _(txt_forwarded)); + copy_fp(artinfo->raw, fp); + fprintf(fp, _(txt_forwarded_end)); + } if (INTERACTIVE_NONE == tinrc.interactive_mailer) msg_write_signature(fp, TRUE, &CURR_GROUP); @@ -2960,7 +2969,7 @@ mail_to_someone( } else { if (confirm_to_mail) ch = prompt_to_send(subject); - ret_code = mail_loop(nam, ch, subject, group ? group->name : NULL, NULL); + ret_code = mail_loop(nam, ch, subject, group ? group->name : NULL, NULL, mime_forward ? artinfo->raw : NULL); } if (tinrc.unlink_article) @@ -3060,7 +3069,7 @@ mail_bug_report( ret_code = TRUE; } else { snprintf(tmesg, sizeof(tmesg), _(txt_mail_bug_report_confirm), bug_addr); - ret_code = mail_loop(nam, iKeyPostEdit, subject, NULL, tmesg) ? TRUE : FALSE; + ret_code = mail_loop(nam, iKeyPostEdit, subject, NULL, tmesg, NULL) ? TRUE : FALSE; } unlink(nam); @@ -3188,7 +3197,7 @@ mail_to_author( if (invoke_cmd(buf)) ret_code = POSTED_OK; } else - ret_code = mail_loop(nam, iKeyPostEdit, subject, group, NULL); + ret_code = mail_loop(nam, iKeyPostEdit, subject, group, NULL, NULL); /* * If interactive_mailer!=NONE and the user changed the subject in his @@ -3858,10 +3867,11 @@ checknadd_headers( { FILE *fp_in, *fp_out; char *fcc = NULL; + char *l; + char *ptr; char newsgroups[HEADER_LEN]; char line[HEADER_LEN]; char outfile[PATH_LEN]; - t_bool inhdrs = TRUE; newsgroups[0] = '\0'; @@ -3879,56 +3889,58 @@ checknadd_headers( return NULL; } - while (fgets(line, (int) sizeof(line), fp_in) != NULL) { - if (inhdrs) { - if (line[0] == '\n') { /* End of headers */ - inhdrs = FALSE; + while ((l = tin_fgets(fp_in, TRUE)) != NULL) { + if (l[0] == '\0') /* end of headers */ + break; - if (tinrc.advertising) { /* Add after other headers */ - char suffix[HEADER_LEN]; + if ((ptr = parse_header(l, "Newsgroups", FALSE, FALSE))) { + strip_double_ngs(ptr); + STRCPY(newsgroups, ptr); + snprintf(line, sizeof(line), "Newsgroups: %s\n", newsgroups); + fputs(line, fp_out); + } else if ((ptr = parse_header(l, "Followup-To", FALSE, FALSE))) { + strip_double_ngs(ptr); + /* + * Only write followup header if not blank or followups != newsgroups + */ + if (*ptr && strcasecmp(newsgroups, ptr)) { + snprintf(line, sizeof(line), "Followup-To: %s\n", ptr); + fputs(line, fp_out); + } + } else if ((ptr = parse_header(l, "Fcc", FALSE, FALSE))) { + fcc = my_strdup(ptr); + } else if ((ptr = strchr(l, ':')) != NULL) { /* valid header? */ + if (strlen(ptr) > 3) /* skip empty headers ": \n\0" */ + fprintf(fp_out, "%s\n", l); + } + } /* end of headers */ + + if (tinrc.advertising) { /* Add after other headers */ + char suffix[HEADER_LEN]; - suffix[0] = '\0'; + suffix[0] = '\0'; #ifdef HAVE_SYS_UTSNAME_H # ifdef _AIX - snprintf(suffix, sizeof(suffix), " (%s/%s.%s)", - system_info.sysname, system_info.version, system_info.release); + snprintf(suffix, sizeof(suffix), " (%s/%s.%s)", + system_info.sysname, system_info.version, system_info.release); # else # ifdef SEIUX - snprintf(suffix, sizeof(suffix), " (%s/%s)", - system_info.version, system_info.release); + snprintf(suffix, sizeof(suffix), " (%s/%s)", + system_info.version, system_info.release); # else - snprintf(suffix, sizeof(suffix), " (%s/%s (%s))", - system_info.sysname, system_info.release, system_info.machine); + snprintf(suffix, sizeof(suffix), " (%s/%s (%s))", + system_info.sysname, system_info.release, system_info.machine); # endif /* SEIUX */ # endif /* _AIX */ #endif /* HAVE_SYS_UTSNAME_H */ - fprintf(fp_out, "User-Agent: %s/%s-%s (\"%s\") (%s)%s\n", - PRODUCT, VERSION, RELEASEDATE, RELEASENAME, OSNAME, suffix); - } - } else { - char *ptr; - - if ((ptr = parse_header(line, "Newsgroups", FALSE, FALSE))) { - strip_double_ngs(ptr); - STRCPY(newsgroups, ptr); - snprintf(line, sizeof(line), "Newsgroups: %s\n", newsgroups); - } else if ((ptr = parse_header(line, "Followup-To", FALSE, FALSE))) { - strip_double_ngs(ptr); - /* - * Only write followup header if not blank or followups != newsgroups - */ - if (*ptr && strcasecmp(newsgroups, ptr)) - snprintf(line, sizeof(line), "Followup-To: %s\n", ptr); - else - *line = '\0'; - } else if ((ptr = parse_header(line, "Fcc", FALSE, FALSE))) { - fcc = my_strdup(ptr); - *line = '\0'; /* don't write Fcc-Header */ - } - } - } - fputs(line, fp_out); + fprintf(fp_out, "User-Agent: %s/%s-%s (\"%s\") (%s)%s\n", + PRODUCT, VERSION, RELEASEDATE, RELEASENAME, OSNAME, suffix); } + + fputs("\n", fp_out); /* header/body seperator */ + + while ((l = tin_fgets(fp_in, FALSE)) != NULL) + fprintf(fp_out, "%s\n", l); fclose(fp_out); fclose(fp_in); rename_file(outfile, infile); @@ -4164,7 +4176,9 @@ update_active_after_posting( static t_bool submit_mail_file( const char *file, - struct t_group *group) + struct t_group *group, + FILE *articlefp, + t_bool include_text) { FILE *fp; char *fcc = NULL; @@ -4186,7 +4200,11 @@ submit_mail_file( wait_message(0, _(txt_mailing_to), mail_to); /* Use group-attribute for mailing_list */ - rfc15211522_encode(file, txt_mime_encodings[tinrc.mail_mime_encoding], group, tinrc.mail_8bit_header, TRUE); + + if (articlefp != NULL) + compose_mail_mime_forwarded(file, articlefp, include_text, group); + else /* text/plain */ + compose_mail_text_plain(file, group); strfmailer(mailer, hdr.subj, mail_to, file, buf, sizeof(buf), tinrc.mailer_format); @@ -4465,7 +4483,11 @@ get_recipients( /* strip double addresses */ for (i = 0; i < (num_all - 1); i++) { + if (!all_addresses[i]) + continue; for (j = i + 1; j < num_all; j++) { + if (!all_addresses[j]) + continue; if (!strcasecmp(all_addresses[i], all_addresses[j])) FreeAndNull(all_addresses[j]); } diff -Nurp tin-1.7.4/src/prompt.c tin-1.7.5/src/prompt.c --- tin-1.7.4/src/prompt.c 2004-02-09 16:45:31.000000000 +0100 +++ tin-1.7.5/src/prompt.c 2004-06-12 16:16:21.000000000 +0200 @@ -3,7 +3,7 @@ * Module : prompt.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2004-02-09 + * Updated : 2004-06-12 * Notes : * * Copyright (c) 1991-2004 Iain Lea @@ -45,6 +45,14 @@ # include "menukeys.h" #endif /* !MENUKEYS_H */ +static char *prompt_slk_message; /* prompt message for prompt_slk_redraw */ + +/* + * Local prototypes + */ +static int prompt_list(int row, int col, int var, constext *help_text, constext *prompt_text, constext *list[], int size); + + /* * prompt_num * get a number from the user @@ -168,7 +176,7 @@ prompt_yn( { char *keyprompt; char keyno[MAXKEYLEN], keyyes[MAXKEYLEN]; - int ch = 'y', prompt_ch = 'y'; + int ch = 'y', prompt_ch = 'y'; /* why not iKeyPromptYes? */ size_t maxlen; t_bool yn_loop = TRUE; @@ -251,7 +259,7 @@ prompt_yn( * ESC is used to abort any changes, RET saves changes. * The new value is returned. */ -int +static int prompt_list( int row, int col, @@ -281,15 +289,11 @@ prompt_list( do { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - size_t len; + wchar_t *wbuf; - len = mbstowcs(NULL, _(prompt_text), 0); - if (len != (size_t) (-1)) { - wchar_t *wbuf = my_malloc(sizeof(wchar_t) * (len + 1)); - - mbstowcs(wbuf, _(prompt_text), len + 1); + if ((wbuf = char2wchar_t(_(prompt_text))) != NULL) { wconvert_to_printable(wbuf); - offset = wcswidth(wbuf, len + 1); + offset = wcswidth(wbuf, wcslen(wbuf) + 1); if (offset == -1) { /* something went wrong, use wcslen as fallback */ offset = (int) wcslen(wbuf); @@ -328,20 +332,37 @@ prompt_list( /* - * Special case of prompt_list() Toggle between ON and OFF + * Special case of prompt_option_list() Toggle between ON and OFF + * The function returns TRUE, if the value was changed, FALSE otherwise. */ -void -prompt_on_off( - int row, - int col, - t_bool *var, - constext *help_text, - constext *prompt_text) +t_bool +prompt_option_on_off( + int option) +{ + char prompt[LEN]; + t_bool *variable = OPT_ON_OFF_list[option_table[option].var_index]; + t_bool old_value = *variable; + + fmt_option_prompt(prompt, sizeof(prompt), TRUE, option); + *variable = prompt_list(option_row(option), 0, *variable, option_table[option].txt->help, prompt, txt_onoff, 2) ? TRUE: FALSE; + return *variable != old_value; +} + + +/* + * The function returns TRUE, if the value was changed, FALSE otherwise. + */ +t_bool +prompt_option_list( + int option) { - t_bool ret; + char prompt[LEN]; + int *variable = option_table[option].variable; + int old_value = *variable; - ret = prompt_list(row, col, (int) *var, help_text, _(prompt_text), txt_onoff, 2) ? TRUE : FALSE; - *var = (ret != 0); + fmt_option_prompt(prompt, sizeof(prompt), TRUE, option); + *variable = prompt_list(option_row(option), 0, *variable, option_table[option].txt->help, prompt, option_table[option].opt_list, option_table[option].opt_count); + return *variable != old_value; } @@ -543,15 +564,11 @@ sized_message( int max_len; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) wchar_t *wformat; - size_t format_len; - format_len = mbstowcs(NULL, format, 0); - if (format_len != (size_t) (-1)) { - wformat = my_malloc(sizeof(wchar_t) * (format_len + 1)); - mbstowcs(wformat, format, format_len + 1); + if ((wformat = char2wchar_t(format)) != NULL) { wconvert_to_printable(wformat); /* The formatting info (%s) wastes 2 chars, but our prompt needs 1 char */ - max_len = cCOLS - wcswidth(wformat, format_len + 1) + 2 - 1; + max_len = cCOLS - wcswidth(wformat, wcslen(wformat) + 1) + 2 - 1; free(wformat); } else #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -583,15 +600,17 @@ prompt_slk_response( char buf[LEN]; va_start(ap, fmt); - vsnprintf(buf, sizeof(buf), fmt, ap); /* We need to do this, else wait_message() will clobber us */ + vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); + prompt_slk_message = my_malloc(strlen(buf) + 2); ch_default = map_to_local(ch_default, responses); - do { - wait_message(0, "%s%c", buf, ch_default); + snprintf(prompt_slk_message, strlen(buf) + 2, "%s%c", buf, ch_default); + + input_context = cPromptSLK; - /* Get the cursor _just_ right */ - MoveCursor(cLINES, (int) strlen(buf)); + do { + prompt_slk_redraw(); /* draw the prompt */ if ((ch = ReadCh()) == '\r' || ch == '\n') ch = ch_default; @@ -613,6 +632,7 @@ prompt_slk_response( case KEYMAP_HOME: case KEYMAP_END: ch = '\0'; + break; default: break; @@ -622,11 +642,39 @@ prompt_slk_response( } while (!strchr(responses->localkeys, ch)); + input_context = cNone; + FreeAndNull(prompt_slk_message); + clear_message(); return map_to_default(ch, responses); } +/* (Re)draws the prompt message for prompt_slk_response() */ +void +prompt_slk_redraw( + void) +{ + int column; +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + wchar_t *wtmp; +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + + wait_message(0, "%s", prompt_slk_message); + + /* get the cursor _just_ right */ +#if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + if ((wtmp = char2wchar_t(prompt_slk_message)) != NULL) { + wconvert_to_printable(wtmp); + column = wcswidth(wtmp, wcslen(wtmp) + 1) - 1; + free(wtmp); + } else +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ + column = (int) strlen(prompt_slk_message) - 1; + MoveCursor(cLINES, column); +} + + /* * Wait until a key is pressed. We specify the key otherwise * pedants will point out that: diff -Nurp tin-1.7.4/src/refs.c tin-1.7.5/src/refs.c --- tin-1.7.4/src/refs.c 2004-02-11 04:15:14.000000000 +0100 +++ tin-1.7.5/src/refs.c 2004-04-17 16:55:24.000000000 +0200 @@ -3,7 +3,7 @@ * Module : refs.c * Author : Jason Faultless * Created : 1996-05-09 - * Updated : 2004-02-10 + * Updated : 2004-03-01 * Notes : Cacheing of message ids / References based threading * Credits : Richard Hodson * hash_msgid, free_msgid @@ -279,7 +279,6 @@ add_msgid( * Change parent from null -> not-null & update ptrs */ if (i->parent == NULL) { - /* * Detect & ignore circular reference paths by looking for the * new parent in this thread @@ -951,33 +950,15 @@ build_references( * * TODO: do this in a single pass */ - - s = art->refs + strlen (art->refs) - 1; - - /* - * Trim trailing blanks - */ - while ((s > art->refs) && ((*s == ' ') || (*s == '\t'))) - *s-- = '\0'; - /* - * Skip over supposed Message-ID - */ - while ((s > art->refs) && (*s != ' ') && (*s != '\t')) - s--; - /* - * Move to Message-ID start - */ - if ((*s == ' ') || (*s == '\t')) - s++; - - if (!strcmp(art->msgid, s)) { - /* - * Remove circular reference to current article - */ - DEBUG_PRINT((dbgfd, "removing circular reference to: %s\n", s)); - *s = '\0'; + if ((s = strrchr(art->refs, '<')) != NULL) { + if (!strcmp(art->msgid, s)) { + /* + * Remove circular reference to current article + */ + DEBUG_PRINT((dbgfd, "removing circular reference to: %s\n", s)); + *s = '\0'; + } } - if (s != NULL) { if (valid_msgid(art->msgid)) art->refptr = add_msgid(MSGID_REF, art->msgid, add_msgid(REF_REF, s, NULL)); @@ -990,7 +971,6 @@ build_references( } else if (valid_msgid(art->msgid)) art->refptr = add_msgid(MSGID_REF, art->msgid, NULL); - FreeAndNull(art->msgid); /* Now cached - discard this */ } @@ -1011,7 +991,7 @@ build_references( refs = parse_references(art->refs); - if (art->refptr->parent && valid_msgid(art->refptr->parent->txt)) + if (art->refptr && art->refptr->parent && valid_msgid(art->refptr->parent->txt)) add_msgid(REF_REF, art->refptr->parent->txt, refs); FreeAndNull(art->refs); diff -Nurp tin-1.7.4/src/rfc1524.c tin-1.7.5/src/rfc1524.c --- tin-1.7.4/src/rfc1524.c 2003-12-28 15:23:16.000000000 +0100 +++ tin-1.7.5/src/rfc1524.c 2004-03-09 11:01:24.000000000 +0100 @@ -65,7 +65,7 @@ get_mailcap_entry( t_part *part, const char *path) { - FILE *fp = (FILE *) 0; + FILE *fp = NULL; char *ptr, *ptr2, *nptr; char buf[LEN]; char filename[LEN]; /* name of current mailcap file */ diff -Nurp tin-1.7.4/src/rfc2046.c tin-1.7.5/src/rfc2046.c --- tin-1.7.4/src/rfc2046.c 2004-01-05 04:00:57.000000000 +0100 +++ tin-1.7.5/src/rfc2046.c 2004-03-13 13:05:59.000000000 +0100 @@ -196,7 +196,7 @@ get_token( char *dest = my_strdup(source); char *ptr = dest; - while (isascii(*ptr) && isprint(*ptr) && *ptr != ' ' && !strchr(ATTRIBUTE_DELIMS, *ptr)) + while (isascii((int) *ptr) && isprint((int) *ptr) && *ptr != ' ' && !strchr(ATTRIBUTE_DELIMS, *ptr)) ptr++; *ptr = '\0'; diff -Nurp tin-1.7.4/src/rfc2047.c tin-1.7.5/src/rfc2047.c --- tin-1.7.4/src/rfc2047.c 2003-12-28 15:23:51.000000000 +0100 +++ tin-1.7.5/src/rfc2047.c 2004-03-10 01:07:26.000000000 +0100 @@ -3,7 +3,7 @@ * Module : rfc2047.c * Author : Chris Blum * Created : 1995-09-01 - * Updated : 2003-04-08 + * Updated : 2004-03-10 * Notes : MIME header encoding/decoding stuff * * Copyright (c) 1995-2004 Chris Blum @@ -71,16 +71,32 @@ static unsigned char base64_rank[256]; static int base64_rank_table_built; static t_bool quoteflag; +/* fixed prefix and default part for tin-generated MIME boundaries */ +static const char MIME_BOUNDARY_PREFIX[] = "=_tin=_"; +static const char MIME_BOUNDARY_DEFAULT_PART[] = "====____====____====____"; +/* required size of a buffer containing a MIME boundary, including the final '\0' */ +enum { + MIME_BOUNDARY_SIZE = sizeof(MIME_BOUNDARY_PREFIX) + sizeof(MIME_BOUNDARY_DEFAULT_PART) - 1 +}; + /* * local prototypes */ +static FILE *compose_message_rfc822(FILE *articlefp, t_bool *is_8bit); +static FILE *compose_multipart_mixed(FILE *textfp, FILE *articlefp); static int do_b_encode(char *w, char *b, int max_ewsize, t_bool isstruct_head); static int sizeofnextword(char *w); static int which_encoding(char *w); +static t_bool contains_8bit_characters(FILE *fp); static t_bool contains_nonprintables(char *w, t_bool isstruct_head); +static t_bool contains_string(FILE *fp, const char *str); static t_bool rfc1522_do_encode(char *what, char **where, const char *charset, t_bool break_long_line); +static t_bool split_mail(const char *filename, FILE **headerfp, FILE **textfp); static unsigned hex2bin(int x); static void build_base64_rank_table(void); +static void do_rfc15211522_encode(FILE *f, constext * mime_encoding, struct t_group *group, t_bool allow_8bit_header, t_bool ismail, t_bool contains_headers); +static void generate_mime_boundary(char *boundary, FILE *f, FILE *g); +static void generate_random_mime_boundary(char *boundary, size_t len); static void str2b64(const char *from, char *to); @@ -133,6 +149,9 @@ mmdecode( int x; unsigned hi, lo; + if (!what || !where) /* should not happen with 'q'-encoding */ + return -1; + while (*what != delimiter) { if (*what != '=') { if (!delimiter || *what != '_') @@ -165,12 +184,14 @@ mmdecode( static int bits = 0; unsigned char x; - build_base64_rank_table(); if (!what || !where) { /* flush */ pattern = 0; bits = 0; return 0; } + + build_base64_rank_table(); + while (*what != delimiter) { x = base64_rank[(int) (*what++)]; /* ignore everything not in the alphabet, including '=' */ @@ -745,15 +766,20 @@ rfc1522_encode( } -void -rfc15211522_encode( - const char *filename, +/* + * Helper function doing the hard work for rfc15211522_encode(). + * Code moved from rfc15211522_encode(), with some adjustments to work on a + * file specified by a FILE* instead of a filename. + */ +static void +do_rfc15211522_encode( + FILE *f, constext * mime_encoding, struct t_group *group, t_bool allow_8bit_header, - t_bool ismail) + t_bool ismail, + t_bool contains_headers) { - FILE *f; FILE *g; char *c; char *header; @@ -773,14 +799,10 @@ rfc15211522_encode( if ((g = tmpfile()) == NULL) return; - if ((f = fopen(filename, "r")) == NULL) { - fclose(g); - return; - } quoteflag = FALSE; - while ((header = tin_fgets(f, TRUE))) { + while (contains_headers && (header = tin_fgets(f, TRUE))) { #ifdef CHARSET_CONVERSION buffer_to_network(header, mmnwcharset); #endif /* CHARSET_CONVERSION */ @@ -821,14 +843,13 @@ rfc15211522_encode( } } } - fclose(f); + /* + * This should work as g should be at least as long as f. + * We could use ftruncate(), but this isn't part of ISO-C. + */ + rewind(f); rewind(g); - if ((f = fopen(filename, "w")) == NULL) { - fclose(g); - return; - } - /* copy header */ while (fgets(buffer, 2048, g) && !isreturn(buffer[0])) fputs(buffer, f); @@ -855,7 +876,8 @@ rfc15211522_encode( * now add MIME headers as necessary */ if (mime_headers_needed) { - fprintf(f, "MIME-Version: %s\n", MIME_SUPPORTED_VERSION); + if (contains_headers) + fprintf(f, "MIME-Version: %s\n", MIME_SUPPORTED_VERSION); #ifdef CHARSET_CONVERSION fprintf(f, "Content-Type: text/plain; charset=%s\n", txt_mime_charsets[mmnwcharset]); #else @@ -893,5 +915,354 @@ rfc15211522_encode( } fclose(g); - fclose(f); +} + + +void +rfc15211522_encode( + const char *filename, + constext * mime_encoding, + struct t_group *group, + t_bool allow_8bit_header, + t_bool ismail) +{ + FILE *fp; + + if ((fp = fopen(filename, "r+")) == NULL) + return; + + do_rfc15211522_encode(fp, mime_encoding, group, allow_8bit_header, ismail, TRUE); + + fclose(fp); +} + + +/* + * Generate a MIME boundary being unique with high probability, consisting + * of len - 1 random characters. + * This function is used as a last resort if anything else failed to + * generate a truly unique boundary. + */ +static void +generate_random_mime_boundary( + char *boundary, + size_t len) +{ + size_t i; + + srand((unsigned int) time(NULL)); + for (i = 0; i < len - 1; i++) + boundary[i] = base64_alphabet[rand() % sizeof(base64_alphabet)]; + boundary[len - 1] = '\0'; +} + + +/* + * Generate a unique MIME boundary. + * boundary must have enough space for at least MIME_BOUNDARY_SIZE characters. + */ +static void +generate_mime_boundary( + char *boundary, + FILE *f, + FILE *g) +{ + const char nice_chars[] = { '-', '_', '=' }; + const size_t prefix_len = sizeof(MIME_BOUNDARY_PREFIX) - 1; + char *s; + size_t i = 0; + t_bool unique = FALSE; + + /* + * Choose MIME boundary as follows: + * - Always start with MIME_BOUNDARY_PREFIX. + * - Append MIME_BOUNDARY_DEFAULT_PART. + * - If necessary, change it from right to left, choosing from a set of + * `nice_chars' characters. + * - After that, if it is still not unique, replace MIME_BOUNDARY_DEFAULT_PART + * with random characters and hope the best. + */ + + strcpy(boundary, MIME_BOUNDARY_PREFIX); + strcat(boundary, MIME_BOUNDARY_DEFAULT_PART); + + s = boundary + MIME_BOUNDARY_SIZE - 2; /* set s to last character before '\0' */ + do { + /* + * Scan for entire boundary in both f and g. + * When found: modify and redo. + */ + if (contains_string(f, boundary) || contains_string(g, boundary)) { + *s = nice_chars[i]; + if ((i = (i + 1) % sizeof(nice_chars)) == 0) + --s; + } else + unique = TRUE; + } while (!unique && s >= boundary + prefix_len); + + if (!unique) + generate_random_mime_boundary(boundary + prefix_len, sizeof(MIME_BOUNDARY_DEFAULT_PART)); +} + + +/* + * Split mail into header and (optionally) body. + * + * If textfp is not NULL, everything behind the header is stored in it. + * Whenever an error is encountered, all files are closed and FALSE is returned. + */ +static t_bool +split_mail( + const char *filename, + FILE **headerfp, + FILE **textfp) +{ + FILE *fp; + char *line; + + if ((fp = fopen(filename, "r")) == NULL) + return FALSE; + + /* Header */ + if ((*headerfp = tmpfile()) == NULL) { + fclose(fp); + return FALSE; + } + + while ((line = tin_fgets(fp, TRUE))) { + if (*line == '\0') + break; + else + fprintf(*headerfp, "%s\n", line); + } + + /* Body */ + if (textfp != NULL) { + if ((*textfp = tmpfile()) == NULL) { + fclose(fp); + fclose(*headerfp); + return FALSE; + } + + while ((line = tin_fgets(fp, FALSE))) + fprintf(*textfp, "%s\n", line); + } + + fclose(fp); + return TRUE; +} + + +/* + * Compose a mail consisting of a sole text/plain MIME part. + */ +void +compose_mail_text_plain( + const char *filename, + struct t_group *group) +{ + rfc15211522_encode(filename, txt_mime_encodings[tinrc.mail_mime_encoding], group, tinrc.mail_8bit_header, TRUE); +} + + +/* + * Compose a mail consisting of an optional text/plain and a message/rfc822 + * part. + * + * At this point, the file denoted by `filename' contains some common headers + * and any text the user entered. The file `articlefp' contains the forwarded + * article in raw form. + */ +void +compose_mail_mime_forwarded( + const char *filename, + FILE *articlefp, + t_bool include_text, + struct t_group *group) +{ + FILE *fp; + FILE *headerfp; + FILE *textfp = NULL; + FILE *entityfp; + char *line; + constext* encoding = txt_mime_encodings[tinrc.mail_mime_encoding]; + t_bool allow_8bit_header = tinrc.mail_8bit_header; + t_bool _8bit; + + /* Split mail into headers and text */ + if (!split_mail(filename, &headerfp, include_text ? &textfp : NULL)) + return; + + /* Encode header and text */ + rewind(headerfp); + do_rfc15211522_encode(headerfp, encoding, group, allow_8bit_header, TRUE, TRUE); + + if (textfp) { + rewind(textfp); + do_rfc15211522_encode(textfp, encoding, group, allow_8bit_header, TRUE, FALSE); + } + + /* Compose top-level MIME entity */ + if (include_text) + entityfp = compose_multipart_mixed(textfp, articlefp); + else + entityfp = compose_message_rfc822(articlefp, &_8bit); + + if (entityfp == NULL) { + fclose(headerfp); + if (textfp) + fclose(textfp); + return; + } + + /* Put it all together */ + if ((fp = fopen(filename, "w")) == NULL) + return; + + rewind(headerfp); + while ((line = tin_fgets(headerfp, TRUE))) { + if (*line != '\0') + fprintf(fp, "%s\n", line); + } + fprintf(fp, "MIME-Version: %s\n", MIME_SUPPORTED_VERSION); + rewind(entityfp); + copy_fp(entityfp, fp); + + /* Clean up */ + fclose(fp); + fclose(headerfp); + fclose(entityfp); + if (textfp) + fclose(textfp); +} + + +/* + * Compose a message/rfc822 MIME entity containing articlefp. + */ +static FILE * +compose_message_rfc822( + FILE *articlefp, + t_bool *is_8bit) +{ + FILE *fp; + + if ((fp = tmpfile()) == NULL) + return NULL; + + *is_8bit = contains_8bit_characters(articlefp); + + /* Header: CT, CD, CTE */ + fprintf(fp, "Content-Type: message/rfc822\n"); + fprintf(fp, "Content-Disposition: inline\n"); + fprintf(fp, "Content-Transfer-Encoding: %s\n", *is_8bit ? txt_8bit : txt_7bit); + fputc('\n', fp); + + /* Body: articlefp */ + rewind(articlefp); + copy_fp(articlefp, fp); + + return fp; +} + + +/* + * Compose a multipart/mixed MIME entity consisting of a text/plain and a + * message/rfc822 part. + */ +static FILE * +compose_multipart_mixed( + FILE *textfp, + FILE *articlefp) +{ + FILE *fp; + FILE *messagefp; + char boundary[MIME_BOUNDARY_SIZE]; + t_bool requires_8bit; + + if ((fp = tmpfile()) == NULL) + return NULL; + + /* First compose message/rfc822 part (needed for choosing the appropriate CTE) */ + if ((messagefp = compose_message_rfc822(articlefp, &requires_8bit)) == NULL) { + fclose(fp); + return NULL; + } + + requires_8bit = (requires_8bit || contains_8bit_characters(textfp)); + + /* Header: CT with multipart boundary, CTE */ + generate_mime_boundary(boundary, textfp, articlefp); + fprintf(fp, "Content-Type: multipart/mixed; boundary=\"%s\"\n", boundary); + fprintf(fp, "Content-Transfer-Encoding: %s\n\n", requires_8bit ? txt_8bit : txt_7bit); + + /* + * preamble + * TODO: -> lang.c + */ + fprintf(fp, _("This message has been composed in the 'multipart/mixed' MIME-format. If you\n\ +are reading this prefix, your mail reader probably has not yet been modified\n\ +to understand the new format, and some of what follows may look strange.\n\n")); + + /* + * Body: boundary+text, message/rfc822 part, closing boundary + */ + /* text */ + fprintf(fp, "--%s\n", boundary); + rewind(textfp); + copy_fp(textfp, fp); + fputc('\n', fp); + + /* message/rfc822 part */ + fprintf(fp, "--%s\n", boundary); + rewind(messagefp); + copy_fp(messagefp, fp); + fputc('\n', fp); + + /* closing boundary */ + fprintf(fp, "--%s--\n", boundary); + /* TODO: insert an epilogue here? */ + + return fp; +} + + +/* + * Determines whether the file denoted by fp contains 8bit characters. + */ +static t_bool +contains_8bit_characters( + FILE *fp) +{ + char *line; + + rewind(fp); + while ((line = tin_fgets(fp, FALSE))) { + for ( ; *line != '\0'; line++) { + if (is_EIGHT_BIT(line)) + return TRUE; + } + } + + return FALSE; +} + + +/* + * Determines whether any line of the file denoted by fp contains str. + */ +static t_bool +contains_string( + FILE *fp, + const char *str) +{ + char *line; + + rewind(fp); + while ((line = tin_fgets(fp, FALSE))) { + if (strstr(line, str)) + return TRUE; + } + + return FALSE; } diff -Nurp tin-1.7.4/src/save.c tin-1.7.5/src/save.c --- tin-1.7.4/src/save.c 2004-01-12 20:05:27.000000000 +0100 +++ tin-1.7.5/src/save.c 2004-04-06 18:28:55.000000000 +0200 @@ -3,7 +3,7 @@ * Module : save.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-01-12 + * Updated : 2004-03-14 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -105,7 +105,7 @@ check_start_save_any_news( char path[PATH_LEN]; char savefile[PATH_LEN]; char subject[HEADER_LEN]; - int group_count; + int group_count = 0; int i, j; int art_count, hot_count; int saved_arts = 0; /* Total # saved arts */ @@ -148,8 +148,6 @@ check_start_save_any_news( break; } - group_count = 0; - /* * For each group we subscribe to... */ @@ -439,7 +437,7 @@ save_and_process_art( * If using the auto-save feature on an article with Archive-Name, * the path will be: // */ - if (!is_mailbox && CURR_GROUP.attribute->auto_save && artptr->archive) { + if (!is_mailbox && curr_group->attribute->auto_save && artptr->archive) { const char *partprefix; char *ptr; char archpath[PATH_LEN]; @@ -504,8 +502,7 @@ save_and_process_art( */ } - if (copy_fp(artinfo->raw, fp)) - /* Write tailing newline or MMDF-mailbox seperator */ + if (copy_fp(artinfo->raw, fp)) /* Write tailing newline or MMDF-mailbox seperator */ print_art_seperator_line(fp, is_mailbox); else { fclose(fp); @@ -617,10 +614,7 @@ expand_save_filename( char *outpath, const char *path) { - int ret; - struct t_group *group = &CURR_GROUP; - - ret = strfpath(path, outpath, PATH_LEN, group); + int ret = strfpath(path, outpath, PATH_LEN, curr_group); /* * If no path exists or the above failed in some way, use sensible defaults @@ -629,7 +623,7 @@ expand_save_filename( if ((ret == 0) || !(strrchr(outpath, DIRSEP))) { char buf[PATH_LEN]; - if (!strfpath(group->attribute->savedir, buf, sizeof(buf), group)) + if (!strfpath(curr_group->attribute->savedir, buf, sizeof(buf), curr_group)) joinpath(buf, homedir, DEFAULT_SAVEDIR); joinpath(outpath, buf, path); return FALSE; @@ -714,8 +708,8 @@ post_process_uud( { FILE *fp_in; char file_out_dir[PATH_LEN]; - int i; const char *eptr; + int i; int count; int errors = 0; uulist *item; @@ -735,13 +729,13 @@ post_process_uud( } } +# if 0 /* * uudeview's "intelligent" multi-part detection * From the uudeview docs: This function is a bunch of heuristics, and I * don't really trust them... should only be called as a last resort on * explicit user request */ -# if 0 UUSmerge(0); UUSmerge(1); UUSmerge(99); @@ -806,13 +800,13 @@ post_process_uud( void) { FILE *fp_in; - char file_out_dir[PATH_LEN]; - int i; FILE *fp_out = NULL; char *filename = NULL; + char file_out_dir[PATH_LEN]; char path[PATH_LEN]; char s[LEN], t[LEN], u[LEN]; - int state; + int state = INITIAL; + int i; mode_t mode = 0; /* @@ -823,10 +817,7 @@ post_process_uud( t[0] = '\0'; u[0] = '\0'; - state = INITIAL; - for (i = 0; i < num_save; i++) { - if ((fp_in = fopen(save[i].path, "r")) == NULL) continue; @@ -857,7 +848,7 @@ post_process_uud( filename = name; expand_save_filename(path, filename); - filename = strrchr(path, DIRSEP) + 1; /* ptr to filename portion */ + filename = strrchr(path, DIRSEP) + 1; /* ptr to filename portion */ if ((fp_out = fopen(path, "w")) == NULL) { perror_message(_(txt_cannot_open), path); return; @@ -1203,7 +1194,8 @@ decode_save_one( /* * Decode this message part if appropriate */ - if (!(check_save_mime_type(part, CURR_GROUP.attribute->mime_types_to_save))) { + if (!(check_save_mime_type(part, curr_group->attribute->mime_types_to_save))) { + /* TODO: skip message if saving multiple files (e.g. save 't'agged) */ wait_message(1, "Skipped %s/%s", content_types[part->type], part->subtype); /* TODO: better msg */ return TRUE; } @@ -1454,7 +1446,7 @@ decode_save_mime( * 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 || ((NULL != ptr->uue) && (!check_save_mime_type(ptr, CURR_GROUP.attribute->mime_types_to_save))))) + 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.4/src/screen.c tin-1.7.5/src/screen.c --- tin-1.7.4/src/screen.c 2004-01-05 04:01:51.000000000 +0100 +++ tin-1.7.5/src/screen.c 2004-06-07 12:19:29.000000000 +0200 @@ -3,7 +3,7 @@ * Module : screen.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-01-05 + * Updated : 2004-06-07 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -248,7 +248,7 @@ center_line( int len; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) int width; - wchar_t wbuffer[256]; /* needs same number of elements as buffer */ + wchar_t *wbuffer; #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ STRCPY(buffer, str); @@ -258,10 +258,10 @@ center_line( len = strlen(buffer); #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - 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))) > 0) + if ((wbuffer = char2wchar_t(buffer)) != NULL) { + if ((width = wcswidth(wbuffer, wcslen(wbuffer) + 1)) > 0) len = width; + free(wbuffer); } #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ diff -Nurp tin-1.7.4/src/search.c tin-1.7.5/src/search.c --- tin-1.7.4/src/search.c 2004-01-05 04:01:09.000000000 +0100 +++ tin-1.7.5/src/search.c 2004-04-06 18:18:11.000000000 +0200 @@ -3,7 +3,7 @@ * Module : search.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-01-05 + * Updated : 2004-03-14 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -55,8 +55,8 @@ static int search_group(t_bool forward, /* * Kludge to maintain some internal state for body search */ -static int total_cnt = 0, curr_cnt = 0; int srch_lineno = -1; +static int total_cnt = 0, curr_cnt = 0; /* * Used by article and body search - this saves passing around large numbers @@ -87,8 +87,7 @@ get_search_pattern( if (repeat) { *forward = last_forward; my_strncpy(def, last_pattern, LEN); - } - else { + } else { sprintf(tmpbuf, (*forward ? fwd_msg : bwd_msg), def); if (!prompt_string_default(tmpbuf, def, _(txt_no_search_string), which_hist)) @@ -181,6 +180,7 @@ search_config( n += incr; free(buf); } while (n != current); + clear_message(); if (tinrc.wildcard) { FreeAndNull(search_regex.re); @@ -439,7 +439,7 @@ search_group( } /* Only search displayed articles */ - if (CURR_GROUP.attribute->show_only_unread && arts[i].status != ART_UNREAD) + if (curr_group->attribute->show_only_unread && arts[i].status != ART_UNREAD) continue; ret = search_func(i, searchbuff); @@ -519,7 +519,7 @@ search_article( t_bool wrap = FALSE; if (!(pattern = get_search_pattern(&forward, repeat, _(txt_search_forwards), _(txt_search_backwards), tinrc.default_search_art, HIST_ART_SEARCH))) - return FALSE; + return 0; if (tinrc.wildcard && !(compile_regex(pattern, &search_regex, PCRE_CASELESS))) return -1; diff -Nurp tin-1.7.4/src/select.c tin-1.7.5/src/select.c --- tin-1.7.4/src/select.c 2004-01-05 04:00:26.000000000 +0100 +++ tin-1.7.5/src/select.c 2004-03-16 15:41:54.000000000 +0100 @@ -3,7 +3,7 @@ * Module : select.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2004-01-05 + * Updated : 2004-03-16 * Notes : * * Copyright (c) 1991-2004 Iain Lea , Rich Skrenta @@ -107,7 +107,6 @@ selection_page( #endif /* READ_CHAR_HACK */ ClearScreen(); - set_groupname_len(FALSE); /* find longest subscribed to groupname */ /* * If user specified only 1 cmd line groupname (eg. tin -r alt.sources) @@ -244,15 +243,12 @@ selection_page( show_description = bool_not(show_description); if (show_description) read_descriptions(TRUE); - set_groupname_len(FALSE); show_selection_page(); break; case iKeySelectGoto: /* prompt for a new group name */ - if ((n = choose_new_group()) >= 0) { - set_groupname_len(FALSE); + if ((n = choose_new_group()) >= 0) move_to_item(n); - } break; case iKeyHelp: /* help */ @@ -348,10 +344,13 @@ selection_page( * articles */ tinrc.show_only_unread_groups = bool_not(tinrc.show_only_unread_groups); + /* + * as we effectively do a yank out on each change, set yanked_out accordingly + */ + yanked_out = TRUE; wait_message(0, _(txt_reading_groups), (tinrc.show_only_unread_groups) ? _("unread") : _("all")); toggle_my_groups(NULL); - set_groupname_len(FALSE); show_selection_page(); if (tinrc.show_only_unread_groups) info_message(_(txt_show_unread)); @@ -521,6 +520,7 @@ show_selection_page( char subs; int i, j, n; int blank_len; + int len, groupname_len = 0; signal_context = cSelect; currmenu = &selmenu; @@ -542,6 +542,37 @@ show_selection_page( set_first_screen_item(); + /* + * calculate max length of groupname field + * if yanked in (yanked_out == FALSE) check all groups in active file + * otherwise just subscribed to groups + */ + if (yanked_out) { + for (i = 0; i < selmenu.max; i++) { + if ((len = strlen(active[my_group[i]].name)) > groupname_len) + groupname_len = len; + if (show_description && groupname_len > tinrc.groupname_max_length) { + /* no need to search further, we have reached max length */ + groupname_len = tinrc.groupname_max_length; + break; + } + } + } else { + for_each_group(i) { + if ((len = strlen(active[i].name)) > groupname_len) + groupname_len = len; + if (show_description && groupname_len > tinrc.groupname_max_length) { + /* no need to search further, we have reached max length */ + groupname_len = tinrc.groupname_max_length; + break; + } + } + } + if (groupname_len >= (cCOLS - SELECT_MISC_COLS)) + groupname_len = cCOLS - SELECT_MISC_COLS - 1; + if (groupname_len < 0) + groupname_len = 0; + blank_len = (MIN(cCOLS, (int) sizeof(group_descript)) - (groupname_len + SELECT_MISC_COLS)) + (show_description ? 2 : 4); for (j = 0, i = selmenu.first; i < selmenu.last; i++, j++) { @@ -648,36 +679,35 @@ static void yank_active_file( void) { - if (yanked_out) { /* Yank in */ - if (selmenu.max == num_active) /* All groups currently present? */ - info_message(_(txt_yanked_none)); - else { - int i; - int prevmax = selmenu.max; - - save_restore_curr_group(TRUE); /* Save group position */ - - /* - * Reset counter and load all the groups in active[] into my_group[] - */ - selmenu.max = 0; - for_each_group(i) - my_group[selmenu.max++] = i; + if (yanked_out && selmenu.max == num_active) { /* All groups currently present? */ + info_message(_(txt_yanked_none)); + return; + } - selmenu.curr = save_restore_curr_group(FALSE); /* Restore previous group position */ - set_groupname_len(yanked_out); - show_selection_page(); - info_message(_(txt_yanked_groups), selmenu.max-prevmax, PLURAL(selmenu.max-prevmax, txt_group)); - } - } else { /* Yank out */ + if (yanked_out) { /* Yank in */ + int i; + int prevmax = selmenu.max; + + save_restore_curr_group(TRUE); /* Save group position */ + + /* + * Reset counter and load all the groups in active[] into my_group[] + */ + selmenu.max = 0; + for_each_group(i) + my_group[selmenu.max++] = i; + + selmenu.curr = save_restore_curr_group(FALSE); /* Restore previous group position */ + yanked_out = bool_not(yanked_out); + show_selection_page(); + info_message(_(txt_yanked_groups), selmenu.max-prevmax, PLURAL(selmenu.max-prevmax, txt_group)); + } else { /* Yank out */ toggle_my_groups(NULL); HpGlitch(erase_arrow()); - set_groupname_len(yanked_out); + yanked_out = bool_not(yanked_out); show_selection_page(); info_message(_(txt_yanked_sub_groups)); } - - yanked_out = bool_not(yanked_out); } @@ -903,7 +933,7 @@ catchup_group( struct t_group *group, t_bool goto_next_unread_group) { - char *smsg; + char *smsg = NULL; if ((!TINRC_CONFIRM_ACTION) || prompt_yn(cLINES, sized_message(&smsg, _(txt_mark_group_read), group->name), TRUE) == 1) { grp_mark_read(group, NULL); @@ -914,7 +944,7 @@ catchup_group( else move_down(); } - free(smsg); + FreeIfNeeded(smsg); } @@ -1013,47 +1043,6 @@ read_groups( /* - * Calculate max length of groupname field for group selection level. - * If all_groups is TRUE check all groups in active file otherwise - * just subscribed to groups. - */ -void -set_groupname_len( - t_bool all_groups) -{ - int len; - int i; - - groupname_len = 0; - - if (all_groups) { - for_each_group(i) { - if ((len = strlen(active[i].name)) > groupname_len) - groupname_len = len; - } - } else { - for (i = 0; i < selmenu.max; i++) { - if ((len = strlen(active[my_group[i]].name)) > groupname_len) - groupname_len = len; - } - } - - if (groupname_len >= (cCOLS - SELECT_MISC_COLS)) { - groupname_len = cCOLS - SELECT_MISC_COLS - 1; - if (groupname_len < 0) - groupname_len = 0; - } - - /* - * If newsgroups descriptions are ON then cut off groupnames - * to specified max. length otherwise display full length - */ - if (show_description && groupname_len > tinrc.groupname_max_length) - groupname_len = tinrc.groupname_max_length; -} - - -/* * Toggle my_group[] between all groups / only unread groups * We make a special case for Newgroups (always appear, at the top) * and Bogus groups if tinrc.strip_bogus = BOGUS_SHOW @@ -1193,7 +1182,6 @@ subscribe_pattern( if (subscribe_num) { toggle_my_groups(NULL); - set_groupname_len(FALSE); show_selection_page(); info_message(result, subscribe_num); } else diff -Nurp tin-1.7.4/src/signal.c tin-1.7.5/src/signal.c --- tin-1.7.4/src/signal.c 2004-02-23 19:22:03.000000000 +0100 +++ tin-1.7.5/src/signal.c 2004-03-14 15:40:22.000000000 +0100 @@ -3,7 +3,7 @@ * Module : signal.c * Author : I.Lea * Created : 1991-04-01 - * Updated : 2004-02-23 + * Updated : 2004-03-14 * Notes : signal handlers for different modes and window resizing * * Copyright (c) 1991-2004 Iain Lea @@ -276,25 +276,31 @@ handle_resize( ClearScreen(); show_art_msg(curr_group->name); break; + case cConfig: refresh_config_page(-1); break; + case cFilter: refresh_filter_menu(); break; + case cInfopager: display_info_page(0); break; + case cGroup: case cSelect: case cThread: ClearScreen(); currmenu->redraw(); break; + case cPage: resize_article(TRUE, &pgart); draw_page(curr_group->name, 0); break; + case cMain: break; } @@ -302,6 +308,11 @@ handle_resize( case cGetline: gl_redraw(); break; + + case cPromptSLK: + prompt_slk_redraw(); + break; + default: break; } diff -Nurp tin-1.7.4/src/string.c tin-1.7.5/src/string.c --- tin-1.7.4/src/string.c 2003-12-28 15:41:51.000000000 +0100 +++ tin-1.7.5/src/string.c 2004-06-07 12:19:43.000000000 +0200 @@ -3,7 +3,7 @@ * Module : string.c * Author : Urs Janssen * Created : 1997-01-20 - * Updated : 2003-12-28 + * Updated : 2004-06-07 * Notes : * * Copyright (c) 1997-2004 Urs Janssen @@ -52,12 +52,26 @@ # endif /* HAVE_LIBIDN && HAVE_STRINGPREP_H && !_STRINGPREP_H */ # endif /* HAVE_LIBICUUC */ #endif /* HAVE_UNICODE_NORMALIZATION */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) +# if defined(HAVE_UNICODE_UBIDI_H) && !defined(UBIDI_H) +# include +# endif /* HAVE_UNICODE_UBIDI_H && !UBIDI_H */ +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && !NO_LOCALE */ /* * this file needs some work */ /* + * local prototypes + */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + static UChar *char2UChar(const char *str); + static char *UChar2char(const UChar *ustr); +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && !NO_LOCALE */ + + +/* * special ltoa() * converts value into a string with a len of digits * last char may be one of the following @@ -658,6 +672,48 @@ strrstr( #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) /* + * convert from char* to wchar_t* + */ +wchar_t * +char2wchar_t( + const char *str) +{ + size_t len; + wchar_t *wstr; + + len = mbstowcs(NULL, str, 0); + if (len == (size_t) (-1)) + return NULL; + + wstr = my_malloc(sizeof(wchar_t) * (len + 1)); + mbstowcs(wstr, str, len + 1); + + return wstr; +} + + +/* + * convert from wchar_t* to char* + */ +char * +wchar_t2char( + const wchar_t *wstr) +{ + size_t len; + char *str; + + len = wcstombs(NULL, wstr, 0); + if (len == (size_t) (-1)) + return NULL; + + str = my_malloc(len + 1); + wcstombs(str, wstr, len + 1); + + return str; +} + + +/* * copy wide-chars from '*from' to '*to' until 'columns' columns are filled * pad with spaces if necessary */ @@ -711,28 +767,27 @@ strunc( int len) { #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) + char *tmp; wchar_t *wmessage, *wbuf; - size_t mesg_len; + size_t wbuf_len; + + if ((wmessage = char2wchar_t(message)) != NULL) { + wbuf_len = wcslen(wmessage) + 1; + wbuf = my_malloc(sizeof(wchar_t) * wbuf_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)) { - wstrunc(wmessage, wbuf, mesg_len + 1, len); - if (wcstombs(buf, wbuf, buf_len) != (size_t) (-1)) { - buf[buf_len - 1] = '\0'; + wstrunc(wmessage, wbuf, wbuf_len, len); + free(wmessage); - free(wbuf); - free(wmessage); + if ((tmp = wchar_t2char(wbuf)) != NULL) { + strncpy(buf, tmp, buf_len); + buf[buf_len - 1] = '\0'; - return buf; - } - } + free(wbuf); + free(tmp); + return buf; + } free(wbuf); - free(wmessage); } /* something went wrong using wide-chars, default back to normal chars */ #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -818,6 +873,59 @@ my_wcsdup( #endif /* MULTIBYTE_ABLE && !NO_LOCALE */ +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) +/* + * convert from char* (UTF-8) to UChar* (UTF-16) + * ICU expects strings as UChar* + */ +static UChar * +char2UChar( + const char *str) +{ + int32_t needed; + UChar *ustr; + UErrorCode status = U_ZERO_ERROR; + + u_strFromUTF8(NULL, 0, &needed, str, -1, &status); + status = U_ZERO_ERROR; /* reset status */ + ustr = my_malloc(sizeof(UChar) * (needed + 1)); + u_strFromUTF8(ustr, needed + 1, NULL, str, -1, &status); + + if (U_FAILURE(status)) { + /* clean up and return NULL */ + free(ustr); + return NULL; + } + return ustr; +} + + +/* + * convert from UChar* (UTF-16) to char* (UTF-8) + */ +static char * +UChar2char( + const UChar *ustr) +{ + int32_t needed; + char *str; + UErrorCode status = U_ZERO_ERROR; + + u_strToUTF8(NULL, 0, &needed, ustr, -1, &status); + status = U_ZERO_ERROR; /* reset status */ + str = my_malloc(needed + 1); + u_strToUTF8(str, needed + 1, NULL, ustr, -1, &status); + + if (U_FAILURE(status)) { + /* clean up and return NULL */ + free(str); + return NULL; + } + return str; +} +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && !NO_LOCALE */ + + #ifdef HAVE_UNICODE_NORMALIZATION /* * unicode normalization @@ -834,7 +942,7 @@ normalize( { char *buf, *tmp; - /* make sure str is valid UTF8 */ + /* make sure str is valid UTF-8 */ tmp = my_strdup(str); utf8_valid(tmp); @@ -843,7 +951,7 @@ normalize( # ifdef HAVE_LIBICUUC { /* ICU */ - int32_t buf_len, ustr_len, needed, norm_len; + int32_t needed, norm_len; UChar *ustr, *norm; UErrorCode status = U_ZERO_ERROR; UNormalizationMode mode; @@ -867,21 +975,13 @@ normalize( } /* convert to UTF-16 which is used internally by ICU */ - u_strFromUTF8(NULL, 0, &needed, tmp, (int32_t) strlen(tmp), &status); - status = U_ZERO_ERROR; /* reset status */ - ustr_len = needed + 1; - ustr = (UChar *) my_malloc(sizeof(UChar) * ustr_len); - u_strFromUTF8(ustr, ustr_len, &needed, tmp, (int32_t) strlen(tmp), &status); - if (U_FAILURE(status)) { - /* something went wrong, return the original string (as valid UTF8) */ - free(ustr); + if ((ustr = char2UChar(tmp)) == NULL) /* something went wrong, return the original string (as valid UTF8) */ return tmp; - } needed = unorm_normalize(ustr, -1, mode, 0 , NULL, 0, &status); status = U_ZERO_ERROR; /* reset status */ norm_len = needed + 1; - norm = (UChar *) my_malloc(sizeof(UChar) * norm_len); + norm = my_malloc(sizeof(UChar) * norm_len); needed = unorm_normalize(ustr, -1, mode, 0 , norm, norm_len, &status); if (U_FAILURE(status)) { /* something went wrong, return the original string (as valid UTF8) */ @@ -891,16 +991,8 @@ normalize( } /* convert back to UTF-8 */ - u_strToUTF8(NULL, 0, &needed, norm, -1, &status); - status = U_ZERO_ERROR; /* reset status */ - buf_len = needed + 1; - buf = my_malloc(buf_len); - u_strToUTF8(buf, buf_len, &needed, norm, -1, &status); - if (U_FAILURE(status)) { - /* something went wrong, return the original string (as valid UTF8) */ - free(buf); + if ((buf = UChar2char(norm)) == NULL) /* something went wrong, return the original string (as valid UTF8) */ buf = tmp; - } free(ustr); free(norm); @@ -950,3 +1042,77 @@ fmt_string( return str; } + + +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) +/* + * prepare a string with bi-directional text for display + * (converts from logical order to visual order) + * + * str: original string (in UTF-8) + * is_rtl: pointer to a t_bool where the direction of the resulting string + * will be stored (left-to-right = FALSE, right-to-left = TRUE) + * returns a pointer to the reordered string. + * In case of error NULL is returned and the value of is_rtl indefinite + */ +char * +render_bidi( + const char *str, + t_bool *is_rtl) +{ + int32_t ustr_len; + char *tmp; + UBiDi *bidi_data; + UChar *ustr, *ustr_reordered; + UErrorCode status = U_ZERO_ERROR; + + *is_rtl = FALSE; + + /* make sure str is valid UTF-8 */ + tmp = my_strdup(str); + utf8_valid(tmp); + + if ((ustr = char2UChar(tmp)) == NULL) { + free(tmp); + return NULL; + } + free(tmp); /* tmp is not needed anymore */ + + bidi_data = ubidi_open(); + ubidi_setPara(bidi_data, ustr, -1, UBIDI_DEFAULT_LTR, NULL, &status); + if (U_FAILURE(status)) { + ubidi_close(bidi_data); + free(ustr); + return NULL; + } + + ustr_len = u_strlen(ustr) + 1; + ustr_reordered = my_malloc(sizeof(UChar) * ustr_len); + ubidi_writeReordered(bidi_data, ustr_reordered, ustr_len, UBIDI_REMOVE_BIDI_CONTROLS|UBIDI_DO_MIRRORING, &status); + if (U_FAILURE(status)) { + ubidi_close(bidi_data); + free(ustr); + free(ustr_reordered); + return NULL; + } + + /* + * determine the direction of the text + * is the bidi level even => left-to-right + * is the bidi level odd => right-to-left + */ + *is_rtl = (t_bool) (ubidi_getParaLevel(bidi_data) & 1); + ubidi_close(bidi_data); + + /* + * No need to check the return value. In both cases we must clean up + * and return the returned value, will it be a pointer to the + * resulting string or NULL in case of failure. + */ + tmp = UChar2char(ustr_reordered); + free(ustr); + free(ustr_reordered); + + return tmp; +} +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ diff -Nurp tin-1.7.4/src/tags.c tin-1.7.5/src/tags.c --- tin-1.7.4/src/tags.c 2003-12-28 15:11:06.000000000 +0100 +++ tin-1.7.5/src/tags.c 2004-03-14 15:45:00.000000000 +0100 @@ -3,7 +3,7 @@ * Module : tags.c * Author : Jason Faultless * Created : 1999-12-06 - * Updated : 2003-12-28 + * Updated : 2004-03-14 * Notes : Split out from other modules * * Copyright (c) 1999-2004 Jason Faultless @@ -253,7 +253,7 @@ line_is_tagged( { int code = 0; - if (CURR_GROUP.attribute->thread_arts) { + if (curr_group->attribute->thread_arts) { int i; for (i = n; i >= 0; i = arts[i].thread) { if (arts[i].tagged > code) @@ -469,13 +469,13 @@ parse_range( *range_end = -1; while (*ptr && state != DONE) { - if (isdigit(*ptr)) { + if (isdigit((int) *ptr)) { if (state == FINDMAX) { *range_end = atoi(ptr); state = DONE; } else *range_start = atoi(ptr); - while (isdigit(*ptr)) + while (isdigit((int) *ptr)) ptr++; } else { switch (*ptr) { @@ -526,12 +526,12 @@ do_auto_select_arts( # ifdef DEBUG_NEWSRC debug_print_comment("group.c: X command"); # endif /* DEBUG_NEWSRC */ - art_mark(&CURR_GROUP, &arts[i], ART_READ); + art_mark(curr_group, &arts[i], ART_READ); arts[i].zombie = TRUE; } } - if (CURR_GROUP.attribute->show_only_unread) - find_base(&CURR_GROUP); + if (curr_group->attribute->show_only_unread) + find_base(curr_group); grpmenu.curr = 0; show_group_page(); @@ -550,12 +550,12 @@ undo_auto_select_arts( # ifdef DEBUG_NEWSRC debug_print_comment("group.c: + command"); # endif /* DEBUG_NEWSRC */ - art_mark(&CURR_GROUP, &arts[i], ART_UNREAD); + art_mark(curr_group, &arts[i], ART_UNREAD); arts[i].zombie = FALSE; } } - if (CURR_GROUP.attribute->show_only_unread) - find_base(&CURR_GROUP); + if (curr_group->attribute->show_only_unread) + find_base(curr_group); grpmenu.curr = 0; /* do we want this? */ show_group_page(); diff -Nurp tin-1.7.4/src/tcurses.c tin-1.7.5/src/tcurses.c --- tin-1.7.4/src/tcurses.c 2004-02-24 10:46:39.000000000 +0100 +++ tin-1.7.5/src/tcurses.c 2004-06-07 12:20:41.000000000 +0200 @@ -3,7 +3,7 @@ * Module : tcurses.c * Author : Thomas Dickey * Created : 1997-03-02 - * Updated : 2004-02-24 + * Updated : 2004-06-07 * Notes : This is a set of wrapper functions adapting the termcap * interface of tin to use SVr4 curses (e.g., ncurses). * @@ -49,6 +49,10 @@ # define KEY_MIN KEY_BREAK /* SVr3 curses */ # endif /* !KEY_MIN */ +# ifndef KEY_CODE_YES +# define KEY_CODE_YES (KEY_MIN - 1) /* PDCurses */ +# endif /* !KEY_CODE_YES */ + # include "trace.h" int cLINES; @@ -375,14 +379,14 @@ highlight_string( * offsets calculate now the correct starting column */ if (col > 0) { - wchar_t wtmp[LEN]; + wchar_t *wtmp; MoveCursor(row, 0); my_innstr(tmp, cCOLS); tmp[col] = '\0'; - if (mbstowcs(wtmp, tmp, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { - wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - col = wcswidth(wtmp, ARRAY_SIZE(wtmp)); + if ((wtmp = char2wchar_t(tmp)) != NULL) { + col = wcswidth(wtmp, wcslen(wtmp) + 1); + free(wtmp); } } # endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -423,7 +427,7 @@ word_highlight_string( char tmp[LEN]; int wsize = size; # if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) - wchar_t wtmp[LEN]; + wchar_t *wtmp; /* * In a multibyte locale we get byte offsets instead of character offsets @@ -433,9 +437,9 @@ word_highlight_string( MoveCursor(row, 0); my_innstr(tmp, cCOLS); tmp[col] = '\0'; - if (mbstowcs(wtmp, tmp, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { - wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - col = wcswidth(wtmp, ARRAY_SIZE(wtmp)); + if ((wtmp = char2wchar_t(tmp)) != NULL) { + col = wcswidth(wtmp, wcslen(wtmp) + 1); + free(wtmp); } } # endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -445,9 +449,9 @@ word_highlight_string( # if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) tmp[size] = '\0'; - if (mbstowcs(wtmp, tmp, ARRAY_SIZE(wtmp) - 1) != (size_t) -1) { - wtmp[ARRAY_SIZE(wtmp) - 1] = (wchar_t) '\0'; - wsize = wcswidth(wtmp, ARRAY_SIZE(wtmp)); + if ((wtmp = char2wchar_t(tmp)) != NULL) { + wsize = wcswidth(wtmp, wcslen(wtmp) + 1); + free(wtmp); } # endif /* MULTIBYTE_ABLE && !NO_LOCALE */ @@ -513,7 +517,11 @@ again: # if defined(KEY_RESIZE) && defined(USE_CURSES) if ((ch = getch()) == KEY_RESIZE) need_resize = cYes; -# if 0 /* Don't use it at the moment as it breaks "redrawing" from prompt_slk_response() */ +# if 0 + /* + * disable checking for ERR until all callers of ReadCh() doesn't + * depend on ERR for redrawing + */ if (ch == ERR) goto again; # endif /* 0 */ @@ -759,13 +767,11 @@ my_fputws( addwstr(wstr); # else char *mbs; - int len; - len = wcstombs(NULL, wstr, 0) + 1; - mbs = my_malloc(len); - wcstombs(mbs, wstr, len); - addstr(mbs); - free(mbs); + if ((mbs = wchar_t2char(wstr)) != NULL) { + addstr(mbs); + free(mbs); + } # endif /* HAVE_NCURSESW */ } } diff -Nurp tin-1.7.4/src/thread.c tin-1.7.5/src/thread.c --- tin-1.7.4/src/thread.c 2004-02-23 11:09:28.000000000 +0100 +++ tin-1.7.5/src/thread.c 2004-03-03 14:43:31.000000000 +0100 @@ -61,6 +61,7 @@ t_bool show_subject; * Local prototypes */ static int enter_pager(int art, t_bool ignore_unavail, int level); +static int mark_art_read(struct t_group *group); static int thread_catchup(int ch); static int thread_left(void); static int thread_right(void); @@ -72,7 +73,6 @@ static void draw_thread_arrow(void); static void make_prefix(struct t_msgid *art, char *prefix, int maxlen); static void show_thread_page(void); static void update_thread_page(void); -static int mark_art_read(struct t_group *group); /* diff -Nurp tin-1.7.4/src/tincfg.tbl tin-1.7.5/src/tincfg.tbl --- tin-1.7.4/src/tincfg.tbl 2003-12-30 13:43:10.000000000 +0100 +++ tin-1.7.5/src/tincfg.tbl 2004-06-06 20:23:26.000000000 +0200 @@ -2,7 +2,7 @@ ; Module : tincfg.tbl ; Author : Thomas E. Dickey ; Created : 1996-11-01 -; Updated : 2003-12-09 +; Updated : 2004-06-06 ; Notes : #defines and structs for config.c ; ; Copyright (c) 1996-2004 Thomas E. Dickey @@ -226,4 +226,6 @@ #endif # endif #endif - +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + render_bidi OPT_ON_OFF +#endif diff -Nurp tin-1.7.4/tin.spec tin-1.7.5/tin.spec --- tin-1.7.4/tin.spec 2003-12-26 19:12:01.000000000 +0100 +++ tin-1.7.5/tin.spec 2004-06-15 11:44:07.000000000 +0200 @@ -1,6 +1,6 @@ Name: tin Summary: tin - an easy-to-use USENET news reader -Version: 1.7.4 +Version: 1.7.5 Release: 1 Copyright: BSD Group: Applications/News